diff --git a/Jacdac/Clients/BarometerClient.g.cs b/Jacdac/Clients/AirPressureClient.g.cs
similarity index 68%
rename from Jacdac/Clients/BarometerClient.g.cs
rename to Jacdac/Clients/AirPressureClient.g.cs
index 980e0ff..4f97b1e 100644
--- a/Jacdac/Clients/BarometerClient.g.cs
+++ b/Jacdac/Clients/AirPressureClient.g.cs
@@ -6,13 +6,13 @@ namespace Jacdac.Clients
 {
     /// <summary>
     /// A sensor measuring air pressure of outside environment.
-    /// Implements a client for the Barometer service.
+    /// Implements a client for the Air Pressure service.
     /// </summary>
-    /// <seealso cref="https://microsoft.github.io/jacdac-docs/services/barometer/" />
-    public partial class BarometerClient : SensorClient
+    /// <seealso cref="https://microsoft.github.io/jacdac-docs/services/airpressure/" />
+    public partial class AirPressureClient : SensorClient
     {
-        public BarometerClient(JDBus bus, string name)
-            : base(bus, name, ServiceClasses.Barometer)
+        public AirPressureClient(JDBus bus, string name)
+            : base(bus, name, ServiceClasses.AirPressure)
         {
         }
 
@@ -24,7 +24,7 @@ public float Pressure
         {
             get
             {
-                return (float)this.GetRegisterValue((ushort)BarometerReg.Pressure, BarometerRegPack.Pressure);
+                return (float)this.GetRegisterValue((ushort)AirPressureReg.Pressure, AirPressureRegPack.Pressure);
             }
         }
 
@@ -35,7 +35,7 @@ public float Pressure
         bool TryGetPressureError(out float value)
         {
             object[] values;
-            if (this.TryGetRegisterValues((ushort)BarometerReg.PressureError, BarometerRegPack.PressureError, out values)) 
+            if (this.TryGetRegisterValues((ushort)AirPressureReg.PressureError, AirPressureRegPack.PressureError, out values)) 
             {
                 value = (float)values[0];
                 return true;
diff --git a/Jacdac/Constants/BarometerConstants.g.cs b/Jacdac/Constants/AirpressureConstants.g.cs
similarity index 87%
rename from Jacdac/Constants/BarometerConstants.g.cs
rename to Jacdac/Constants/AirpressureConstants.g.cs
index 5e9bf46..64224d1 100644
--- a/Jacdac/Constants/BarometerConstants.g.cs
+++ b/Jacdac/Constants/AirpressureConstants.g.cs
@@ -1,9 +1,9 @@
 namespace Jacdac {
     public static partial class ServiceClasses
     {
-        public const uint Barometer = 0x1e117cea;
+        public const uint AirPressure = 0x1e117cea;
     }
-    public enum BarometerReg : ushort {
+    public enum AirPressureReg : ushort {
         /// <summary>
         /// Read-only hPa u22.10 (uint32_t). The air pressure.
         ///
@@ -23,7 +23,7 @@ public enum BarometerReg : ushort {
         PressureError = 0x106,
     }
 
-    public static class BarometerRegPack {
+    public static class AirPressureRegPack {
         /// <summary>
         /// Pack format for 'pressure' register data.
         /// </summary>