diff --git a/integration-tests/run.sh b/integration-tests/run.sh
index 5cc99780ca1d04cb9be5a28fa7521ace5e7cecd9..1077a276a08e1deadac41c5eab55151febf712d0 100755
--- a/integration-tests/run.sh
+++ b/integration-tests/run.sh
@@ -14,9 +14,9 @@ TARGETS=targets
 WORK=$TARGETS/playground
 INSTALL=$TARGETS/install
 
-LIMS_SERVER_NAME=lims-server
+LIMS_SERVER_NAME=openBIS-server
 LIMS_SERVER=$WORK/$LIMS_SERVER_NAME
-LIMS_CLIENT_NAME=lims-client
+LIMS_CLIENT_NAME=openBIS-client
 LIMS_CLIENT=$WORK/$LIMS_CLIENT_NAME
 
 DATA=$WORK/data
@@ -115,8 +115,8 @@ function wait_for_server {
 function install_lims_server {
     cp -R $TEMPLATE/$LIMS_SERVER_NAME $WORK
     
-    unzip -d $LIMS_SERVER $INSTALL/lims-server*.zip
-    $LIMS_SERVER/lims-server/install.sh $PWD/$LIMS_SERVER $LIMS_SERVER/service.properties $LIMS_SERVER/roles.conf
+    unzip -d $LIMS_SERVER $INSTALL/openBIS-server*.zip
+    $LIMS_SERVER/openBIS-server/install.sh $PWD/$LIMS_SERVER $LIMS_SERVER/service.properties $LIMS_SERVER/roles.conf
     wait_for_server
 }
 
@@ -137,7 +137,7 @@ function register_cell_plates {
 }
 
 function install_lims_client {
-    unpack lims-client
+    unpack openBIS-client
     cp -fR $TEMPLATE/$LIMS_CLIENT_NAME $WORK
 }
 
diff --git a/integration-tests/templates/etlserver-analys/etlserver.sh b/integration-tests/templates/etlserver-analys/etlserver.sh
index b1c99958be4e0f916d19d9059ff8cc4c6842ac87..0a9ff523e8bb044581e065de2ad5c01561d7950f 100755
--- a/integration-tests/templates/etlserver-analys/etlserver.sh
+++ b/integration-tests/templates/etlserver-analys/etlserver.sh
@@ -1,3 +1,3 @@
 #! /bin/sh
 ./shutdown.sh
-java -ea -Djavax.net.ssl.trustStore=etc/lims.keystore -jar lib/etlserver.jar "$@" & echo $! > running.pid
\ No newline at end of file
+java -ea -Djavax.net.ssl.trustStore=etc/openBIS.keystore -jar lib/etlserver.jar "$@" & echo $! > running.pid
\ No newline at end of file
diff --git a/integration-tests/templates/etlserver-raw/etlserver.sh b/integration-tests/templates/etlserver-raw/etlserver.sh
index b1c99958be4e0f916d19d9059ff8cc4c6842ac87..0a9ff523e8bb044581e065de2ad5c01561d7950f 100755
--- a/integration-tests/templates/etlserver-raw/etlserver.sh
+++ b/integration-tests/templates/etlserver-raw/etlserver.sh
@@ -1,3 +1,3 @@
 #! /bin/sh
 ./shutdown.sh
-java -ea -Djavax.net.ssl.trustStore=etc/lims.keystore -jar lib/etlserver.jar "$@" & echo $! > running.pid
\ No newline at end of file
+java -ea -Djavax.net.ssl.trustStore=etc/openBIS.keystore -jar lib/etlserver.jar "$@" & echo $! > running.pid
\ No newline at end of file