diff --git a/msg/CMakeLists.txt b/msg/CMakeLists.txt
index 0c8ff6a392..a0cc5ab1ec 100644
--- a/msg/CMakeLists.txt
+++ b/msg/CMakeLists.txt
@@ -234,6 +234,7 @@ set(msg_files
 	VehicleTorqueSetpoint.msg
 	VelocityLimits.msg
 	WheelEncoders.msg
+	Wind.msg
 	YawEstimatorStatus.msg
 	versioned/ActuatorMotors.msg
 	versioned/ActuatorServos.msg
@@ -267,7 +268,6 @@ set(msg_files
 	versioned/VehicleRatesSetpoint.msg
 	versioned/VehicleStatus.msg
 	versioned/VtolVehicleStatus.msg
-	versioned/Wind.msg
 )
 list(SORT msg_files)
 
diff --git a/msg/versioned/Wind.msg b/msg/Wind.msg
similarity index 96%
rename from msg/versioned/Wind.msg
rename to msg/Wind.msg
index 7a53f9bfa7..ff8b6f4535 100644
--- a/msg/versioned/Wind.msg
+++ b/msg/Wind.msg
@@ -1,5 +1,3 @@
-uint32 MESSAGE_VERSION = 0
-
 uint64 timestamp		# time since system start (microseconds)
 uint64 timestamp_sample         # the timestamp of the raw data (microseconds)
 
diff --git a/msg/versioned/LateralControlConfiguration.msg b/msg/versioned/LateralControlConfiguration.msg
index 363b28d2e1..783bd38465 100644
--- a/msg/versioned/LateralControlConfiguration.msg
+++ b/msg/versioned/LateralControlConfiguration.msg
@@ -5,4 +5,4 @@ uint32 MESSAGE_VERSION = 0
 
 uint64 timestamp          # time since system start (microseconds)
 
-float32 lateral_accel_max # [m/s^2] maps 1:1 to a maximum roll angle, accel_max = tan(roll_max) * GRAVITY
+float32 lateral_accel_max # [m/s^2] currently maps to a maximum roll angle, accel_max = tan(roll_max) * GRAVITY