diff --git a/datastore_server/build/build.xml b/datastore_server/build/build.xml
index a22f0bbcf5a08f83c5d7ca0bdf51a038ee29cff7..5bbbdae91ab8c405fdc3e8c9a33e9d02945d2103 100644
--- a/datastore_server/build/build.xml
+++ b/datastore_server/build/build.xml
@@ -122,7 +122,7 @@
       <param name="project-path" value="" />
       <param name="plugin-kind" value="dss" />
   	</antcall>
-    <delete file="${dist}/core-plugins/core_plugins.properties"/>
+    <delete file="${dist}/core-plugins/core-plugins.properties"/>
   	<move todir="${dist.datastore_server}">
   		<fileset dir="${dist}">
   		  <include name="*.MD5"/>
diff --git a/installation/source/java/ch/systemsx/cisd/openbis/installer/izpack/Utils.java b/installation/source/java/ch/systemsx/cisd/openbis/installer/izpack/Utils.java
index 5e07d0f0f79588eae130ce834cdf952d340dcba9..5f1d8373c8d3fa2eae7c96ed2051413bb63291ec 100644
--- a/installation/source/java/ch/systemsx/cisd/openbis/installer/izpack/Utils.java
+++ b/installation/source/java/ch/systemsx/cisd/openbis/installer/izpack/Utils.java
@@ -44,7 +44,7 @@ class Utils
     static final String AS_PATH = SERVERS_PATH + "openBIS-server/jetty/";
     static final String DSS_PATH = SERVERS_PATH + "datastore_server/";
     static final String SERVICE_PROPERTIES_PATH = "etc/service.properties";
-    static final String CORE_PLUGINS_PROPERTIES_PATH = CORE_PLUGINS_PATH + "core_plugins.properties";
+    static final String CORE_PLUGINS_PROPERTIES_PATH = CORE_PLUGINS_PATH + "core-plugins.properties";
     static final String JETTY_XML_PATH = "etc/jetty.xml";
     static final String KEYSTORE_PATH = "etc/openBIS.keystore";
     
diff --git a/openbis/build/build.xml b/openbis/build/build.xml
index c70017209227652e9d0f085eae1f5ec25da3f109..1b8ba8e18168509ba242bc46d42cd32b68adfa91 100644
--- a/openbis/build/build.xml
+++ b/openbis/build/build.xml
@@ -210,7 +210,7 @@
 			</fileset>
 			<fileset dir="dist/server/etc">
 				<include name="log.xml" />
-				<include name="core_plugins.properties" />
+				<include name="core-plugins.properties" />
 			</fileset>
 		</checksum>
 	</target>
@@ -647,10 +647,10 @@
     <copy todir="${dist}/core-plugins">
       <fileset dir="${project-path}${core-plugins.folder}" erroronmissingdir="false"
                includesfile="${dist}/core-plugin-paths">
-        <exclude name="core_plugins.properties"/>
+        <exclude name="core-plugins.properties"/>
       </fileset>
       <fileset dir="${project-path}dist/server" erroronmissingdir="false">
-        <include name="core_plugins.properties"/>
+        <include name="core-plugins.properties"/>
       </fileset>
     </copy>
   	<delete file="${dist}/core-plugin-paths"/>
@@ -693,7 +693,7 @@
       <classes dir="${original.server.dist}">
         <include name="etc/log.xml" />
         <include name="etc/passwd" />
-        <include name="etc/core_plugins.properties" />
+        <include name="etc/core-plugins.properties" />
       </classes>
       <classes dir="${classes}">
         <include name="${build.info.filename}" />
diff --git a/openbis/dist/server/install.sh b/openbis/dist/server/install.sh
index d541fd9fd3dbe54e24ca0252108c48a1f0a52cf8..e97dfc4fdd9d70bc4016731480d923d3982d6c3e 100755
--- a/openbis/dist/server/install.sh
+++ b/openbis/dist/server/install.sh
@@ -101,8 +101,8 @@ echo "Make the configuration checksum file available : " $checksum_file
 test -f "$checksum_file" && cp -p "$checksum_file" "$jetty_folder"
 
 echo installing core-plugins
-if [ -f "$server_folder/../core-plugins/core_plugins.properties" ]; then
-    excludingStuff="-x core-plugins/core_plugins.properties" 
+if [ -f "$server_folder/../core-plugins/core-plugins.properties" ]; then
+    excludingStuff="-x core-plugins/core-plugins.properties" 
 fi
 unzip -quo "$installation_folder/core-plugins.zip" $excludingStuff -d "$server_folder/.."
 
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/coreplugin/CorePluginsUtils.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/coreplugin/CorePluginsUtils.java
index f38f126ca9cb5a12c500f44849408d111b810d74..7d636ff926b2a4a69fd49a7f0043050d34298998 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/coreplugin/CorePluginsUtils.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/coreplugin/CorePluginsUtils.java
@@ -35,10 +35,10 @@ public class CorePluginsUtils
 
     static final String DEFAULT_AS_CORE_PLUGINS_FOLDER = "../../core-plugins";
 
-    public static final String CORE_PLUGINS_PROPERTIES_FILE = "core_plugins.properties";
+    public static final String CORE_PLUGINS_PROPERTIES_FILE = "core-plugins.properties";
 
     /**
-     * Adds the content of <code>core_plugins.properties</code> file to the specified properties.
+     * Adds the content of <code>core-plugins.properties</code> file to the specified properties.
      * The folder with the core plugins properties file is specified by the property
      * <code>core-plugins-folder</code> of the specified properties. If undefined a default value is
      * used. Note, that the core plugin properties might overwrite value in the specified properties
diff --git a/openbis_standard_technologies/build/build.xml b/openbis_standard_technologies/build/build.xml
index b02615c44f04535470b10ca6e9c44700c9a1b904..45a5abf6cc95dc37bd4878cfd15606e5d8ef76db 100644
--- a/openbis_standard_technologies/build/build.xml
+++ b/openbis_standard_technologies/build/build.xml
@@ -21,7 +21,7 @@
 	    <param name="project-path" value="../deep_sequencing_unit/"/>
 	    <param name="plugin-kind" value="as"/>
 	  </antcall>
-    <copy todir="${dist}/core-plugins" file="dist/etc/core_plugins.properties"/>
+    <copy todir="${dist}/core-plugins" file="dist/etc/core-plugins.properties"/>
   </target>
 
 	<target name="dist" depends="clean">
@@ -61,7 +61,7 @@
       <param name="project-path" value="../screening/" />
       <param name="plugin-kind" value="dss" />
 		</antcall>
-	  <delete file="${dist}/core-plugins/core_plugins.properties"/>
+	  <delete file="${dist}/core-plugins/core-plugins.properties"/>
 		<antcall target="screening.add-stuff-to-dss-dist"/>
 		<antcall target="screening.compute-dss-checksum"/>
 		
diff --git a/screening/build/build.xml b/screening/build/build.xml
index 25d56d44eb434b9a193dd48410a4a99bc84daf34..f427f3d5e74362fa5b7b197b77b568a2f77db8fe 100644
--- a/screening/build/build.xml
+++ b/screening/build/build.xml
@@ -151,7 +151,7 @@
     <checksum todir="${dist}" pattern="{0}  etc/{1}">
       <fileset dir="../screening/dist/etc">
         <include name="service.properties" />
-        <include name="core_plugins.properties" />
+        <include name="core-plugins.properties" />
       	<include name="tabular-data-graph.properties" />
         <include name="log.xml" />
         <include name="openBIS.keystore" />