diff --git a/sw/airborne/modules/computer_vision/opticflow/visual_estimator.c b/sw/airborne/modules/computer_vision/opticflow/visual_estimator.c
index 1c9041065e..abcd075606 100644
--- a/sw/airborne/modules/computer_vision/opticflow/visual_estimator.c
+++ b/sw/airborne/modules/computer_vision/opticflow/visual_estimator.c
@@ -90,7 +90,7 @@ float Velx, Vely;
 struct FloatVect3 V_body;
 
 // Called by plugin
-void my_plugin_init(unsigned int w, unsigned int h)
+void opticflow_plugin_init(unsigned int w, unsigned int h)
 {
   // Initialize variables
   imgWidth = w;
@@ -124,7 +124,7 @@ void my_plugin_init(unsigned int w, unsigned int h)
   Vely = 0.0;
 }
 
-void my_plugin_run(unsigned char *frame)
+void opticflow_plugin_run(unsigned char *frame)
 {
   if (old_img_init == 1) {
     memcpy(prev_frame, frame, imgHeight * imgWidth * 2);
diff --git a/sw/airborne/modules/computer_vision/opticflow/visual_estimator.h b/sw/airborne/modules/computer_vision/opticflow/visual_estimator.h
index 64cc7240e4..5526a8676a 100644
--- a/sw/airborne/modules/computer_vision/opticflow/visual_estimator.h
+++ b/sw/airborne/modules/computer_vision/opticflow/visual_estimator.h
@@ -38,7 +38,7 @@ extern struct FloatVect3 V_body;
  * @param w  image width
  * @param h  image height
  */
-void my_plugin_init(unsigned int w, unsigned int h);
-void my_plugin_run(unsigned char *frame);
+void opticflow_plugin_init(unsigned int w, unsigned int h);
+void opticflow_plugin_run(unsigned char *frame);
 
 #endif /* VISUAL_ESTIMATOR_H */
diff --git a/sw/airborne/modules/computer_vision/opticflow_module.c b/sw/airborne/modules/computer_vision/opticflow_module.c
index c5bee8237a..7186c006c5 100644
--- a/sw/airborne/modules/computer_vision/opticflow_module.c
+++ b/sw/airborne/modules/computer_vision/opticflow_module.c
@@ -154,7 +154,7 @@ void *computervision_thread_main(void *data)
 #endif
 
   // First Apply Settings before init
-  my_plugin_init(vid.w, vid.h);
+  opticflow_plugin_init(vid.w, vid.h);
 
   while (computer_vision_thread_command > 0) {
     video_grab_image(&vid, img_new);
@@ -166,7 +166,7 @@ void *computervision_thread_main(void *data)
     start_timer();
 
     // Run Image Processing
-    my_plugin_run(img_new->buf);
+    opticflow_plugin_run(img_new->buf);
 
 #ifdef DOWNLINK_VIDEO
     // JPEG encode the image: