diff --git a/data/automated_test/sdi.cst b/data/automated_tests/public_layer.cst
similarity index 100%
rename from data/automated_test/sdi.cst
rename to data/automated_tests/public_layer.cst
diff --git a/data/automated_test/sdi.dbf b/data/automated_tests/public_layer.dbf
similarity index 100%
rename from data/automated_test/sdi.dbf
rename to data/automated_tests/public_layer.dbf
diff --git a/data/automated_test/sdi.prj b/data/automated_tests/public_layer.prj
similarity index 100%
rename from data/automated_test/sdi.prj
rename to data/automated_tests/public_layer.prj
diff --git a/data/automated_test/sdi.shp b/data/automated_tests/public_layer.shp
similarity index 100%
rename from data/automated_test/sdi.shp
rename to data/automated_tests/public_layer.shp
diff --git a/data/automated_test/sdi.shx b/data/automated_tests/public_layer.shx
similarity index 100%
rename from data/automated_test/sdi.shx
rename to data/automated_tests/public_layer.shx
diff --git a/workspaces/geor/automated_test/datastore.xml b/workspaces/geor/automated_tests/datastore.xml
similarity index 90%
rename from workspaces/geor/automated_test/datastore.xml
rename to workspaces/geor/automated_tests/datastore.xml
index 1444877..6c3d4c2 100644
--- a/workspaces/geor/automated_test/datastore.xml
+++ b/workspaces/geor/automated_tests/datastore.xml
@@ -1,6 +1,6 @@
 <dataStore>
   <id>DataStoreInfoImpl-2b665931:15a1d6fbd50:-7ff7</id>
-  <name>automated_test</name>
+  <name>automated_tests</name>
   <description>Datasets for automated tests (please do not remove)</description>
   <type>Directory of spatial files (shapefiles)</type>
   <enabled>true</enabled>
@@ -16,7 +16,7 @@
     <entry key="filetype">shapefile</entry>
     <entry key="enable spatial index">true</entry>
     <entry key="cache and reuse memory maps">true</entry>
-    <entry key="url">file:data/automated_test</entry>
+    <entry key="url">file:data/automated_tests</entry>
     <entry key="namespace">http://www.georchestra.org/geor</entry>
   </connectionParameters>
   <__default>false</__default>
diff --git a/workspaces/geor/automated_test/sdi/featuretype.xml b/workspaces/geor/automated_tests/public_layer/featuretype.xml
similarity index 92%
rename from workspaces/geor/automated_test/sdi/featuretype.xml
rename to workspaces/geor/automated_tests/public_layer/featuretype.xml
index 253e429..0b429bd 100644
--- a/workspaces/geor/automated_test/sdi/featuretype.xml
+++ b/workspaces/geor/automated_tests/public_layer/featuretype.xml
@@ -1,14 +1,14 @@
 <featureType>
   <id>FeatureTypeInfoImpl-2b665931:15a1d6fbd50:-7ff6</id>
-  <name>sdi</name>
-  <nativeName>sdi</nativeName>
+  <name>public_layer</name>
+  <nativeName>public_layer</nativeName>
   <namespace>
     <id>NamespaceInfoImpl-2b665931:15a1d6fbd50:-7ff8</id>
   </namespace>
-  <title>sdi</title>
+  <title>public_layer</title>
   <keywords>
     <string>features</string>
-    <string>sdi</string>
+    <string>public_layer</string>
   </keywords>
   <nativeCRS>GEOGCS[&quot;WGS 84&quot;, 
   DATUM[&quot;World Geodetic System 1984&quot;, 
@@ -51,4 +51,4 @@
   <overridingServiceSRS>false</overridingServiceSRS>
   <skipNumberMatched>false</skipNumberMatched>
   <circularArcPresent>false</circularArcPresent>
-</featureType>
\ No newline at end of file
+</featureType>
diff --git a/workspaces/geor/automated_test/sdi/layer.xml b/workspaces/geor/automated_tests/public_layer/layer.xml
similarity index 90%
rename from workspaces/geor/automated_test/sdi/layer.xml
rename to workspaces/geor/automated_tests/public_layer/layer.xml
index 1c7d044..b86e83c 100644
--- a/workspaces/geor/automated_test/sdi/layer.xml
+++ b/workspaces/geor/automated_tests/public_layer/layer.xml
@@ -1,5 +1,5 @@
 <layer>
-  <name>sdi</name>
+  <name>public_layer</name>
   <id>LayerInfoImpl-2b665931:15a1d6fbd50:-7ff5</id>
   <type>VECTOR</type>
   <defaultStyle>
@@ -12,4 +12,4 @@
     <logoWidth>0</logoWidth>
     <logoHeight>0</logoHeight>
   </attribution>
-</layer>
\ No newline at end of file
+</layer>