diff --git a/conf/modules/nav_poly_survey_osam.xml b/conf/modules/nav_survey_poly_osam.xml
similarity index 58%
rename from conf/modules/nav_poly_survey_osam.xml
rename to conf/modules/nav_survey_poly_osam.xml
index c39f27194ee..2e535727e71 100644
--- a/conf/modules/nav_poly_survey_osam.xml
+++ b/conf/modules/nav_survey_poly_osam.xml
@@ -1,16 +1,16 @@
 <!DOCTYPE module SYSTEM "module.dtd">
 
-<module name="nav_poly_survey_osam" dir="nav">
+<module name="nav_survey_poly" dir="nav">
   <doc>
     <description>
        Polygon survey from OSAM
     </description>
   </doc>
   <header>
-    <file name="nav_poly_survey_osam.h"/>
+    <file name="nav_survey_poly_osam.h"/>
   </header>
   <makefile>
-    <file name="nav_poly_survey_osam.c"/>
+    <file name="nav_survey_poly_osam.c"/>
   </makefile>
 </module>
 
diff --git a/sw/airborne/modules/nav/nav_survey_poly_adv.c b/sw/airborne/modules/nav/nav_survey_poly_adv.c
index 4b02bc2a90e..6965c44843c 100644
--- a/sw/airborne/modules/nav/nav_survey_poly_adv.c
+++ b/sw/airborne/modules/nav/nav_survey_poly_adv.c
@@ -129,7 +129,7 @@ static bool_t get_two_intersects(struct FloatVect2 *x, struct FloatVect2 *y, str
  *  @param min_rad       minimal radius when navigating
  *  @param altitude      the altitude that must be reached before the flyover starts
  **/
-bool_t poly_survey_adv_start(uint8_t first_wp, uint8_t size, float angle, float sweep_width, float shot_dist, float min_rad, float altitude)
+bool_t nav_survey_poly_adv_start(uint8_t first_wp, uint8_t size, float angle, float sweep_width, float shot_dist, float min_rad, float altitude)
 {
   int i;
   struct FloatVect2 small, sweep;
@@ -230,7 +230,7 @@ bool_t poly_survey_adv_start(uint8_t first_wp, uint8_t size, float angle, float
  * Position and stage and navigates accordingly.
  * Returns True until the survey is finished
  */
-bool_t poly_survey_adv_run(void)
+bool_t nav_survey_poly_adv_run(void)
 {
   NavVerticalAutoThrottleMode(0.0);
   NavVerticalAltitudeMode(survey.psa_altitude, 0.0);
diff --git a/sw/airborne/modules/nav/nav_survey_poly_adv.h b/sw/airborne/modules/nav/nav_survey_poly_adv.h
index d4fce0dab8f..488c0f633a5 100644
--- a/sw/airborne/modules/nav/nav_survey_poly_adv.h
+++ b/sw/airborne/modules/nav/nav_survey_poly_adv.h
@@ -82,7 +82,7 @@ struct SurveyPolyAdv {
   struct FloatVect2 ret_end;
 };
 
-extern bool_t poly_survey_adv_start(uint8_t first_wp, uint8_t size, float angle, float sweep_width, float shot_dist, float min_rad, float altitude);
-extern bool_t poly_survey_adv_run(void);
+extern bool_t nav_survey_poly_adv_start(uint8_t first_wp, uint8_t size, float angle, float sweep_width, float shot_dist, float min_rad, float altitude);
+extern bool_t nav_survey_poly_adv_run(void);
 
 #endif