diff --git a/Firmware/language_all.cpp b/Firmware/language_all.cpp
index da2d1a538..9f47e0878 100644
--- a/Firmware/language_all.cpp
+++ b/Firmware/language_all.cpp
@@ -605,7 +605,7 @@ const char * const MSG_CALIBRATE_PINDA_LANG_TABLE[LANG_NUM] PROGMEM = {
 	MSG_CALIBRATE_PINDA_DE
 };
 
-const char MSG_CALIBRATION_PINDA_MENU_EN[] PROGMEM = "Temp. calibration";
+const char MSG_CALIBRATION_PINDA_MENU_EN[] PROGMEM = "PINDA temp. cal. ";
 const char MSG_CALIBRATION_PINDA_MENU_CZ[] PROGMEM = "Teplot. kalibrace";
 const char MSG_CALIBRATION_PINDA_MENU_IT[] PROGMEM = "Taratura temp.";
 const char MSG_CALIBRATION_PINDA_MENU_ES[] PROGMEM = "Calibracion temp.";
@@ -2127,7 +2127,7 @@ const char * const MSG_PICK_Z_LANG_TABLE[LANG_NUM] PROGMEM = {
 	MSG_PICK_Z_DE
 };
 
-const char MSG_PID_EXTRUDER_EN[] PROGMEM = "PID calibration";
+const char MSG_PID_EXTRUDER_EN[] PROGMEM = "Extruder PID cal.";
 const char MSG_PID_EXTRUDER_CZ[] PROGMEM = "PID kalibrace";
 const char MSG_PID_EXTRUDER_IT[] PROGMEM = "Calibrazione PID";
 const char MSG_PID_EXTRUDER_ES[] PROGMEM = "Calibracion PID";
@@ -3667,7 +3667,7 @@ const char * const MSG_WATCHDOG_RESET_LANG_TABLE[1] PROGMEM = {
 	MSG_WATCHDOG_RESET_EN
 };
 
-const char MSG_WIZARD_EN[] PROGMEM = "Wizard";
+const char MSG_WIZARD_EN[] PROGMEM = "Setup Wizard";
 const char * const MSG_WIZARD_LANG_TABLE[1] PROGMEM = {
 	MSG_WIZARD_EN
 };
diff --git a/Firmware/language_en.h b/Firmware/language_en.h
index 21d7b6a6c..fd46c9542 100644
--- a/Firmware/language_en.h
+++ b/Firmware/language_en.h
@@ -291,13 +291,13 @@
 #define(length=20, lines=1) MSG_FINISHING_MOVEMENTS				"Finishing movements"
 #define(length=20, lines=1) MSG_PRINT_PAUSED					"Print paused"
 #define(length=20, lines=1) MSG_RESUMING_PRINT					"Resuming print"
-#define(length=17, lines=1) MSG_PID_EXTRUDER					"PID calibration"
+#define(length=17, lines=1) MSG_PID_EXTRUDER					"Extruder PID cal."
 #define(length=19, lines=1) MSG_SET_TEMPERATURE					"Set temperature:"
 #define(length=20, lines=1) MSG_PID_FINISHED					"PID cal. finished"
-#define(length=20, lines=1) MSG_PID_RUNNING						"PID cal.           "
+#define(length=20, lines=1) MSG_PID_RUNNING					"PID cal.           "
 
 #define(length=17, lines=1) MSG_CALIBRATE_PINDA					"Calibrate"
-#define(length=17, lines=1) MSG_CALIBRATION_PINDA_MENU			"Temp. calibration"
+#define(length=17, lines=1) MSG_CALIBRATION_PINDA_MENU			"PINDA temp. cal. "
 #define(length=20, lines=4) MSG_PINDA_NOT_CALIBRATED			"Temperature calibration has not been run yet"
 #define(length=20, lines=1) MSG_PINDA_PREHEAT					"PINDA Heating"
 #define(length=20, lines=1) MSG_TEMP_CALIBRATION				"Temp. cal.          "
@@ -329,7 +329,7 @@
 #define(length=17, lines=1) MSG_SORT_NONE						"Sort: [None]"
 #define(length=20, lines=1) MSG_SORTING							"Sorting files"
 #define(length=20, lines=2) MSG_FILE_INCOMPLETE					"File incomplete. Continue anyway?"
-#define(length=17, lines=1) MSG_WIZARD							"Wizard"
+#define(length=17, lines=1) MSG_WIZARD							 "Setup Wizard"
 #define(length=20, lines=7)	MSG_WIZARD_WELCOME					"Hi, I am your Original Prusa i3 printer. Would you like me to guide you through the setup process?"
 #define(length=20, lines=8) MSG_WIZARD_QUIT						"You can always resume the Wizard from Calibration -> Wizard."
 #define(length=20, lines=8) MSG_WIZARD_SELFTEST					"First, I will run the selftest to check most common assembly problems."