Index: firmware/App/Controllers/AirTrap.h
===================================================================
diff -u -rd9b5f588d81e15ed3849222bed3362e15dbf4b0a -reffc2a8283d6528109b2401bbad70dc554db4e53
--- firmware/App/Controllers/AirTrap.h	(.../AirTrap.h)	(revision d9b5f588d81e15ed3849222bed3362e15dbf4b0a)
+++ firmware/App/Controllers/AirTrap.h	(.../AirTrap.h)	(revision effc2a8283d6528109b2401bbad70dc554db4e53)
@@ -36,11 +36,11 @@
 /// Payload record structure for air trap data broadcast message
 typedef struct
 {
-    U32 lowerLevel;                         ///< Lower air trap level sensor state
-    U32 upperLevel;                         ///< Upper air trap level sensor state
-    U32 rawLowerLevel;                      ///< Raw Lower air trap level sensor state
-    U32 rawUpperLevel;                      ///< Raw Upper air trap level sensor state
-    U32 valveState;                         ///< Is air trap valve open or closed
+    U32 h17State;                           ///< Lower air trap level sensor state
+    U32 h16State;                           ///< Upper air trap level sensor state
+    U32 h17RawState;                        ///< Raw Lower air trap level sensor state
+    U32 h16RawState;                        ///< Raw Upper air trap level sensor state
+    U32 h13State;                           ///< Is air trap valve open or closed
     BOOL controlling;                       ///< Flag indicates whether air trap level is being auto controlled
 } AIR_TRAP_PAYLOAD_T;