diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index b532438071..f3e8935f1b 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -92,10 +92,10 @@
       "label": "Run Backend CE",
       "type": "shell",
       "windows": {
-        "command": "./run-server.bat"
+        "command": "./run-cloudbeaver-server.bat"
       },
       "osx": {
-        "command": "./run-server.sh"
+        "command": "./run-cloudbeaver-server.sh"
       },
       "options": {
         "cwd": "${workspaceFolder}/deploy/cloudbeaver"
diff --git a/deploy/build-frontend.sh b/deploy/build-frontend.sh
index d701060354..52d7c6ecd0 100755
--- a/deploy/build-frontend.sh
+++ b/deploy/build-frontend.sh
@@ -28,4 +28,4 @@ echo "Copy static content"
 
 cp -rp ../webapp/packages/product-default/lib/* cloudbeaver/web
 
-echo "Cloudbeaver is ready. Run run-server.sh in cloudbeaver folder to start the server."
+echo "Cloudbeaver is ready. Run run-cloudbeaver-server.sh in cloudbeaver folder to start the server."
diff --git a/deploy/build.bat b/deploy/build.bat
index 940c64f6da..00954ddc35 100644
--- a/deploy/build.bat
+++ b/deploy/build.bat
@@ -72,6 +72,6 @@ echo "Copy static content"
 
 xcopy /E /Q ..\webapp\packages\product-default\lib cloudbeaver\web >NUL
 
-echo "Cloudbeaver is ready. Run run-server.bat in cloudbeaver folder to start the server."
+echo "Cloudbeaver is ready. Run run-cloudbeaver-server.bat in cloudbeaver folder to start the server."
 
 pause
diff --git a/deploy/docker/cloudbeaver-ce/Dockerfile b/deploy/docker/cloudbeaver-ce/Dockerfile
index 6ff09b7590..a359ed8e9b 100644
--- a/deploy/docker/cloudbeaver-ce/Dockerfile
+++ b/deploy/docker/cloudbeaver-ce/Dockerfile
@@ -16,6 +16,6 @@ EXPOSE 8978
 RUN find /opt/cloudbeaver -type d -exec chmod 775 {} \;
 WORKDIR /opt/cloudbeaver/
 
-RUN chmod +x "run-server.sh" "/opt/cloudbeaver/launch-product.sh"
+RUN chmod +x "run-cloudbeaver-server.sh" "/opt/cloudbeaver/launch-product.sh"
 
 ENTRYPOINT ["./launch-product.sh"]
diff --git a/deploy/scripts/server-cli.sh b/deploy/scripts/cbvr.sh
similarity index 73%
rename from deploy/scripts/server-cli.sh
rename to deploy/scripts/cbvr.sh
index 5311c87663..a2c8aef691 100755
--- a/deploy/scripts/server-cli.sh
+++ b/deploy/scripts/cbvr.sh
@@ -6,4 +6,4 @@ if [[ $# -eq 0 ]] ;
 fi
 set -- "$@" -cli-mode
 
-source run-server.sh "$@"
\ No newline at end of file
+source run-cloudbeaver-server.sh "$@"
\ No newline at end of file
diff --git a/deploy/scripts/launch-product.sh b/deploy/scripts/launch-product.sh
index 3dc4e279b6..0a257ab874 100644
--- a/deploy/scripts/launch-product.sh
+++ b/deploy/scripts/launch-product.sh
@@ -12,8 +12,8 @@ if [ "$(id -u)" -eq 0 ]; then
     TARGET_GID=${TARGET_GID:-$DBEAVER_GID}
 
     chown -R $DBEAVER_UID:$DBEAVER_GID $PWD/workspace
-    # Execute run-server.sh as the dbeaver user with the JAVA_HOME and PATH environment variables
-    exec su "$TARGET_USER" -c "JAVA_HOME=$JAVA_HOME PATH=$PATH ./run-server.sh"
+    # Execute run-cloudbeaver-server.sh as the dbeaver user with the JAVA_HOME and PATH environment variables
+    exec su "$TARGET_USER" -c "JAVA_HOME=$JAVA_HOME PATH=$PATH ./run-cloudbeaver-server.sh"
 else
-    exec ./run-server.sh
+    exec ./run-cloudbeaver-server.sh
 fi
\ No newline at end of file
diff --git a/deploy/scripts/run-server.bat b/deploy/scripts/run-cloudbeaver-server.bat
similarity index 100%
rename from deploy/scripts/run-server.bat
rename to deploy/scripts/run-cloudbeaver-server.bat
diff --git a/deploy/scripts/run-server.sh b/deploy/scripts/run-cloudbeaver-server.sh
similarity index 100%
rename from deploy/scripts/run-server.sh
rename to deploy/scripts/run-cloudbeaver-server.sh
diff --git a/server/features/io.cloudbeaver.product.ce.feature/root/readme.txt b/server/features/io.cloudbeaver.product.ce.feature/root/readme.txt
index 23d389db61..03eabf9053 100644
--- a/server/features/io.cloudbeaver.product.ce.feature/root/readme.txt
+++ b/server/features/io.cloudbeaver.product.ce.feature/root/readme.txt
@@ -10,7 +10,7 @@ Running server
 ========================
   1. View and modify server configuration before the first start.
      Validate init-data.conf - you won't be able to change these parameters after the first server start.
-  2. Execute run-server.sh script in the root directory.
+  2. Execute run-cloudbeaver-server.sh script in the root directory.
 
 Command line parameters
 ========================
diff --git a/webapp/readme.md b/webapp/readme.md
index 8189ef219a..779ea8bb3d 100644
--- a/webapp/readme.md
+++ b/webapp/readme.md
@@ -55,12 +55,12 @@ Welcome! Follow these steps to install and run the frontend dev server.
 
    *For macOS/Linux:*
    ```bash
-   ./run-server.sh
+   ./run-cloudbeaver-server.sh
    ```
 
    *For Windows:*
    ```bash
-   ./run-server.bat
+   ./run-cloudbeaver-server.bat
    ```
 
 4. **Navigate to the Webapp Directory**