diff --git a/dsdl/uavcan/equipment/air_data/290.Airspeed.uavcan b/dsdl/uavcan/equipment/air_data/290.Airspeed.uavcan
deleted file mode 100644
index 46306b28ff..0000000000
--- a/dsdl/uavcan/equipment/air_data/290.Airspeed.uavcan
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# IAS and TAS in meters per second.
-# Unknown values should be assigned NAN.
-#
-
-float16 indicated_airspeed
-float16 indicated_airspeed_variance
-
-float16 true_airspeed
-float16 true_airspeed_variance
diff --git a/dsdl/uavcan/equipment/air_data/290.TrueAirspeed.uavcan b/dsdl/uavcan/equipment/air_data/290.TrueAirspeed.uavcan
new file mode 100644
index 0000000000..ace10e61cb
--- /dev/null
+++ b/dsdl/uavcan/equipment/air_data/290.TrueAirspeed.uavcan
@@ -0,0 +1,6 @@
+#
+# TAS.
+#
+
+float16 true_airspeed           # m/s
+float16 true_airspeed_variance  # (m/s)^2
diff --git a/dsdl/uavcan/equipment/air_data/291.AltitudeAndClimbRate.uavcan b/dsdl/uavcan/equipment/air_data/291.AltitudeAndClimbRate.uavcan
deleted file mode 100644
index dc43c54aed..0000000000
--- a/dsdl/uavcan/equipment/air_data/291.AltitudeAndClimbRate.uavcan
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# Pressure altitude in meters and barometric climb rate in meters per second.
-#
-
-uavcan.Timestamp timestamp
-
-float32 pressure_altitude               # m
-float16 pressure_altitude_variance      # m^2
-
-# Positive if climbing up
-float16 climb_rate                      # m/s
-float16 climb_rate_variance             # m^2/s^2
diff --git a/dsdl/uavcan/equipment/air_data/291.IndicatedAirspeed.uavcan b/dsdl/uavcan/equipment/air_data/291.IndicatedAirspeed.uavcan
new file mode 100644
index 0000000000..c11ea903a6
--- /dev/null
+++ b/dsdl/uavcan/equipment/air_data/291.IndicatedAirspeed.uavcan
@@ -0,0 +1,6 @@
+#
+# IAS.
+#
+
+float16 indicated_airspeed              # m/s
+float16 indicated_airspeed_variance     # (m/s)^2
diff --git a/dsdl/uavcan/equipment/air_data/294.StaticAirData.uavcan b/dsdl/uavcan/equipment/air_data/294.StaticAirData.uavcan
deleted file mode 100644
index 245218669a..0000000000
--- a/dsdl/uavcan/equipment/air_data/294.StaticAirData.uavcan
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# Static air data for barometric altitude and altitude rate measurements.
-#
-
-float32 static_pressure                 # Pascal
-float16 static_pressure_variance        # Pascal^2
-
-float16 static_temperature              # Kelvin
-float16 static_temperature_variance     # Kelvin^2
diff --git a/dsdl/uavcan/equipment/air_data/292.AngleOfAttack.uavcan b/dsdl/uavcan/equipment/air_data/295.AngleOfAttack.uavcan
similarity index 83%
rename from dsdl/uavcan/equipment/air_data/292.AngleOfAttack.uavcan
rename to dsdl/uavcan/equipment/air_data/295.AngleOfAttack.uavcan
index 89aef90848..c14d7fdcbc 100644
--- a/dsdl/uavcan/equipment/air_data/292.AngleOfAttack.uavcan
+++ b/dsdl/uavcan/equipment/air_data/295.AngleOfAttack.uavcan
@@ -1,5 +1,5 @@
 #
-# Angle of attack in radians.
+# Angle of attack.
 #
 
 uint8 SENSOR_ID_LEFT = 254
diff --git a/dsdl/uavcan/equipment/air_data/293.Sideslip.uavcan b/dsdl/uavcan/equipment/air_data/296.Sideslip.uavcan
similarity index 100%
rename from dsdl/uavcan/equipment/air_data/293.Sideslip.uavcan
rename to dsdl/uavcan/equipment/air_data/296.Sideslip.uavcan
diff --git a/dsdl/uavcan/equipment/air_data/298.StaticPressure.uavcan b/dsdl/uavcan/equipment/air_data/298.StaticPressure.uavcan
new file mode 100644
index 0000000000..75d3cc7e06
--- /dev/null
+++ b/dsdl/uavcan/equipment/air_data/298.StaticPressure.uavcan
@@ -0,0 +1,6 @@
+#
+# Static pressure.
+#
+
+float32 static_pressure                 # Pascal
+float16 static_pressure_variance        # Pascal^2
diff --git a/dsdl/uavcan/equipment/air_data/410.StaticTemperature.uavcan b/dsdl/uavcan/equipment/air_data/410.StaticTemperature.uavcan
new file mode 100644
index 0000000000..7e8d570fe5
--- /dev/null
+++ b/dsdl/uavcan/equipment/air_data/410.StaticTemperature.uavcan
@@ -0,0 +1,6 @@
+#
+# Static temperature.
+#
+
+float16 static_temperature              # Kelvin
+float16 static_temperature_variance     # Kelvin^2