diff --git a/conf/airframes/tudelft/bebop_course_orangeavoid.xml b/conf/airframes/tudelft/bebop_course_orangeavoid.xml
index 91c718d499..25a87aca0b 100644
--- a/conf/airframes/tudelft/bebop_course_orangeavoid.xml
+++ b/conf/airframes/tudelft/bebop_course_orangeavoid.xml
@@ -25,7 +25,7 @@
 
     </target>
     <target name="nps" board="pc">
-      <module name="fdm" type="gazebo"/>
+      <module name="fdm" type="gazebo_classic"/>
       <define name="VIDEO_CAPTURE_PATH" value="/tmp/paparazzi/images"/>
       <define name="LOGGER_FILE_PATH" value="/tmp/paparazzi/log"/>
       
diff --git a/conf/modules/fdm_gazebo_classic.xml b/conf/modules/fdm_gazebo_classic.xml
index c3106c9073..587b883d8d 100644
--- a/conf/modules/fdm_gazebo_classic.xml
+++ b/conf/modules/fdm_gazebo_classic.xml
@@ -1,13 +1,13 @@
 <!DOCTYPE module SYSTEM "module.dtd">
 
-<module name="fdm_gazebo" dir="fdm">
+<module name="fdm_gazebo_classic" dir="fdm">
   <doc>
     <description>
       Gazebo backend for NPS simulator
       NPS doc: http://wiki.paparazziuav.org/wiki/NPS
 
       Usage:
-      1. Make sure gazebo 9 is installed. (sudo apt-get install gazebo9 libgazebo9-dev)
+      1. Make sure gazebo 11 is installed. (sudo apt-get install gazebo11 libgazebo11-dev)
       2. Prepare the Gazebo world and model:
         1. Prepare the UAV model (see conf/simulator/gazebo/models/ardrone/):
           - Place the aircraft model in the conf/simulator/gazebo/models/
@@ -146,7 +146,7 @@
         nps.LDFLAGS  += -lopencv_imgproc -lopencv_highgui -lopencv_core
       endif
     </raw>
-    <file name="nps_fdm_gazebo.cpp" dir="nps"/>
+    <file name="nps_fdm_gazebo_classic.cpp" dir="nps"/>
   </makefile>
 </module>