diff --git a/.github/travis/legacy-build.sh b/.github/travis/legacy-build.sh
index 2368fc298..8679f0a4a 100755
--- a/.github/travis/legacy-build.sh
+++ b/.github/travis/legacy-build.sh
@@ -1,30 +1,34 @@
 #!/bin/sh
 set -xe
-cp Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h Firmware/Configuration_prusa.h
-bash -x build.sh || { echo "1_75mm_MK3S-EINSy10a-E3Dv6full variant failed" && false; }
-bash -x build.sh EN_FARM || { echo "1_75mm_MK3S-EINSy10a-E3Dv6full EN_FARM failed" && false; }
+cp Firmware/variants/MK3S.h Firmware/Configuration_prusa.h
+bash -x build.sh || { echo "MK3S variant failed" && false; }
+bash -x build.sh EN_FARM || { echo "MK3S EN_FARM failed" && false; }
 rm Firmware/Configuration_prusa.h
-cp Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h Firmware/Configuration_prusa.h
-bash -x build.sh || { echo "1_75mm_MK3-EINSy10a-E3Dv6full variant failed" && false; }
-bash -x build.sh EN_FARM || { echo "1_75mm_MK3-EINSy10a-E3Dv6full EN_FARM failed" && false; }
+cp Firmware/variants/MK3.h Firmware/Configuration_prusa.h
+bash -x build.sh || { echo "MK3 variant failed" && false; }
+bash -x build.sh EN_FARM || { echo "MK3 EN_FARM failed" && false; }
 rm Firmware/Configuration_prusa.h
-cp Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h Firmware/Configuration_prusa.h
-bash -x build.sh || { echo "1_75mm_MK25S-RAMBo13a-E3Dv6full variant failed" && false; }
+cp Firmware/variants/MK25S-RAMBo13a.h Firmware/Configuration_prusa.h
+bash -x build.sh || { echo "MK25S-RAMBo13a variant failed" && false; }
 rm Firmware/Configuration_prusa.h
-cp Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h Firmware/Configuration_prusa.h
-bash -x build.sh || { echo "1_75mm_MK25S-RAMBo10a-E3Dv6full variant failed" && false; }
+cp Firmware/variants/MK25S-RAMBo10a.h Firmware/Configuration_prusa.h
+bash -x build.sh || { echo "MK25S-RAMBo10a variant failed" && false; }
 rm Firmware/Configuration_prusa.h
-cp Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h Firmware/Configuration_prusa.h
-bash -x build.sh || { echo "1_75mm_MK25-RAMBo13a-E3Dv6full variant failed" && false; }
+cp Firmware/variants/MK25-RAMBo13a.h Firmware/Configuration_prusa.h
+bash -x build.sh || { echo "MK25-RAMBo13a variant failed" && false; }
 rm Firmware/Configuration_prusa.h
-cp Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h Firmware/Configuration_prusa.h
-bash -x build.sh || { echo "1_75mm_MK25-RAMBo10a-E3Dv6full variant failed" && false; }
-cp Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO.h Firmware/Configuration_prusa.h
-bash -x build.sh || { echo "1_75mm_MK3S-EINSy10a-E3DREVO variant failed" && false; }
-cp Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO.h Firmware/Configuration_prusa.h
-bash -x build.sh || { echo "1_75mm_MK3-EINSy10a-E3DREVO variant failed" && false; }
-cp Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO_HF_60W.h Firmware/Configuration_prusa.h
-bash -x build.sh || { echo "1_75mm_MK3S-EINSy10a-E3DREVO_HF_60W variant failed" && false; }
-cp Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO_HF_60W.h Firmware/Configuration_prusa.h
-bash -x build.sh || { echo "1_75mm_MK3-EINSy10a-E3DREVO_HF_60W variant failed" && false; }
+cp Firmware/variants/MK25-RAMBo10a.h Firmware/Configuration_prusa.h
+bash -x build.sh || { echo "MK25-RAMBo10a variant failed" && false; }
+rm Firmware/Configuration_prusa.h
+cp Firmware/variants/MK3S-E3DREVO.h Firmware/Configuration_prusa.h
+bash -x build.sh || { echo "MK3S-E3DREVO variant failed" && false; }
+rm Firmware/Configuration_prusa.h
+cp Firmware/variants/MK3-E3DREVO.h Firmware/Configuration_prusa.h
+bash -x build.sh || { echo "MK3-E3DREVO variant failed" && false; }
+rm Firmware/Configuration_prusa.h
+cp Firmware/variants/MK3S-E3DREVO_HF_60W.h Firmware/Configuration_prusa.h
+bash -x build.sh || { echo "MK3S-E3DREVO_HF_60W variant failed" && false; }
+rm Firmware/Configuration_prusa.h
+cp Firmware/variants/MK3-E3DREVO_HF_60W.h Firmware/Configuration_prusa.h
+bash -x build.sh || { echo "MK3-E3DREVO_HF_60W variant failed" && false; }
 rm Firmware/Configuration_prusa.h
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d16f6e78e..d2355d016 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -501,10 +501,9 @@ if(CMAKE_CROSSCOMPILING)
     endif()
 
     message("Variant added: ${THIS_VAR}")
-    string(REPLACE "-E3Dv6full" "" DIR_NAME "${THIS_VAR}")
-    string(REPLACE "1_75mm_" "" DIR_NAME "${DIR_NAME}")
 
     # Generate a file in a subfolder so that we can organize things a little more neatly in VS code
+    set(DIR_NAME ${THIS_VAR})
     file(MAKE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/build_gen/${DIR_NAME})
     file(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/build_gen/${DIR_NAME}/CMakeLists.txt
          "project(${DIR_NAME})\nfw_add_variant(${THIS_VAR})"
diff --git a/Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h b/Firmware/variants/MK25-RAMBo10a.h
similarity index 100%
rename from Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h
rename to Firmware/variants/MK25-RAMBo10a.h
diff --git a/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h b/Firmware/variants/MK25-RAMBo13a.h
similarity index 100%
rename from Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h
rename to Firmware/variants/MK25-RAMBo13a.h
diff --git a/Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h b/Firmware/variants/MK25S-RAMBo10a.h
similarity index 100%
rename from Firmware/variants/1_75mm_MK25S-RAMBo10a-E3Dv6full.h
rename to Firmware/variants/MK25S-RAMBo10a.h
diff --git a/Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h b/Firmware/variants/MK25S-RAMBo13a.h
similarity index 100%
rename from Firmware/variants/1_75mm_MK25S-RAMBo13a-E3Dv6full.h
rename to Firmware/variants/MK25S-RAMBo13a.h
diff --git a/Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO.h b/Firmware/variants/MK3-E3DREVO.h
similarity index 100%
rename from Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO.h
rename to Firmware/variants/MK3-E3DREVO.h
diff --git a/Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO_HF_60W.h b/Firmware/variants/MK3-E3DREVO_HF_60W.h
similarity index 100%
rename from Firmware/variants/1_75mm_MK3-EINSy10a-E3DREVO_HF_60W.h
rename to Firmware/variants/MK3-E3DREVO_HF_60W.h
diff --git a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h b/Firmware/variants/MK3.h
similarity index 100%
rename from Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h
rename to Firmware/variants/MK3.h
diff --git a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO.h b/Firmware/variants/MK3S-E3DREVO.h
similarity index 100%
rename from Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO.h
rename to Firmware/variants/MK3S-E3DREVO.h
diff --git a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO_HF_60W.h b/Firmware/variants/MK3S-E3DREVO_HF_60W.h
similarity index 100%
rename from Firmware/variants/1_75mm_MK3S-EINSy10a-E3DREVO_HF_60W.h
rename to Firmware/variants/MK3S-E3DREVO_HF_60W.h
diff --git a/Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h b/Firmware/variants/MK3S.h
similarity index 100%
rename from Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h
rename to Firmware/variants/MK3S.h
diff --git a/README.md b/README.md
index c7c66972e..b766a776a 100644
--- a/README.md
+++ b/README.md
@@ -147,7 +147,7 @@ After updating the kit, you may need to reload VScode.
 
 #### Building
 
-To start building a firmware, click the CMake Tools plugin icon on the far left side. You will get a very large list of targets to build. Find the firmware you'd like to build (like `MK3S-EINSy10a_ENGLISH`) and select the small icon which shows "Build" when hovered over.
+To start building a firmware, click the CMake Tools plugin icon on the far left side. You will get a very large list of targets to build. Find the firmware you'd like to build (like `MK3S_ENGLISH`) and select the small icon which shows "Build" when hovered over.
 
 The built .hex file can then be found in folder `Prusa-Firmware/build`
 
diff --git a/build.sh b/build.sh
index ec4d5329b..856c80361 100755
--- a/build.sh
+++ b/build.sh
@@ -34,7 +34,7 @@ cd Prusa-Firmware-build || exit 7
 BUILD_PATH="$( pwd -P )"
 
 if [ ! -f "$SCRIPT_PATH/Firmware/Configuration_prusa.h" ]; then
-    cp $SCRIPT_PATH/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h $SCRIPT_PATH/Firmware/Configuration_prusa.h || exit 8
+    cp $SCRIPT_PATH/Firmware/variants/MK3.h $SCRIPT_PATH/Firmware/Configuration_prusa.h || exit 8
 fi
 
 if [[ ! -z $LANGUAGES && $LANGUAGES == "EN_FARM" ]]; then