diff --git a/DiffractionGratings/README.txt b/DiffractionGratings/README.txt
index fa0bf74bf90818dd24ae048a9be7bc3974de583a..51f62708652f3c5dc65fdc1a85408b034acfed1a 100644
--- a/DiffractionGratings/README.txt
+++ b/DiffractionGratings/README.txt
@@ -12,7 +12,7 @@ To run the test cases, type in terminal :
 gmsh grating3D.pro -setstring test_case pyramid
 gmsh grating3D.pro -setstring test_case hole
 gmsh grating3D.pro -setstring test_case torus
-gmsh grating3D.pro -setstring test_case halfellipsoid
+gmsh grating3D.pro -setstring test_case half_ellipsoid
 gmsh grating3D.pro -setstring test_case checker
 gmsh grating3D.pro -setstring test_case bisin
 
diff --git a/DiffractionGratings/grating3D_data.geo b/DiffractionGratings/grating3D_data.geo
index d08505222fd57b476b19ca9d653d915070b2957b..4862669594cefcc756bcc12166cb94972dd43976 100644
--- a/DiffractionGratings/grating3D_data.geo
+++ b/DiffractionGratings/grating3D_data.geo
@@ -1,8 +1,8 @@
 
 DefineConstant[
-  test_case = {"halfellipsoid",
+  test_case = {"half_ellipsoid",
     Name "1Geometry",
-    Choices {"hole", "pyramid", "torus", "2Dlamellar", "solarcell", "conv", "skew"},
+    Choices {"half_ellipsoid", "hole", "pyramid", "torus", "bi_sinusoidal", "retrieve_2D_lamellar", "nanowire_solarcell", "convergence", "skewed_lattice"},
     GmshOption "Reset", Autocheck 0
   }
 ];
diff --git a/DiffractionGratings/grating3D_data_bisin.geo b/DiffractionGratings/grating3D_data_bi_sinusoidal.geo
similarity index 100%
rename from DiffractionGratings/grating3D_data_bisin.geo
rename to DiffractionGratings/grating3D_data_bi_sinusoidal.geo
diff --git a/DiffractionGratings/grating3D_data_conv.geo b/DiffractionGratings/grating3D_data_convergence.geo
similarity index 100%
rename from DiffractionGratings/grating3D_data_conv.geo
rename to DiffractionGratings/grating3D_data_convergence.geo
diff --git a/DiffractionGratings/grating3D_data_halfellipsoid.geo b/DiffractionGratings/grating3D_data_half_ellipsoid.geo
similarity index 100%
rename from DiffractionGratings/grating3D_data_halfellipsoid.geo
rename to DiffractionGratings/grating3D_data_half_ellipsoid.geo
diff --git a/DiffractionGratings/grating3D_data_solarcell.geo b/DiffractionGratings/grating3D_data_nanowire_solarcell.geo
similarity index 100%
rename from DiffractionGratings/grating3D_data_solarcell.geo
rename to DiffractionGratings/grating3D_data_nanowire_solarcell.geo
diff --git a/DiffractionGratings/grating3D_data_2Dlamellar.geo b/DiffractionGratings/grating3D_data_retrieve_2D_lamellar.geo
similarity index 100%
rename from DiffractionGratings/grating3D_data_2Dlamellar.geo
rename to DiffractionGratings/grating3D_data_retrieve_2D_lamellar.geo
diff --git a/DiffractionGratings/grating3D_data_skew.geo b/DiffractionGratings/grating3D_data_skewed_lattice.geo
similarity index 100%
rename from DiffractionGratings/grating3D_data_skew.geo
rename to DiffractionGratings/grating3D_data_skewed_lattice.geo
diff --git a/DiffractionGratings/grating3D_parallel_Mmatrix.sh b/DiffractionGratings/grating3D_parallel_Mmatrix.sh
index 9d91ff020f3701acfac1bec6b6f21fadf1721f74..af003d453206ef87f11a7305eacb535dd296c1b4 100644
--- a/DiffractionGratings/grating3D_parallel_Mmatrix.sh
+++ b/DiffractionGratings/grating3D_parallel_Mmatrix.sh
@@ -6,7 +6,7 @@ export NPROC=96
 export lambda_min=400
 export lambda_max=800
 export FLAG_TOTAL=0
-export GRATING_CASE="halfellipsoid"
+export GRATING_CASE="half_ellipsoid"
 export myDir="res_Matrix_nb_lam"$nb_lam"_nb_phi"$nb_phi"_total"$FLAG_TOTAL
 export myFile="run_phideg_values_"$nb_phi".out"
 
diff --git a/DiffractionGratings/grating3D_runall.sh b/DiffractionGratings/grating3D_runall.sh
index 03c3d6ff9db444f3293692e26e282c1c66c1d755..9a90a02bb23252922d994c1b6ecfc46454d397c4 100644
--- a/DiffractionGratings/grating3D_runall.sh
+++ b/DiffractionGratings/grating3D_runall.sh
@@ -1,8 +1,7 @@
 rm -r res3D*
 
-# for t in bisin checker halfellipsoid hole pyramid torus 2Dlamellar solarcell conv skew
-# for t in halfellipsoid torus  
-for t in halfellipsoid 
+# for t in bi_sinusoidal checker half_ellipsoid hole pyramid torus retrieve_2D_lamellar nanowire_solarcell convergence skewed_lattice
+for t in half_ellipsoid 
 do
     for f in 0 1
     do
@@ -11,8 +10,8 @@ do
     done
 done
 
-# for t in bisin checker halfellipsoid hole pyramid torus 2Dlamellar solarcell conv skew
-for t in halfellipsoid  
+# for t in bi_sinusoidal checker half_ellipsoid hole pyramid torus retrieve_2D_lamellar nanowire_solarcell convergence skewed_lattice
+for t in half_ellipsoid  
 do
     for f in 0 1
     do