diff --git a/bukkit/Dockerfile b/bukkit/Dockerfile
index ae0ad8c..b3dc926 100644
--- a/bukkit/Dockerfile
+++ b/bukkit/Dockerfile
@@ -13,9 +13,9 @@ ENV XMN_SIZE=""
 # URL's for files
 ARG INSTALL_SCRIPT=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/bukkit/install_script.sh
 
-# Install java & Dependencies.
+# Install Java & Dependencies.
 RUN apt-get -y update \
-	&& apt-get install -y --no-install-recommends bzip2 lsb-release screen jq \
+	&& apt-get install -y --no-install-recommends bzip2 lsb-release jq \
 	&& apt-get -y --fix-broken install \
 	&& apt-get -y autoclean \
 	&& apt-get -y autoremove \
@@ -23,16 +23,16 @@ RUN apt-get -y update \
 	&& update-ca-certificates -f;
 
 # Folder creation.
-RUN mkdir -p /MCserver /MCtemp \
-	&& chmod 777 -R /MCserver /MCtemp \
-	&& chown 99:100 -R /MCserver /MCtemp
+RUN mkdir -p /mc_server /mc_temp \
+	&& chmod 777 -R /mc_server /mc_temp \
+	&& chown 99:100 -R /mc_server /mc_temp
 
 # Main script
-RUN wget "$INSTALL_SCRIPT" -O /MCtemp/install_script.sh \
-	&& chmod +x /MCtemp/install_script.sh
+RUN wget "$INSTALL_SCRIPT" -O /mc_temp/install_script.sh \
+	&& chmod +x /mc_temp/install_script.sh
 
 # Directory where data is stored
-VOLUME /MCserver
+VOLUME /mc_server
 
 # Run command
-CMD [ "/bin/bash", "./MCtemp/install_script.sh" ]
\ No newline at end of file
+CMD [ "/bin/bash", "./mc_temp/install_script.sh" ]
\ No newline at end of file
diff --git a/bukkit/install_script.sh b/bukkit/install_script.sh
index 26e92db..fe2b27a 100644
--- a/bukkit/install_script.sh
+++ b/bukkit/install_script.sh
@@ -2,7 +2,14 @@
 # Copyright (c) 2022 fithwum
 # All rights reserved
 
-MC_DIR=/MCserver
+MC_DIR_OLD=/MCserver
+MC_DIR=/mc_server
+
+if [ -d "$MC_DIR_OLD" ]; then
+    mkdir -p "$MC_DIR"
+    mv $MC_DIR_OLD/* "$MC_DIR/" 2>/dev/null || true
+fi
+
 EULA_FILE=$MC_DIR/eula.txt
 EULA_MARKER=$MC_DIR/.eula_accepted
 
@@ -55,7 +62,7 @@ if [ -e $MC_DIR/craftbukkit-$MC_VERSION.jar ]
 		# Copyright (c) 2022 fithwum
 		# All rights reserved
 
-		cd /MCserver
+		cd /mc_server
 		JAR=./craftbukkit-*.jar
 
 		while [ true ]; do
diff --git a/fabric/Dockerfile b/fabric/Dockerfile
index 06e024d..fed550d 100644
--- a/fabric/Dockerfile
+++ b/fabric/Dockerfile
@@ -15,9 +15,9 @@ ENV XMN_SIZE=""
 # URL's for files
 ARG INSTALL_SCRIPT=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/fabric/install_script.sh
 
-# Install java & Dependencies.
+# Install Java & Dependencies.
 RUN apt-get -y update \
-	&& apt-get install -y --no-install-recommends bzip2 lsb-release screen jq \
+	&& apt-get install -y --no-install-recommends bzip2 lsb-release jq \
 	&& apt-get -y --fix-broken install \
 	&& apt-get -y autoclean \
 	&& apt-get -y autoremove \
@@ -25,16 +25,16 @@ RUN apt-get -y update \
 	&& update-ca-certificates -f;
 
 # Folder creation.
-RUN mkdir -p /MCserver /MCtemp \
-	&& chmod 777 -R /MCserver /MCtemp \
-	&& chown 99:100 -R /MCserver /MCtemp
+RUN mkdir -p /mc_server /mc_temp \
+	&& chmod 777 -R /mc_server /mc_temp \
+	&& chown 99:100 -R /mc_server /mc_temp
 
 # Main script
-RUN wget "$INSTALL_SCRIPT" -O /MCtemp/install_script.sh \
-	&& chmod +x /MCtemp/install_script.sh
+RUN wget "$INSTALL_SCRIPT" -O /mc_temp/install_script.sh \
+	&& chmod +x /mc_temp/install_script.sh
 
 # Directory where data is stored
-VOLUME /MCserver
+VOLUME /mc_server
 
 # Run command
-CMD [ "/bin/bash", "./MCtemp/install_script.sh" ]
\ No newline at end of file
+CMD [ "/bin/bash", "./mc_temp/install_script.sh" ]
\ No newline at end of file
diff --git a/fabric/install_script.sh b/fabric/install_script.sh
index 01f7dbc..a03940a 100644
--- a/fabric/install_script.sh
+++ b/fabric/install_script.sh
@@ -2,7 +2,14 @@
 # Copyright (c) 2022 fithwum
 # All rights reserved
 
-MC_DIR=/MCserver
+MC_DIR_OLD=/MCserver
+MC_DIR=/mc_server
+
+if [ -d "$MC_DIR_OLD" ]; then
+    mkdir -p "$MC_DIR"
+    mv $MC_DIR_OLD/* "$MC_DIR/" 2>/dev/null || true
+fi
+
 EULA_FILE=$MC_DIR/eula.txt
 EULA_MARKER=$MC_DIR/.eula_accepted
 
@@ -55,7 +62,7 @@ if [ -e $MC_DIR/fabric-$MC_VERSION-$FABRIC_VERSION.jar ]
 		# Copyright (c) 2022 fithwum
 		# All rights reserved
 
-		cd /MCserver
+		cd /mc_server
 		JAR=./fabric-*-*.jar
 
 		while [ true ]; do
diff --git a/forge/Dockerfile b/forge/Dockerfile
index 171bc76..d4331a4 100644
--- a/forge/Dockerfile
+++ b/forge/Dockerfile
@@ -13,9 +13,9 @@ ENV XMN_SIZE=""
 # URL's for files
 ARG INSTALL_SCRIPT=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/forge/Install_Script.sh
 
-# Install java & Dependencies.
+# Install Java & Dependencies.
 RUN apt-get -y update \
-	&& apt-get install -y --no-install-recommends bzip2 lsb-release screen jq \
+	&& apt-get install -y --no-install-recommends bzip2 lsb-release jq \
 	&& apt-get -y --fix-broken install \
 	&& apt-get -y autoclean \
 	&& apt-get -y autoremove \
@@ -23,19 +23,16 @@ RUN apt-get -y update \
 	&& update-ca-certificates -f;
 
 # Folder creation.
-RUN mkdir -p /MCserver /MCtemp \
-	&& chmod 777 -R /MCserver /MCtemp \
-	&& chown 99:100 -R /MCserver /MCtemp \
-	&& cd /MCserver
+RUN mkdir -p /mc_server /mc_temp \
+	&& chmod 777 -R /mc_server /mc_temp \
+	&& chown 99:100 -R /mc_server /mc_temp
 
-ADD "$INSTALL_SCRIPT" /MCtemp
-RUN chmod +x /MCtemp/Install_Script.sh
+# Main script
+RUN wget "$INSTALL_SCRIPT" -O /mc_temp/install_script.sh \
+	&& chmod +x /mc_temp/install_script.sh
 
 # Directory where data is stored
-VOLUME /MCserver
-
-# 25565 Default.
-EXPOSE 25565/udp 25565/tcp
+VOLUME /mc_server
 
 # Run command
-CMD [ "/bin/bash", "./MCtemp/Install_Script.sh" ]
+CMD [ "/bin/bash", "./mc_temp/install_script.sh" ]
diff --git a/forge/Install_Script.sh b/forge/Install_Script.sh
index bfa8f1a..be8f9b1 100644
--- a/forge/Install_Script.sh
+++ b/forge/Install_Script.sh
@@ -2,7 +2,14 @@
 # Copyright (c) 2022 fithwum
 # All rights reserved
 
-MC_DIR=/MCserver
+MC_DIR_OLD=/MCserver
+MC_DIR=/mc_server
+
+if [ -d "$MC_DIR_OLD" ]; then
+    mkdir -p "$MC_DIR"
+    mv $MC_DIR_OLD/* "$MC_DIR/" 2>/dev/null || true
+fi
+
 EULA_FILE=$MC_DIR/eula.txt
 EULA_MARKER=$MC_DIR/.eula_accepted
 
diff --git a/neoforged/Dockerfile b/neoforged/Dockerfile
index 7f945b0..23fd02f 100644
--- a/neoforged/Dockerfile
+++ b/neoforged/Dockerfile
@@ -12,9 +12,9 @@ ENV XMN_SIZE=""
 # URL's for files
 ARG INSTALL_SCRIPT=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/neoforged/Install_Script.sh
 
-# Install java & Dependencies.
+# Install Java & Dependencies.
 RUN apt-get -y update \
-	&& apt-get install -y --no-install-recommends bzip2 lsb-release screen jq \
+	&& apt-get install -y --no-install-recommends bzip2 lsb-release jq \
 	&& apt-get -y --fix-broken install \
 	&& apt-get -y autoclean \
 	&& apt-get -y autoremove \
@@ -22,19 +22,16 @@ RUN apt-get -y update \
 	&& update-ca-certificates -f;
 
 # Folder creation.
-RUN mkdir -p /MCserver /MCtemp \
-	&& chmod 777 -R /MCserver /MCtemp \
-	&& chown 99:100 -R /MCserver /MCtemp \
-	&& cd /MCserver
+RUN mkdir -p /mc_server /mc_temp \
+	&& chmod 777 -R /mc_server /mc_temp \
+	&& chown 99:100 -R /mc_server /mc_temp
 
-ADD "$INSTALL_SCRIPT" /MCtemp
-RUN chmod +x /MCtemp/Install_Script.sh
+# Main script
+RUN wget "$INSTALL_SCRIPT" -O /mc_temp/install_script.sh \
+	&& chmod +x /mc_temp/install_script.sh
 
 # Directory where data is stored
-VOLUME /MCserver
-
-# 25565 Default.
-EXPOSE 25565/udp 25565/tcp
+VOLUME /mc_server
 
 # Run command
-CMD [ "/bin/bash", "./MCtemp/Install_Script.sh" ]
+CMD [ "/bin/bash", "./mc_temp/install_script.sh" ]
\ No newline at end of file
diff --git a/neoforged/Install_Script.sh b/neoforged/Install_Script.sh
index 8c31dc4..837843d 100644
--- a/neoforged/Install_Script.sh
+++ b/neoforged/Install_Script.sh
@@ -2,7 +2,14 @@
 # Copyright (c) 2022 fithwum
 # All rights reserved
 
-MC_DIR=/MCserver
+MC_DIR_OLD=/MCserver
+MC_DIR=/mc_server
+
+if [ -d "$MC_DIR_OLD" ]; then
+    mkdir -p "$MC_DIR"
+    mv $MC_DIR_OLD/* "$MC_DIR/" 2>/dev/null || true
+fi
+
 EULA_FILE=$MC_DIR/eula.txt
 EULA_MARKER=$MC_DIR/.eula_accepted
 
diff --git a/quilt/Dockerfile b/quilt/Dockerfile
index 85669d7..08d24cd 100644
--- a/quilt/Dockerfile
+++ b/quilt/Dockerfile
@@ -13,9 +13,9 @@ ENV XMN_SIZE=""
 # URL's for files
 ARG INSTALL_SCRIPT=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/quilt/Install_Script.sh
 
-# Install java & Dependencies.
+# Install Java & Dependencies.
 RUN apt-get -y update \
-	&& apt-get install -y --no-install-recommends bzip2 lsb-release screen jq \
+	&& apt-get install -y --no-install-recommends bzip2 lsb-release jq \
 	&& apt-get -y --fix-broken install \
 	&& apt-get -y autoclean \
 	&& apt-get -y autoremove \
@@ -23,19 +23,16 @@ RUN apt-get -y update \
 	&& update-ca-certificates -f;
 
 # Folder creation.
-RUN mkdir -p /MCserver /MCtemp \
-	&& chmod 777 -R /MCserver /MCtemp \
-	&& chown 99:100 -R /MCserver /MCtemp \
-	&& cd /MCserver
+RUN mkdir -p /mc_server /mc_temp \
+	&& chmod 777 -R /mc_server /mc_temp \
+	&& chown 99:100 -R /mc_server /mc_temp
 
-ADD "$INSTALL_SCRIPT" /MCtemp
-RUN chmod +x /MCtemp/Install_Script.sh
+# Main script
+RUN wget "$INSTALL_SCRIPT" -O /mc_temp/install_script.sh \
+	&& chmod +x /mc_temp/install_script.sh
 
 # Directory where data is stored
-VOLUME /MCserver
-
-# 25565 Default.
-EXPOSE 25565/udp 25565/tcp
+VOLUME /mc_server
 
 # Run command
-CMD [ "/bin/bash", "./MCtemp/Install_Script.sh" ]
+CMD [ "/bin/bash", "./mc_temp/install_script.sh" ]
diff --git a/quilt/Install_Script.sh b/quilt/Install_Script.sh
index e57e57d..cbd7681 100644
--- a/quilt/Install_Script.sh
+++ b/quilt/Install_Script.sh
@@ -2,7 +2,14 @@
 # Copyright (c) 2022 fithwum
 # All rights reserved
 
-MC_DIR=/MCserver
+MC_DIR_OLD=/MCserver
+MC_DIR=/mc_server
+
+if [ -d "$MC_DIR_OLD" ]; then
+    mkdir -p "$MC_DIR"
+    mv $MC_DIR_OLD/* "$MC_DIR/" 2>/dev/null || true
+fi
+
 EULA_FILE=$MC_DIR/eula.txt
 EULA_MARKER=$MC_DIR/.eula_accepted
 
@@ -63,7 +70,7 @@ if [ -e $MC_DIR/quilt-installer-$QUILT_VERSION.jar ]
 		# Copyright (c) 2022 fithwum
 		# All rights reserved
 
-		cd /MCserver
+		cd /mc_server
 		JAR=./quilt-server-launch.jar
 
 		while [ true ]; do
diff --git a/vanilla/Dockerfile b/vanilla/Dockerfile
index 68aed37..2387be3 100644
--- a/vanilla/Dockerfile
+++ b/vanilla/Dockerfile
@@ -15,7 +15,7 @@ ARG INSTALL_SCRIPT=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/maste
 
 # Install Java & Dependencies.
 RUN apt-get -y update \
-	&& apt-get install -y --no-install-recommends bzip2 lsb-release screen jq \
+	&& apt-get install -y --no-install-recommends bzip2 lsb-release jq \
 	&& apt-get -y --fix-broken install \
 	&& apt-get -y autoclean \
 	&& apt-get -y autoremove \
@@ -23,16 +23,16 @@ RUN apt-get -y update \
 	&& update-ca-certificates -f;
 
 # Folder creation.
-RUN mkdir -p /MCserver /MCtemp \
-	&& chmod 777 -R /MCserver /MCtemp \
-	&& chown 99:100 -R /MCserver /MCtemp
+RUN mkdir -p /mc_server /mc_temp \
+	&& chmod 777 -R /mc_server /mc_temp \
+	&& chown 99:100 -R /mc_server /mc_temp
 
 # Main script
-RUN wget "$INSTALL_SCRIPT" -O /MCtemp/install_script.sh \
-	&& chmod +x /MCtemp/install_script.sh
+RUN wget "$INSTALL_SCRIPT" -O /mc_temp/install_script.sh \
+	&& chmod +x /mc_temp/install_script.sh
 
 # Directory where data is stored
-VOLUME /MCserver
+VOLUME /mc_server
 
 # Run command
-CMD [ "/bin/bash", "./MCtemp/install_script.sh" ]
\ No newline at end of file
+CMD [ "/bin/bash", "./mc_temp/install_script.sh" ]
\ No newline at end of file
diff --git a/vanilla/install_script.sh b/vanilla/install_script.sh
index 7b76d27..28c8a30 100644
--- a/vanilla/install_script.sh
+++ b/vanilla/install_script.sh
@@ -2,7 +2,14 @@
 # Copyright (c) 2022 fithwum
 # All rights reserved
 
-MC_DIR=/MCserver
+MC_DIR_OLD=/MCserver
+MC_DIR=/mc_server
+
+if [ -d "$MC_DIR_OLD" ]; then
+    mkdir -p "$MC_DIR"
+    mv $MC_DIR_OLD/* "$MC_DIR/" 2>/dev/null || true
+fi
+
 EULA_FILE=$MC_DIR/eula.txt
 EULA_MARKER=$MC_DIR/.eula_accepted
 
@@ -34,19 +41,19 @@ fi
 
 # Main install (Debian).
 # Check for server files and download if needed.
-if [ -e $MC_DIR/MCserver-$MC_VERSION.jar ]
+if [ -e $MC_DIR/mcserver-$MC_VERSION.jar ]
 	then
 		echo " "
-		echo "INFO ! MCserver-$MC_VERSION.jar found starting now."
+		echo "INFO ! mcserver-$MC_VERSION.jar found starting now."
 	else
 		echo " "
-		echo "WARNING ! MCserver-$MC_VERSION.jar is out of date/missing ... will download now."
+		echo "WARNING ! mcserver-$MC_VERSION.jar is out of date/missing ... will download now."
 		echo " "
 		echo "INFO ! Cleaning old files."
 		mkdir -p $MC_DIR/old-server-versions/
-		mv $MC_DIR/MCserver-*.jar $MC_DIR/old-server-versions/
-		wget --no-cache --show-progress --progress=bar:force:noscroll $MC_SERVER_FILE -O $MC_DIR/MCserver-$MC_VERSION.jar
-		chmod +x $MC_DIR/MCserver-$MC_VERSION.jar
+		mv $MC_DIR/*.jar $MC_DIR/old-server-versions/
+		wget --no-cache --show-progress --progress=bar:force:noscroll $MC_SERVER_FILE -O $MC_DIR/mcserver-$MC_VERSION.jar
+		chmod +x $MC_DIR/mcserver-$MC_VERSION.jar
 		echo " "
 		echo "WARNING ! run-$MC_TYPE-$MC_VERSION.sh is out of date/missing ... will generate now."
 		mv -v $MC_DIR/run-*.sh $MC_DIR/old-server-versions/
@@ -55,8 +62,8 @@ if [ -e $MC_DIR/MCserver-$MC_VERSION.jar ]
 		# Copyright (c) 2022 fithwum
 		# All rights reserved
 
-		cd /MCserver
-		JAR=./MCserver-*.jar
+		cd /mc_server
+		JAR=./mcserver-*.jar
 
 		while [ true ]; do
 			java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
diff --git a/vanilla/run.sh b/vanilla/run.sh
deleted file mode 100644
index f294f43..0000000
--- a/vanilla/run.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-# Copyright (c) 2022 fithwum
-# All rights reserved
-
-cd /MCserver
-JAR=./MCserver-*.jar
-
-while [ true ]; do
-  java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -jar $JAR nogui
-  if [ $? -eq 0 ]; then
-    break
-  fi
-done
\ No newline at end of file