diff --git a/src/drivers/pwm_out_rc_in/pwm_out_rc_in.cpp b/src/drivers/pwm_out_rc_in/pwm_out_rc_in.cpp
index 7f25d9bad6..b9efc7a0d0 100644
--- a/src/drivers/pwm_out_rc_in/pwm_out_rc_in.cpp
+++ b/src/drivers/pwm_out_rc_in/pwm_out_rc_in.cpp
@@ -47,7 +47,7 @@
 #include <drivers/drv_hrt.h>
 #include <drivers/drv_mixer.h>
 #include <lib/mixer/mixer.h>
-#include <lib/mixer/mixer_multirotor.generated.h>
+#include <lib/mixer/mixer_multirotor_normalized.generated.h>
 #include <systemlib/param/param.h>
 #include <systemlib/pwm_limit/pwm_limit.h>
 #include <dev_fs_lib_serial.h>
diff --git a/src/drivers/snapdragon_pwm_out/snapdragon_pwm_out.cpp b/src/drivers/snapdragon_pwm_out/snapdragon_pwm_out.cpp
index 196c39744c..7727cd2a6c 100644
--- a/src/drivers/snapdragon_pwm_out/snapdragon_pwm_out.cpp
+++ b/src/drivers/snapdragon_pwm_out/snapdragon_pwm_out.cpp
@@ -49,7 +49,7 @@
 #include <drivers/drv_mixer.h>
 #include <lib/mixer/mixer.h>
 #include <lib/mixer/mixer_load.h>
-#include <lib/mixer/mixer_multirotor.generated.h>
+#include <lib/mixer/mixer_multirotor_normalized.generated.h>
 #include <systemlib/param/param.h>
 #include <systemlib/pwm_limit/pwm_limit.h>
 #include <dev_fs_lib_pwm.h>
diff --git a/src/lib/mixer/mixer.h b/src/lib/mixer/mixer.h
index e14b5107c6..b51de24e39 100644
--- a/src/lib/mixer/mixer.h
+++ b/src/lib/mixer/mixer.h
@@ -527,7 +527,7 @@ private:
 /**
  * Supported multirotor geometries.
  *
- * Values are generated by the multi_tables script and placed to mixer_multirotor.generated.h
+ * Values are generated by the px_generate_mixers.py script and placed to mixer_multirotor_normalized.generated.h
  */
 typedef unsigned int MultirotorGeometryUnderlyingType;
 enum class MultirotorGeometry : MultirotorGeometryUnderlyingType;
diff --git a/src/lib/mixer/mixer_multirotor.cpp b/src/lib/mixer/mixer_multirotor.cpp
index 715219c4d2..0a34a4fba4 100644
--- a/src/lib/mixer/mixer_multirotor.cpp
+++ b/src/lib/mixer/mixer_multirotor.cpp
@@ -56,10 +56,9 @@
 
 #include "mixer.h"
 
-// This file is generated by the multi_tables script which is invoked during the build process
+// This file is generated by the px_generate_mixers.py script which is invoked during the build process
 // #include "mixer_multirotor.generated.h"
 #include "mixer_multirotor_normalized.generated.h"
-// #include "mixer_multirotor_legacy.generated.h"
 
 #define debug(fmt, args...)	do { } while(0)
 //#define debug(fmt, args...)	do { printf("[mixer] " fmt "\n", ##args); } while(0)
diff --git a/src/platforms/qurt/fc_addon/uart_esc/uart_esc_main.cpp b/src/platforms/qurt/fc_addon/uart_esc/uart_esc_main.cpp
index a2284e45a6..7a4548650e 100644
--- a/src/platforms/qurt/fc_addon/uart_esc/uart_esc_main.cpp
+++ b/src/platforms/qurt/fc_addon/uart_esc/uart_esc_main.cpp
@@ -47,7 +47,7 @@
 #include <drivers/drv_hrt.h>
 #include <drivers/drv_mixer.h>
 #include <lib/mixer/mixer.h>
-#include <lib/mixer/mixer_multirotor.generated.h>
+#include <lib/mixer/mixer_multirotor_normalized.generated.h>
 #include <systemlib/param/param.h>
 
 #ifdef __cplusplus