diff --git a/src/modules/mavlink/mavlink_messages.cpp b/src/modules/mavlink/mavlink_messages.cpp
index cf76867919..2107518fa3 100644
--- a/src/modules/mavlink/mavlink_messages.cpp
+++ b/src/modules/mavlink/mavlink_messages.cpp
@@ -121,7 +121,7 @@ using matrix::wrap_2pi;
 #include "streams/HIL_STATE_QUATERNION.hpp"
 #include "streams/MOUNT_ORIENTATION.hpp"
 #include "streams/OBSTACLE_DISTANCE.hpp"
-#include "streams/OPTICAL_FLOW.hpp"
+#include "streams/OPTICAL_FLOW_RAD.hpp"
 #include "streams/ORBIT_EXECUTION_STATUS.hpp"
 #include "streams/PING.hpp"
 #include "streams/PROTOCOL_VERSION.hpp"
@@ -3945,9 +3945,9 @@ static const StreamListItem streams_list[] = {
 	create_stream_list_item<MavlinkStreamRCChannels>(),
 	create_stream_list_item<MavlinkStreamManualControl>(),
 	create_stream_list_item<MavlinkStreamTrajectoryRepresentationWaypoints>(),
-#if defined(OPTICAL_FLOW_HPP)
+#if defined(OPTICAL_FLOW_RAD_HPP)
 	create_stream_list_item<MavlinkStreamOpticalFlowRad>(),
-#endif // OPTICAL_FLOW_HPP
+#endif // OPTICAL_FLOW_RAD_HPP
 	create_stream_list_item<MavlinkStreamActuatorControlTarget<0> >(),
 	create_stream_list_item<MavlinkStreamActuatorControlTarget<1> >(),
 #if defined(NAMED_VALUE_FLOAT_HPP)
diff --git a/src/modules/mavlink/streams/OPTICAL_FLOW.hpp b/src/modules/mavlink/streams/OPTICAL_FLOW_RAD.hpp
similarity index 97%
rename from src/modules/mavlink/streams/OPTICAL_FLOW.hpp
rename to src/modules/mavlink/streams/OPTICAL_FLOW_RAD.hpp
index 7a5a6620e2..eb0184947d 100644
--- a/src/modules/mavlink/streams/OPTICAL_FLOW.hpp
+++ b/src/modules/mavlink/streams/OPTICAL_FLOW_RAD.hpp
@@ -31,8 +31,8 @@
  *
  ****************************************************************************/
 
-#ifndef OPTICAL_FLOW_HPP
-#define OPTICAL_FLOW_HPP
+#ifndef OPTICAL_FLOW_RAD_HPP
+#define OPTICAL_FLOW_RAD_HPP
 
 #include <uORB/topics/optical_flow.h>
 
@@ -110,4 +110,4 @@ protected:
 	}
 };
 
-#endif // OPTICAL_FLOW_HPP
+#endif // OPTICAL_FLOW_RAD_HPP