diff --git a/jacdac/accelerometer/constants.py b/jacdac/accelerometer/constants.py
index 54953d3..15a5a64 100644
--- a/jacdac/accelerometer/constants.py
+++ b/jacdac/accelerometer/constants.py
@@ -18,7 +18,7 @@ JD_ACCELEROMETER_EV_FORCE_2G = const(0x8c)
 JD_ACCELEROMETER_EV_FORCE_3G = const(0x88)
 JD_ACCELEROMETER_EV_FORCE_6G = const(0x89)
 JD_ACCELEROMETER_EV_FORCE_8G = const(0x8a)
-JD_ACCELEROMETER__PACK_FORMATS = {
+JD_ACCELEROMETER_PACK_FORMATS = {
     JD_ACCELEROMETER_REG_FORCES: "i12.20 i12.20 i12.20",
     JD_ACCELEROMETER_REG_FORCES_ERROR: "u12.20",
     JD_ACCELEROMETER_REG_MAX_FORCE: "u12.20",
diff --git a/jacdac/arcade_gamepad/constants.py b/jacdac/arcade_gamepad/constants.py
index 176c604..b683e2f 100644
--- a/jacdac/arcade_gamepad/constants.py
+++ b/jacdac/arcade_gamepad/constants.py
@@ -16,7 +16,7 @@ JD_ARCADE_GAMEPAD_REG_BUTTONS = const(JD_REG_READING)
 JD_ARCADE_GAMEPAD_REG_AVAILABLE_BUTTONS = const(0x180)
 JD_ARCADE_GAMEPAD_EV_DOWN = const(JD_EV_ACTIVE)
 JD_ARCADE_GAMEPAD_EV_UP = const(JD_EV_INACTIVE)
-JD_ARCADE_GAMEPAD__PACK_FORMATS = {
+JD_ARCADE_GAMEPAD_PACK_FORMATS = {
     JD_ARCADE_GAMEPAD_REG_BUTTONS: "r: u8 u0.8",
     JD_ARCADE_GAMEPAD_REG_AVAILABLE_BUTTONS: "r: u8",
     JD_ARCADE_GAMEPAD_EV_DOWN: "u8",
diff --git a/jacdac/arcade_sound/constants.py b/jacdac/arcade_sound/constants.py
index 7f30ecc..932a34d 100644
--- a/jacdac/arcade_sound/constants.py
+++ b/jacdac/arcade_sound/constants.py
@@ -5,7 +5,7 @@ JD_ARCADE_SOUND_CMD_PLAY = const(0x80)
 JD_ARCADE_SOUND_REG_SAMPLE_RATE = const(0x80)
 JD_ARCADE_SOUND_REG_BUFFER_SIZE = const(0x180)
 JD_ARCADE_SOUND_REG_BUFFER_PENDING = const(0x181)
-JD_ARCADE_SOUND__PACK_FORMATS = {
+JD_ARCADE_SOUND_PACK_FORMATS = {
     JD_ARCADE_SOUND_CMD_PLAY: "b",
     JD_ARCADE_SOUND_REG_SAMPLE_RATE: "u22.10",
     JD_ARCADE_SOUND_REG_BUFFER_SIZE: "u32",
diff --git a/jacdac/azure_iot_hub_health/constants.py b/jacdac/azure_iot_hub_health/constants.py
index 4f9cec4..fa22263 100644
--- a/jacdac/azure_iot_hub_health/constants.py
+++ b/jacdac/azure_iot_hub_health/constants.py
@@ -14,7 +14,7 @@ JD_AZURE_IOT_HUB_HEALTH_CMD_DISCONNECT = const(0x82)
 JD_AZURE_IOT_HUB_HEALTH_CMD_SET_CONNECTION_STRING = const(0x86)
 JD_AZURE_IOT_HUB_HEALTH_EV_CONNECTION_STATUS_CHANGE = const(JD_EV_CHANGE)
 JD_AZURE_IOT_HUB_HEALTH_EV_MESSAGE_SENT = const(0x80)
-JD_AZURE_IOT_HUB_HEALTH__PACK_FORMATS = {
+JD_AZURE_IOT_HUB_HEALTH_PACK_FORMATS = {
     JD_AZURE_IOT_HUB_HEALTH_REG_HUB_NAME: "s",
     JD_AZURE_IOT_HUB_HEALTH_REG_HUB_DEVICE_ID: "s",
     JD_AZURE_IOT_HUB_HEALTH_REG_CONNECTION_STATUS: "u16",
diff --git a/jacdac/barcode_reader/constants.py b/jacdac/barcode_reader/constants.py
index 386cb44..a47eea1 100644
--- a/jacdac/barcode_reader/constants.py
+++ b/jacdac/barcode_reader/constants.py
@@ -18,7 +18,7 @@ JD_BARCODE_READER_FORMAT_UPC_E = const(0xe)
 JD_BARCODE_READER_REG_ENABLED = const(JD_REG_INTENSITY)
 JD_BARCODE_READER_REG_FORMATS = const(0x180)
 JD_BARCODE_READER_EV_DETECT = const(JD_EV_ACTIVE)
-JD_BARCODE_READER__PACK_FORMATS = {
+JD_BARCODE_READER_PACK_FORMATS = {
     JD_BARCODE_READER_REG_ENABLED: "u8",
     JD_BARCODE_READER_REG_FORMATS: "r: u8",
     JD_BARCODE_READER_EV_DETECT: "u8 s"
diff --git a/jacdac/barometer/constants.py b/jacdac/barometer/constants.py
index 0ec43ed..d9e638d 100644
--- a/jacdac/barometer/constants.py
+++ b/jacdac/barometer/constants.py
@@ -4,7 +4,7 @@ from jacdac.system.constants import *
 JD_SERVICE_CLASS_BAROMETER = const(0x1e117cea)
 JD_BAROMETER_REG_PRESSURE = const(JD_REG_READING)
 JD_BAROMETER_REG_PRESSURE_ERROR = const(JD_REG_READING_ERROR)
-JD_BAROMETER__PACK_FORMATS = {
+JD_BAROMETER_PACK_FORMATS = {
     JD_BAROMETER_REG_PRESSURE: "u22.10",
     JD_BAROMETER_REG_PRESSURE_ERROR: "u22.10"
 }
\ No newline at end of file
diff --git a/jacdac/base/constants.py b/jacdac/base/constants.py
index 8fef597..f277967 100644
--- a/jacdac/base/constants.py
+++ b/jacdac/base/constants.py
@@ -1,7 +1,7 @@
 # Autogenerated constants for Base service service
 from jacdac.constants import *
 from jacdac.system.constants import *
-JD__PACK_FORMATS = {
+JD_PACK_FORMATS = {
     JD_CMD_COMMAND_NOT_IMPLEMENTED: "u16 u16",
     JD_REG_INSTANCE_NAME: "s",
     JD_REG_STATUS_CODE: "u16 u16",
diff --git a/jacdac/bit_radio/constants.py b/jacdac/bit_radio/constants.py
index c73b00d..af4a852 100644
--- a/jacdac/bit_radio/constants.py
+++ b/jacdac/bit_radio/constants.py
@@ -13,7 +13,7 @@ JD_BIT_RADIO_CMD_SEND_BUFFER = const(0x83)
 JD_BIT_RADIO_CMD_STRING_RECEIVED = const(0x90)
 JD_BIT_RADIO_CMD_NUMBER_RECEIVED = const(0x91)
 JD_BIT_RADIO_CMD_BUFFER_RECEIVED = const(0x92)
-JD_BIT_RADIO__PACK_FORMATS = {
+JD_BIT_RADIO_PACK_FORMATS = {
     JD_BIT_RADIO_REG_ENABLED: "u8",
     JD_BIT_RADIO_REG_GROUP: "u8",
     JD_BIT_RADIO_REG_TRANSMISSION_POWER: "u8",
diff --git a/jacdac/bootloader/constants.py b/jacdac/bootloader/constants.py
index 00cdde7..1a1462f 100644
--- a/jacdac/bootloader/constants.py
+++ b/jacdac/bootloader/constants.py
@@ -10,7 +10,7 @@ JD_BOOTLOADER_ERROR_NOT_PAGE_ALIGNED = const(0x4)
 JD_BOOTLOADER_CMD_INFO = const(JD_CMD_ANNOUNCE)
 JD_BOOTLOADER_CMD_SET_SESSION = const(0x81)
 JD_BOOTLOADER_CMD_PAGE_DATA = const(0x80)
-JD_BOOTLOADER__PACK_FORMATS = {
+JD_BOOTLOADER_PACK_FORMATS = {
     JD_BOOTLOADER_CMD_SET_SESSION: "u32",
     JD_BOOTLOADER_CMD_PAGE_DATA: "u32 u16 u8 u8 u32 u32 u32 u32 u32 b[208]"
 }
\ No newline at end of file
diff --git a/jacdac/braille_display/constants.py b/jacdac/braille_display/constants.py
index 4f3e189..2e5b6bd 100644
--- a/jacdac/braille_display/constants.py
+++ b/jacdac/braille_display/constants.py
@@ -5,7 +5,7 @@ JD_SERVICE_CLASS_BRAILLE_DISPLAY = const(0x13bfb7cc)
 JD_BRAILLE_DISPLAY_REG_ENABLED = const(JD_REG_INTENSITY)
 JD_BRAILLE_DISPLAY_REG_PATTERNS = const(JD_REG_VALUE)
 JD_BRAILLE_DISPLAY_REG_LENGTH = const(0x181)
-JD_BRAILLE_DISPLAY__PACK_FORMATS = {
+JD_BRAILLE_DISPLAY_PACK_FORMATS = {
     JD_BRAILLE_DISPLAY_REG_ENABLED: "u8",
     JD_BRAILLE_DISPLAY_REG_PATTERNS: "s",
     JD_BRAILLE_DISPLAY_REG_LENGTH: "u8"
diff --git a/jacdac/button/constants.py b/jacdac/button/constants.py
index 1497da6..9cdf0ad 100644
--- a/jacdac/button/constants.py
+++ b/jacdac/button/constants.py
@@ -8,7 +8,7 @@ JD_BUTTON_REG_PRESSED = const(0x181)
 JD_BUTTON_EV_DOWN = const(JD_EV_ACTIVE)
 JD_BUTTON_EV_UP = const(JD_EV_INACTIVE)
 JD_BUTTON_EV_HOLD = const(0x81)
-JD_BUTTON__PACK_FORMATS = {
+JD_BUTTON_PACK_FORMATS = {
     JD_BUTTON_REG_PRESSURE: "u0.16",
     JD_BUTTON_REG_ANALOG: "u8",
     JD_BUTTON_REG_PRESSED: "u8",
diff --git a/jacdac/buzzer/constants.py b/jacdac/buzzer/constants.py
index 0901e9a..04018a6 100644
--- a/jacdac/buzzer/constants.py
+++ b/jacdac/buzzer/constants.py
@@ -5,7 +5,7 @@ JD_SERVICE_CLASS_BUZZER = const(0x1b57b1d7)
 JD_BUZZER_REG_VOLUME = const(JD_REG_INTENSITY)
 JD_BUZZER_CMD_PLAY_TONE = const(0x80)
 JD_BUZZER_CMD_PLAY_NOTE = const(0x81)
-JD_BUZZER__PACK_FORMATS = {
+JD_BUZZER_PACK_FORMATS = {
     JD_BUZZER_REG_VOLUME: "u0.8",
     JD_BUZZER_CMD_PLAY_TONE: "u16 u16 u16",
     JD_BUZZER_CMD_PLAY_NOTE: "u16 u0.16 u16"
diff --git a/jacdac/capacitive_button/constants.py b/jacdac/capacitive_button/constants.py
index 81b564b..096b7a8 100644
--- a/jacdac/capacitive_button/constants.py
+++ b/jacdac/capacitive_button/constants.py
@@ -4,6 +4,6 @@ from jacdac.system.constants import *
 JD_SERVICE_CLASS_CAPACITIVE_BUTTON = const(0x2865adc9)
 JD_CAPACITIVE_BUTTON_REG_THRESHOLD = const(JD_REG_ACTIVE_THRESHOLD)
 JD_CAPACITIVE_BUTTON_CMD_CALIBRATE = const(JD_CMD_CALIBRATE)
-JD_CAPACITIVE_BUTTON__PACK_FORMATS = {
+JD_CAPACITIVE_BUTTON_PACK_FORMATS = {
     JD_CAPACITIVE_BUTTON_REG_THRESHOLD: "u0.16"
 }
\ No newline at end of file
diff --git a/jacdac/character_screen/constants.py b/jacdac/character_screen/constants.py
index e1c33ce..87c8214 100644
--- a/jacdac/character_screen/constants.py
+++ b/jacdac/character_screen/constants.py
@@ -15,7 +15,7 @@ JD_CHARACTER_SCREEN_REG_ROWS = const(0x180)
 JD_CHARACTER_SCREEN_REG_COLUMNS = const(0x181)
 JD_CHARACTER_SCREEN_CMD_SET_LINE = const(0x80)
 JD_CHARACTER_SCREEN_CMD_CLEAR = const(0x81)
-JD_CHARACTER_SCREEN__PACK_FORMATS = {
+JD_CHARACTER_SCREEN_PACK_FORMATS = {
     JD_CHARACTER_SCREEN_REG_MESSAGE: "s",
     JD_CHARACTER_SCREEN_REG_BRIGHTNESS: "u0.8",
     JD_CHARACTER_SCREEN_REG_VARIANT: "u8",
diff --git a/jacdac/codal_message_bus/constants.py b/jacdac/codal_message_bus/constants.py
index 6872f76..457ef8e 100644
--- a/jacdac/codal_message_bus/constants.py
+++ b/jacdac/codal_message_bus/constants.py
@@ -3,7 +3,7 @@ from jacdac.constants import *
 JD_SERVICE_CLASS_CODAL_MESSAGE_BUS = const(0x121ff81d)
 JD_CODAL_MESSAGE_BUS_CMD_SEND = const(0x80)
 JD_CODAL_MESSAGE_BUS_EV_MESSAGE = const(0x80)
-JD_CODAL_MESSAGE_BUS__PACK_FORMATS = {
+JD_CODAL_MESSAGE_BUS_PACK_FORMATS = {
     JD_CODAL_MESSAGE_BUS_CMD_SEND: "u16 u16",
     JD_CODAL_MESSAGE_BUS_EV_MESSAGE: "u16 u16"
 }
\ No newline at end of file
diff --git a/jacdac/color/constants.py b/jacdac/color/constants.py
index 729548e..a898a43 100644
--- a/jacdac/color/constants.py
+++ b/jacdac/color/constants.py
@@ -3,6 +3,6 @@ from jacdac.constants import *
 from jacdac.system.constants import *
 JD_SERVICE_CLASS_COLOR = const(0x1630d567)
 JD_COLOR_REG_COLOR = const(JD_REG_READING)
-JD_COLOR__PACK_FORMATS = {
+JD_COLOR_PACK_FORMATS = {
     JD_COLOR_REG_COLOR: "u0.16 u0.16 u0.16"
 }
\ No newline at end of file
diff --git a/jacdac/compass/constants.py b/jacdac/compass/constants.py
index 446ce49..9c7d096 100644
--- a/jacdac/compass/constants.py
+++ b/jacdac/compass/constants.py
@@ -6,7 +6,7 @@ JD_COMPASS_REG_HEADING = const(JD_REG_READING)
 JD_COMPASS_REG_ENABLED = const(JD_REG_INTENSITY)
 JD_COMPASS_REG_HEADING_ERROR = const(JD_REG_READING_ERROR)
 JD_COMPASS_CMD_CALIBRATE = const(JD_CMD_CALIBRATE)
-JD_COMPASS__PACK_FORMATS = {
+JD_COMPASS_PACK_FORMATS = {
     JD_COMPASS_REG_HEADING: "u16.16",
     JD_COMPASS_REG_ENABLED: "u8",
     JD_COMPASS_REG_HEADING_ERROR: "u16.16"
diff --git a/jacdac/control/constants.py b/jacdac/control/constants.py
index 7fc930e..bc7b38d 100644
--- a/jacdac/control/constants.py
+++ b/jacdac/control/constants.py
@@ -31,7 +31,7 @@ JD_CONTROL_REG_BOOTLOADER_PRODUCT_IDENTIFIER = const(0x184)
 JD_CONTROL_REG_FIRMWARE_VERSION = const(0x185)
 JD_CONTROL_REG_MCU_TEMPERATURE = const(0x182)
 JD_CONTROL_REG_UPTIME = const(0x186)
-JD_CONTROL__PACK_FORMATS = {
+JD_CONTROL_PACK_FORMATS = {
     JD_CONTROL_CMD_FLOOD_PING: "u32 u32 u8",
     JD_CONTROL_CMD_SET_STATUS_LIGHT: "u8 u8 u8 u8",
     JD_CONTROL_CMD_RELIABLE_COMMANDS: "u32",
diff --git a/jacdac/dimmer/constants.py b/jacdac/dimmer/constants.py
index fc0d547..fa8c468 100644
--- a/jacdac/dimmer/constants.py
+++ b/jacdac/dimmer/constants.py
@@ -7,7 +7,7 @@ JD_DIMMER_VARIANT_FAN = const(0x2)
 JD_DIMMER_VARIANT_PUMP = const(0x3)
 JD_DIMMER_REG_INTENSITY = const(JD_REG_INTENSITY)
 JD_DIMMER_REG_VARIANT = const(JD_REG_VARIANT)
-JD_DIMMER__PACK_FORMATS = {
+JD_DIMMER_PACK_FORMATS = {
     JD_DIMMER_REG_INTENSITY: "u0.16",
     JD_DIMMER_REG_VARIANT: "u8"
 }
\ No newline at end of file
diff --git a/jacdac/distance/constants.py b/jacdac/distance/constants.py
index 8ba412f..53f3b7f 100644
--- a/jacdac/distance/constants.py
+++ b/jacdac/distance/constants.py
@@ -10,7 +10,7 @@ JD_DISTANCE_REG_DISTANCE = const(JD_REG_READING)
 JD_DISTANCE_REG_MIN_RANGE = const(JD_REG_MIN_READING)
 JD_DISTANCE_REG_MAX_RANGE = const(JD_REG_MAX_READING)
 JD_DISTANCE_REG_VARIANT = const(JD_REG_VARIANT)
-JD_DISTANCE__PACK_FORMATS = {
+JD_DISTANCE_PACK_FORMATS = {
     JD_DISTANCE_REG_DISTANCE: "u16.16",
     JD_DISTANCE_REG_MIN_RANGE: "u16.16",
     JD_DISTANCE_REG_MAX_RANGE: "u16.16",
diff --git a/jacdac/dmx/constants.py b/jacdac/dmx/constants.py
index 28d4ba8..433939a 100644
--- a/jacdac/dmx/constants.py
+++ b/jacdac/dmx/constants.py
@@ -4,7 +4,7 @@ from jacdac.system.constants import *
 JD_SERVICE_CLASS_DMX = const(0x11cf8c05)
 JD_DMX_REG_ENABLED = const(JD_REG_INTENSITY)
 JD_DMX_CMD_SEND = const(0x80)
-JD_DMX__PACK_FORMATS = {
+JD_DMX_PACK_FORMATS = {
     JD_DMX_REG_ENABLED: "u8",
     JD_DMX_CMD_SEND: "b"
 }
\ No newline at end of file
diff --git a/jacdac/dot_matrix/constants.py b/jacdac/dot_matrix/constants.py
index 35bb422..f7368b7 100644
--- a/jacdac/dot_matrix/constants.py
+++ b/jacdac/dot_matrix/constants.py
@@ -9,7 +9,7 @@ JD_DOT_MATRIX_REG_BRIGHTNESS = const(JD_REG_INTENSITY)
 JD_DOT_MATRIX_REG_ROWS = const(0x181)
 JD_DOT_MATRIX_REG_COLUMNS = const(0x182)
 JD_DOT_MATRIX_REG_VARIANT = const(JD_REG_VARIANT)
-JD_DOT_MATRIX__PACK_FORMATS = {
+JD_DOT_MATRIX_PACK_FORMATS = {
     JD_DOT_MATRIX_REG_DOTS: "b",
     JD_DOT_MATRIX_REG_BRIGHTNESS: "u0.8",
     JD_DOT_MATRIX_REG_ROWS: "u16",
diff --git a/jacdac/e_co2/constants.py b/jacdac/e_co2/constants.py
index 493e0d2..309c230 100644
--- a/jacdac/e_co2/constants.py
+++ b/jacdac/e_co2/constants.py
@@ -10,7 +10,7 @@ JD_E_CO2_REG_MIN_E_CO2 = const(JD_REG_MIN_READING)
 JD_E_CO2_REG_MAX_E_CO2 = const(JD_REG_MAX_READING)
 JD_E_CO2_REG_CONDITIONING_PERIOD = const(0x180)
 JD_E_CO2_REG_VARIANT = const(JD_REG_VARIANT)
-JD_E_CO2__PACK_FORMATS = {
+JD_E_CO2_PACK_FORMATS = {
     JD_E_CO2_REG_E_CO2: "u22.10",
     JD_E_CO2_REG_E_CO2_ERROR: "u22.10",
     JD_E_CO2_REG_MIN_E_CO2: "u22.10",
diff --git a/jacdac/flex/constants.py b/jacdac/flex/constants.py
index 5bbc306..e7bce50 100644
--- a/jacdac/flex/constants.py
+++ b/jacdac/flex/constants.py
@@ -6,7 +6,7 @@ JD_FLEX_VARIANT_LINEAR22INCH = const(0x1)
 JD_FLEX_VARIANT_LINEAR45INCH = const(0x2)
 JD_FLEX_REG_BENDING = const(JD_REG_READING)
 JD_FLEX_REG_VARIANT = const(JD_REG_VARIANT)
-JD_FLEX__PACK_FORMATS = {
+JD_FLEX_PACK_FORMATS = {
     JD_FLEX_REG_BENDING: "u0.16",
     JD_FLEX_REG_VARIANT: "u8"
 }
\ No newline at end of file
diff --git a/jacdac/gyroscope/constants.py b/jacdac/gyroscope/constants.py
index 5c8b40c..4b94700 100644
--- a/jacdac/gyroscope/constants.py
+++ b/jacdac/gyroscope/constants.py
@@ -6,7 +6,7 @@ JD_GYROSCOPE_REG_ROTATION_RATES = const(JD_REG_READING)
 JD_GYROSCOPE_REG_ROTATION_RATES_ERROR = const(JD_REG_READING_ERROR)
 JD_GYROSCOPE_REG_MAX_RATE = const(JD_REG_READING_RANGE)
 JD_GYROSCOPE_REG_MAX_RATES_SUPPORTED = const(JD_REG_SUPPORTED_RANGES)
-JD_GYROSCOPE__PACK_FORMATS = {
+JD_GYROSCOPE_PACK_FORMATS = {
     JD_GYROSCOPE_REG_ROTATION_RATES: "i12.20 i12.20 i12.20",
     JD_GYROSCOPE_REG_ROTATION_RATES_ERROR: "u12.20",
     JD_GYROSCOPE_REG_MAX_RATE: "u12.20",
diff --git a/jacdac/heart_rate/constants.py b/jacdac/heart_rate/constants.py
index 46f7d3e..4ad9673 100644
--- a/jacdac/heart_rate/constants.py
+++ b/jacdac/heart_rate/constants.py
@@ -10,7 +10,7 @@ JD_HEART_RATE_VARIANT_WEB_CAM = const(0x5)
 JD_HEART_RATE_REG_HEART_RATE = const(JD_REG_READING)
 JD_HEART_RATE_REG_HEART_RATE_ERROR = const(JD_REG_READING_ERROR)
 JD_HEART_RATE_REG_VARIANT = const(JD_REG_VARIANT)
-JD_HEART_RATE__PACK_FORMATS = {
+JD_HEART_RATE_PACK_FORMATS = {
     JD_HEART_RATE_REG_HEART_RATE: "u16.16",
     JD_HEART_RATE_REG_HEART_RATE_ERROR: "u16.16",
     JD_HEART_RATE_REG_VARIANT: "u8"
diff --git a/jacdac/hid_adapter/constants.py b/jacdac/hid_adapter/constants.py
index 9185c27..fc8be78 100644
--- a/jacdac/hid_adapter/constants.py
+++ b/jacdac/hid_adapter/constants.py
@@ -10,7 +10,7 @@ JD_HID_ADAPTER_CMD_CLEAR_BINDING = const(0x83)
 JD_HID_ADAPTER_CMD_CLEAR_CONFIGURATION = const(0x84)
 JD_HID_ADAPTER_CMD_CLEAR = const(0x85)
 JD_HID_ADAPTER_EV_CHANGED = const(JD_EV_CHANGE)
-JD_HID_ADAPTER__PACK_FORMATS = {
+JD_HID_ADAPTER_PACK_FORMATS = {
     JD_HID_ADAPTER_REG_NUM_CONFIGURATIONS: "u8",
     JD_HID_ADAPTER_REG_CURRENT_CONFIGURATION: "u8",
     JD_HID_ADAPTER_CMD_GET_CONFIGURATION: "b[12] u8",
diff --git a/jacdac/hid_keyboard/constants.py b/jacdac/hid_keyboard/constants.py
index 883630b..5c952d2 100644
--- a/jacdac/hid_keyboard/constants.py
+++ b/jacdac/hid_keyboard/constants.py
@@ -15,6 +15,6 @@ JD_HID_KEYBOARD_ACTION_UP = const(0x1)
 JD_HID_KEYBOARD_ACTION_DOWN = const(0x2)
 JD_HID_KEYBOARD_CMD_KEY = const(0x80)
 JD_HID_KEYBOARD_CMD_CLEAR = const(0x81)
-JD_HID_KEYBOARD__PACK_FORMATS = {
+JD_HID_KEYBOARD_PACK_FORMATS = {
     JD_HID_KEYBOARD_CMD_KEY: "r: u16 u8 u8"
 }
\ No newline at end of file
diff --git a/jacdac/hid_mouse/constants.py b/jacdac/hid_mouse/constants.py
index a2b9d58..2b66bc2 100644
--- a/jacdac/hid_mouse/constants.py
+++ b/jacdac/hid_mouse/constants.py
@@ -11,7 +11,7 @@ JD_HID_MOUSE_BUTTON_EVENT_DOUBLE_CLICK = const(0x4)
 JD_HID_MOUSE_CMD_SET_BUTTON = const(0x80)
 JD_HID_MOUSE_CMD_MOVE = const(0x81)
 JD_HID_MOUSE_CMD_WHEEL = const(0x82)
-JD_HID_MOUSE__PACK_FORMATS = {
+JD_HID_MOUSE_PACK_FORMATS = {
     JD_HID_MOUSE_CMD_SET_BUTTON: "u16 u8",
     JD_HID_MOUSE_CMD_MOVE: "i16 i16 u16",
     JD_HID_MOUSE_CMD_WHEEL: "i16 u16"
diff --git a/jacdac/humidity/constants.py b/jacdac/humidity/constants.py
index 38f24ff..ce3c422 100644
--- a/jacdac/humidity/constants.py
+++ b/jacdac/humidity/constants.py
@@ -6,7 +6,7 @@ JD_HUMIDITY_REG_HUMIDITY = const(JD_REG_READING)
 JD_HUMIDITY_REG_HUMIDITY_ERROR = const(JD_REG_READING_ERROR)
 JD_HUMIDITY_REG_MIN_HUMIDITY = const(JD_REG_MIN_READING)
 JD_HUMIDITY_REG_MAX_HUMIDITY = const(JD_REG_MAX_READING)
-JD_HUMIDITY__PACK_FORMATS = {
+JD_HUMIDITY_PACK_FORMATS = {
     JD_HUMIDITY_REG_HUMIDITY: "u22.10",
     JD_HUMIDITY_REG_HUMIDITY_ERROR: "u22.10",
     JD_HUMIDITY_REG_MIN_HUMIDITY: "u22.10",
diff --git a/jacdac/illuminance/constants.py b/jacdac/illuminance/constants.py
index 3d04848..cc26d71 100644
--- a/jacdac/illuminance/constants.py
+++ b/jacdac/illuminance/constants.py
@@ -4,7 +4,7 @@ from jacdac.system.constants import *
 JD_SERVICE_CLASS_ILLUMINANCE = const(0x1e6ecaf2)
 JD_ILLUMINANCE_REG_LIGHT = const(JD_REG_READING)
 JD_ILLUMINANCE_REG_LIGHT_ERROR = const(JD_REG_READING_ERROR)
-JD_ILLUMINANCE__PACK_FORMATS = {
+JD_ILLUMINANCE_PACK_FORMATS = {
     JD_ILLUMINANCE_REG_LIGHT: "u22.10",
     JD_ILLUMINANCE_REG_LIGHT_ERROR: "u22.10"
 }
\ No newline at end of file
diff --git a/jacdac/indexed_screen/constants.py b/jacdac/indexed_screen/constants.py
index 86dec9b..2049b77 100644
--- a/jacdac/indexed_screen/constants.py
+++ b/jacdac/indexed_screen/constants.py
@@ -12,7 +12,7 @@ JD_INDEXED_SCREEN_REG_HEIGHT = const(0x182)
 JD_INDEXED_SCREEN_REG_WIDTH_MAJOR = const(0x81)
 JD_INDEXED_SCREEN_REG_UP_SAMPLING = const(0x82)
 JD_INDEXED_SCREEN_REG_ROTATION = const(0x83)
-JD_INDEXED_SCREEN__PACK_FORMATS = {
+JD_INDEXED_SCREEN_PACK_FORMATS = {
     JD_INDEXED_SCREEN_CMD_START_UPDATE: "u16 u16 u16 u16",
     JD_INDEXED_SCREEN_CMD_SET_PIXELS: "b",
     JD_INDEXED_SCREEN_REG_BRIGHTNESS: "u0.8",
diff --git a/jacdac/infrastructure/constants.py b/jacdac/infrastructure/constants.py
index 6f11310..d310a76 100644
--- a/jacdac/infrastructure/constants.py
+++ b/jacdac/infrastructure/constants.py
@@ -1,6 +1,6 @@
 # Autogenerated constants for Infrastructure service
 from jacdac.constants import *
 JD_SERVICE_CLASS_INFRASTRUCTURE = const(0x1e1589eb)
-JD_INFRASTRUCTURE__PACK_FORMATS = {
+JD_INFRASTRUCTURE_PACK_FORMATS = {
 
 }
\ No newline at end of file
diff --git a/jacdac/joystick/constants.py b/jacdac/joystick/constants.py
index dd8a51c..228dc07 100644
--- a/jacdac/joystick/constants.py
+++ b/jacdac/joystick/constants.py
@@ -22,7 +22,7 @@ JD_JOYSTICK_REG_DIRECTION = const(JD_REG_READING)
 JD_JOYSTICK_REG_VARIANT = const(JD_REG_VARIANT)
 JD_JOYSTICK_REG_BUTTONS_AVAILABLE = const(0x180)
 JD_JOYSTICK_EV_BUTTONS_CHANGED = const(JD_EV_CHANGE)
-JD_JOYSTICK__PACK_FORMATS = {
+JD_JOYSTICK_PACK_FORMATS = {
     JD_JOYSTICK_REG_DIRECTION: "u32 i1.15 i1.15",
     JD_JOYSTICK_REG_VARIANT: "u8",
     JD_JOYSTICK_REG_BUTTONS_AVAILABLE: "u32",
diff --git a/jacdac/led/constants.py b/jacdac/led/constants.py
index 9dd3ad9..4a82fed 100644
--- a/jacdac/led/constants.py
+++ b/jacdac/led/constants.py
@@ -13,7 +13,7 @@ JD_LED_REG_LED_COUNT = const(0x183)
 JD_LED_REG_WAVE_LENGTH = const(0x181)
 JD_LED_REG_LUMINOUS_INTENSITY = const(0x182)
 JD_LED_REG_VARIANT = const(JD_REG_VARIANT)
-JD_LED__PACK_FORMATS = {
+JD_LED_PACK_FORMATS = {
     JD_LED_CMD_ANIMATE: "u8 u8 u8 u8",
     JD_LED_REG_COLOR: "u8 u8 u8",
     JD_LED_REG_MAX_POWER: "u16",
diff --git a/jacdac/led_pixel/constants.py b/jacdac/led_pixel/constants.py
index 0d41bd4..02cf397 100644
--- a/jacdac/led_pixel/constants.py
+++ b/jacdac/led_pixel/constants.py
@@ -20,7 +20,7 @@ JD_LED_PIXEL_REG_MAX_PIXELS = const(0x181)
 JD_LED_PIXEL_REG_NUM_REPEATS = const(0x82)
 JD_LED_PIXEL_REG_VARIANT = const(JD_REG_VARIANT)
 JD_LED_PIXEL_CMD_RUN = const(0x81)
-JD_LED_PIXEL__PACK_FORMATS = {
+JD_LED_PIXEL_PACK_FORMATS = {
     JD_LED_PIXEL_REG_BRIGHTNESS: "u0.8",
     JD_LED_PIXEL_REG_ACTUAL_BRIGHTNESS: "u0.8",
     JD_LED_PIXEL_REG_LIGHT_TYPE: "u8",
diff --git a/jacdac/light_bulb/constants.py b/jacdac/light_bulb/constants.py
index ebe35e4..b0e62fd 100644
--- a/jacdac/light_bulb/constants.py
+++ b/jacdac/light_bulb/constants.py
@@ -6,7 +6,7 @@ JD_LIGHT_BULB_REG_BRIGHTNESS = const(JD_REG_INTENSITY)
 JD_LIGHT_BULB_REG_DIMMEABLE = const(0x180)
 JD_LIGHT_BULB_EV_ON = const(JD_EV_ACTIVE)
 JD_LIGHT_BULB_EV_OFF = const(JD_EV_INACTIVE)
-JD_LIGHT_BULB__PACK_FORMATS = {
+JD_LIGHT_BULB_PACK_FORMATS = {
     JD_LIGHT_BULB_REG_BRIGHTNESS: "u0.16",
     JD_LIGHT_BULB_REG_DIMMEABLE: "u8"
 }
\ No newline at end of file
diff --git a/jacdac/light_level/constants.py b/jacdac/light_level/constants.py
index ae13241..c8c83c5 100644
--- a/jacdac/light_level/constants.py
+++ b/jacdac/light_level/constants.py
@@ -7,7 +7,7 @@ JD_LIGHT_LEVEL_VARIANT_LEDMATRIX = const(0x2)
 JD_LIGHT_LEVEL_VARIANT_AMBIENT = const(0x3)
 JD_LIGHT_LEVEL_REG_LIGHT_LEVEL = const(JD_REG_READING)
 JD_LIGHT_LEVEL_REG_VARIANT = const(JD_REG_VARIANT)
-JD_LIGHT_LEVEL__PACK_FORMATS = {
+JD_LIGHT_LEVEL_PACK_FORMATS = {
     JD_LIGHT_LEVEL_REG_LIGHT_LEVEL: "u0.16",
     JD_LIGHT_LEVEL_REG_VARIANT: "u8"
 }
\ No newline at end of file
diff --git a/jacdac/logger/constants.py b/jacdac/logger/constants.py
index 0585f7d..737fcf4 100644
--- a/jacdac/logger/constants.py
+++ b/jacdac/logger/constants.py
@@ -11,7 +11,7 @@ JD_LOGGER_CMD_DEBUG = const(0x80)
 JD_LOGGER_CMD_LOG = const(0x81)
 JD_LOGGER_CMD_WARN = const(0x82)
 JD_LOGGER_CMD_ERROR = const(0x83)
-JD_LOGGER__PACK_FORMATS = {
+JD_LOGGER_PACK_FORMATS = {
     JD_LOGGER_REG_MIN_PRIORITY: "u8",
     JD_LOGGER_CMD_DEBUG: "s",
     JD_LOGGER_CMD_LOG: "s",
diff --git a/jacdac/magnetometer/constants.py b/jacdac/magnetometer/constants.py
index 0b0d54b..e347686 100644
--- a/jacdac/magnetometer/constants.py
+++ b/jacdac/magnetometer/constants.py
@@ -5,7 +5,7 @@ JD_SERVICE_CLASS_MAGNETOMETER = const(0x13029088)
 JD_MAGNETOMETER_REG_FORCES = const(JD_REG_READING)
 JD_MAGNETOMETER_REG_FORCES_ERROR = const(JD_REG_READING_ERROR)
 JD_MAGNETOMETER_CMD_CALIBRATE = const(JD_CMD_CALIBRATE)
-JD_MAGNETOMETER__PACK_FORMATS = {
+JD_MAGNETOMETER_PACK_FORMATS = {
     JD_MAGNETOMETER_REG_FORCES: "i32 i32 i32",
     JD_MAGNETOMETER_REG_FORCES_ERROR: "i32"
 }
\ No newline at end of file
diff --git a/jacdac/matrix_keypad/constants.py b/jacdac/matrix_keypad/constants.py
index a7e7a0d..57a5a43 100644
--- a/jacdac/matrix_keypad/constants.py
+++ b/jacdac/matrix_keypad/constants.py
@@ -15,7 +15,7 @@ JD_MATRIX_KEYPAD_EV_DOWN = const(JD_EV_ACTIVE)
 JD_MATRIX_KEYPAD_EV_UP = const(JD_EV_INACTIVE)
 JD_MATRIX_KEYPAD_EV_CLICK = const(0x80)
 JD_MATRIX_KEYPAD_EV_LONG_CLICK = const(0x81)
-JD_MATRIX_KEYPAD__PACK_FORMATS = {
+JD_MATRIX_KEYPAD_PACK_FORMATS = {
     JD_MATRIX_KEYPAD_REG_PRESSED: "r: u8",
     JD_MATRIX_KEYPAD_REG_ROWS: "u8",
     JD_MATRIX_KEYPAD_REG_COLUMNS: "u8",
diff --git a/jacdac/microphone/constants.py b/jacdac/microphone/constants.py
index 95214a2..cde38d1 100644
--- a/jacdac/microphone/constants.py
+++ b/jacdac/microphone/constants.py
@@ -3,7 +3,7 @@ from jacdac.constants import *
 JD_SERVICE_CLASS_MICROPHONE = const(0x113dac86)
 JD_MICROPHONE_CMD_SAMPLE = const(0x81)
 JD_MICROPHONE_REG_SAMPLING_PERIOD = const(0x80)
-JD_MICROPHONE__PACK_FORMATS = {
+JD_MICROPHONE_PACK_FORMATS = {
     JD_MICROPHONE_CMD_SAMPLE: "b[12] u32",
     JD_MICROPHONE_REG_SAMPLING_PERIOD: "u32"
 }
\ No newline at end of file
diff --git a/jacdac/midi_output/constants.py b/jacdac/midi_output/constants.py
index 2bfa786..a49c816 100644
--- a/jacdac/midi_output/constants.py
+++ b/jacdac/midi_output/constants.py
@@ -5,7 +5,7 @@ JD_SERVICE_CLASS_MIDI_OUTPUT = const(0x1a848cd7)
 JD_MIDI_OUTPUT_REG_ENABLED = const(JD_REG_INTENSITY)
 JD_MIDI_OUTPUT_CMD_CLEAR = const(0x80)
 JD_MIDI_OUTPUT_CMD_SEND = const(0x81)
-JD_MIDI_OUTPUT__PACK_FORMATS = {
+JD_MIDI_OUTPUT_PACK_FORMATS = {
     JD_MIDI_OUTPUT_REG_ENABLED: "u8",
     JD_MIDI_OUTPUT_CMD_SEND: "b"
 }
\ No newline at end of file
diff --git a/jacdac/model_runner/constants.py b/jacdac/model_runner/constants.py
index a47bf69..d163c99 100644
--- a/jacdac/model_runner/constants.py
+++ b/jacdac/model_runner/constants.py
@@ -18,7 +18,7 @@ JD_MODEL_RUNNER_REG_LAST_ERROR = const(0x185)
 JD_MODEL_RUNNER_REG_FORMAT = const(0x186)
 JD_MODEL_RUNNER_REG_FORMAT_VERSION = const(0x187)
 JD_MODEL_RUNNER_REG_PARALLEL = const(0x188)
-JD_MODEL_RUNNER__PACK_FORMATS = {
+JD_MODEL_RUNNER_PACK_FORMATS = {
     JD_MODEL_RUNNER_CMD_SET_MODEL: "u32",
     JD_MODEL_RUNNER_CMD_PREDICT: "b[12]",
     JD_MODEL_RUNNER_REG_AUTO_INVOKE_EVERY: "u16",
diff --git a/jacdac/motion/constants.py b/jacdac/motion/constants.py
index 43243f7..53dd899 100644
--- a/jacdac/motion/constants.py
+++ b/jacdac/motion/constants.py
@@ -8,7 +8,7 @@ JD_MOTION_REG_MAX_DISTANCE = const(0x180)
 JD_MOTION_REG_ANGLE = const(0x181)
 JD_MOTION_REG_VARIANT = const(JD_REG_VARIANT)
 JD_MOTION_EV_MOVEMENT = const(JD_EV_ACTIVE)
-JD_MOTION__PACK_FORMATS = {
+JD_MOTION_PACK_FORMATS = {
     JD_MOTION_REG_MOVING: "u8",
     JD_MOTION_REG_MAX_DISTANCE: "u16.16",
     JD_MOTION_REG_ANGLE: "u16",
diff --git a/jacdac/motor/constants.py b/jacdac/motor/constants.py
index a722883..249c127 100644
--- a/jacdac/motor/constants.py
+++ b/jacdac/motor/constants.py
@@ -6,7 +6,7 @@ JD_MOTOR_REG_DUTY = const(JD_REG_VALUE)
 JD_MOTOR_REG_ENABLED = const(JD_REG_INTENSITY)
 JD_MOTOR_REG_LOAD_TORQUE = const(0x180)
 JD_MOTOR_REG_LOAD_SPEED = const(0x181)
-JD_MOTOR__PACK_FORMATS = {
+JD_MOTOR_PACK_FORMATS = {
     JD_MOTOR_REG_DUTY: "i1.15",
     JD_MOTOR_REG_ENABLED: "u8",
     JD_MOTOR_REG_LOAD_TORQUE: "u16.16",
diff --git a/jacdac/multitouch/constants.py b/jacdac/multitouch/constants.py
index 557210e..ddb7165 100644
--- a/jacdac/multitouch/constants.py
+++ b/jacdac/multitouch/constants.py
@@ -9,7 +9,7 @@ JD_MULTITOUCH_EV_TAP = const(0x80)
 JD_MULTITOUCH_EV_LONG_PRESS = const(0x81)
 JD_MULTITOUCH_EV_SWIPE_POS = const(0x90)
 JD_MULTITOUCH_EV_SWIPE_NEG = const(0x91)
-JD_MULTITOUCH__PACK_FORMATS = {
+JD_MULTITOUCH_PACK_FORMATS = {
     JD_MULTITOUCH_REG_CAPACITY: "r: i32",
     JD_MULTITOUCH_EV_TOUCH: "u32",
     JD_MULTITOUCH_EV_RELEASE: "u32",
diff --git a/jacdac/potentiometer/constants.py b/jacdac/potentiometer/constants.py
index a11a4aa..00e056a 100644
--- a/jacdac/potentiometer/constants.py
+++ b/jacdac/potentiometer/constants.py
@@ -6,7 +6,7 @@ JD_POTENTIOMETER_VARIANT_SLIDER = const(0x1)
 JD_POTENTIOMETER_VARIANT_ROTARY = const(0x2)
 JD_POTENTIOMETER_REG_POSITION = const(JD_REG_READING)
 JD_POTENTIOMETER_REG_VARIANT = const(JD_REG_VARIANT)
-JD_POTENTIOMETER__PACK_FORMATS = {
+JD_POTENTIOMETER_PACK_FORMATS = {
     JD_POTENTIOMETER_REG_POSITION: "u0.16",
     JD_POTENTIOMETER_REG_VARIANT: "u8"
 }
\ No newline at end of file
diff --git a/jacdac/power/constants.py b/jacdac/power/constants.py
index 05690cd..6e1a7ae 100644
--- a/jacdac/power/constants.py
+++ b/jacdac/power/constants.py
@@ -17,7 +17,7 @@ JD_POWER_REG_KEEP_ON_PULSE_DURATION = const(0x80)
 JD_POWER_REG_KEEP_ON_PULSE_PERIOD = const(0x81)
 JD_POWER_CMD_SHUTDOWN = const(0x80)
 JD_POWER_EV_POWER_STATUS_CHANGED = const(JD_EV_CHANGE)
-JD_POWER__PACK_FORMATS = {
+JD_POWER_PACK_FORMATS = {
     JD_POWER_REG_ALLOWED: "u8",
     JD_POWER_REG_MAX_POWER: "u16",
     JD_POWER_REG_POWER_STATUS: "u8",
diff --git a/jacdac/pressure_button/constants.py b/jacdac/pressure_button/constants.py
index 6e2cb75..0006891 100644
--- a/jacdac/pressure_button/constants.py
+++ b/jacdac/pressure_button/constants.py
@@ -3,6 +3,6 @@ from jacdac.constants import *
 from jacdac.system.constants import *
 JD_SERVICE_CLASS_PRESSURE_BUTTON = const(0x281740c3)
 JD_PRESSURE_BUTTON_REG_THRESHOLD = const(JD_REG_ACTIVE_THRESHOLD)
-JD_PRESSURE_BUTTON__PACK_FORMATS = {
+JD_PRESSURE_BUTTON_PACK_FORMATS = {
     JD_PRESSURE_BUTTON_REG_THRESHOLD: "u0.16"
 }
\ No newline at end of file
diff --git a/jacdac/proto_test/constants.py b/jacdac/proto_test/constants.py
index 2ed899f..b2835e5 100644
--- a/jacdac/proto_test/constants.py
+++ b/jacdac/proto_test/constants.py
@@ -30,7 +30,7 @@ JD_PROTO_TEST_CMD_C_BYTES = const(0x85)
 JD_PROTO_TEST_CMD_C_I8_U8_U16_I32 = const(0x86)
 JD_PROTO_TEST_CMD_C_U8_STRING = const(0x87)
 JD_PROTO_TEST_CMD_C_REPORT_PIPE = const(0x90)
-JD_PROTO_TEST__PACK_FORMATS = {
+JD_PROTO_TEST_PACK_FORMATS = {
     JD_PROTO_TEST_REG_RW_BOOL: "u8",
     JD_PROTO_TEST_REG_RO_BOOL: "u8",
     JD_PROTO_TEST_REG_RW_U32: "u32",
diff --git a/jacdac/proxy/constants.py b/jacdac/proxy/constants.py
index be00fbe..2ffa1ad 100644
--- a/jacdac/proxy/constants.py
+++ b/jacdac/proxy/constants.py
@@ -1,6 +1,6 @@
 # Autogenerated constants for Proxy service
 from jacdac.constants import *
 JD_SERVICE_CLASS_PROXY = const(0x16f19949)
-JD_PROXY__PACK_FORMATS = {
+JD_PROXY_PACK_FORMATS = {
 
 }
\ No newline at end of file
diff --git a/jacdac/pulse_oximeter/constants.py b/jacdac/pulse_oximeter/constants.py
index 4a82803..dbb9f82 100644
--- a/jacdac/pulse_oximeter/constants.py
+++ b/jacdac/pulse_oximeter/constants.py
@@ -4,7 +4,7 @@ from jacdac.system.constants import *
 JD_SERVICE_CLASS_PULSE_OXIMETER = const(0x10bb4eb6)
 JD_PULSE_OXIMETER_REG_OXYGEN = const(JD_REG_READING)
 JD_PULSE_OXIMETER_REG_OXYGEN_ERROR = const(JD_REG_READING_ERROR)
-JD_PULSE_OXIMETER__PACK_FORMATS = {
+JD_PULSE_OXIMETER_PACK_FORMATS = {
     JD_PULSE_OXIMETER_REG_OXYGEN: "u8.8",
     JD_PULSE_OXIMETER_REG_OXYGEN_ERROR: "u8.8"
 }
\ No newline at end of file
diff --git a/jacdac/rain_gauge/constants.py b/jacdac/rain_gauge/constants.py
index 53dfa0b..822bd2b 100644
--- a/jacdac/rain_gauge/constants.py
+++ b/jacdac/rain_gauge/constants.py
@@ -4,7 +4,7 @@ from jacdac.system.constants import *
 JD_SERVICE_CLASS_RAIN_GAUGE = const(0x13734c95)
 JD_RAIN_GAUGE_REG_PRECIPITATION = const(JD_REG_READING)
 JD_RAIN_GAUGE_REG_PRECIPITATION_PRECISION = const(JD_REG_READING_RESOLUTION)
-JD_RAIN_GAUGE__PACK_FORMATS = {
+JD_RAIN_GAUGE_PACK_FORMATS = {
     JD_RAIN_GAUGE_REG_PRECIPITATION: "u16.16",
     JD_RAIN_GAUGE_REG_PRECIPITATION_PRECISION: "u16.16"
 }
\ No newline at end of file
diff --git a/jacdac/real_time_clock/constants.py b/jacdac/real_time_clock/constants.py
index d3ae6fe..61588b0 100644
--- a/jacdac/real_time_clock/constants.py
+++ b/jacdac/real_time_clock/constants.py
@@ -10,7 +10,7 @@ JD_REAL_TIME_CLOCK_REG_ERROR = const(0x180)
 JD_REAL_TIME_CLOCK_REG_PRECISION = const(0x181)
 JD_REAL_TIME_CLOCK_REG_VARIANT = const(JD_REG_VARIANT)
 JD_REAL_TIME_CLOCK_CMD_SET_TIME = const(0x80)
-JD_REAL_TIME_CLOCK__PACK_FORMATS = {
+JD_REAL_TIME_CLOCK_PACK_FORMATS = {
     JD_REAL_TIME_CLOCK_REG_LOCAL_TIME: "u16 u8 u8 u8 u8 u8 u8",
     JD_REAL_TIME_CLOCK_REG_ERROR: "u16.16",
     JD_REAL_TIME_CLOCK_REG_PRECISION: "u16.16",
diff --git a/jacdac/reflected_light/constants.py b/jacdac/reflected_light/constants.py
index 1594cf2..856e3e2 100644
--- a/jacdac/reflected_light/constants.py
+++ b/jacdac/reflected_light/constants.py
@@ -8,7 +8,7 @@ JD_REFLECTED_LIGHT_REG_BRIGHTNESS = const(JD_REG_READING)
 JD_REFLECTED_LIGHT_REG_VARIANT = const(JD_REG_VARIANT)
 JD_REFLECTED_LIGHT_EV_DARK = const(JD_EV_INACTIVE)
 JD_REFLECTED_LIGHT_EV_LIGHT = const(JD_EV_ACTIVE)
-JD_REFLECTED_LIGHT__PACK_FORMATS = {
+JD_REFLECTED_LIGHT_PACK_FORMATS = {
     JD_REFLECTED_LIGHT_REG_BRIGHTNESS: "u0.16",
     JD_REFLECTED_LIGHT_REG_VARIANT: "u8"
 }
\ No newline at end of file
diff --git a/jacdac/relay/constants.py b/jacdac/relay/constants.py
index 2649be0..5b6cf38 100644
--- a/jacdac/relay/constants.py
+++ b/jacdac/relay/constants.py
@@ -10,7 +10,7 @@ JD_RELAY_REG_VARIANT = const(JD_REG_VARIANT)
 JD_RELAY_REG_MAX_SWITCHING_CURRENT = const(0x180)
 JD_RELAY_EV_ACTIVE = const(JD_EV_ACTIVE)
 JD_RELAY_EV_INACTIVE = const(JD_EV_INACTIVE)
-JD_RELAY__PACK_FORMATS = {
+JD_RELAY_PACK_FORMATS = {
     JD_RELAY_REG_CLOSED: "u8",
     JD_RELAY_REG_VARIANT: "u8",
     JD_RELAY_REG_MAX_SWITCHING_CURRENT: "u32"
diff --git a/jacdac/rng/constants.py b/jacdac/rng/constants.py
index 38b3ed5..0209984 100644
--- a/jacdac/rng/constants.py
+++ b/jacdac/rng/constants.py
@@ -7,7 +7,7 @@ JD_RNG_VARIANT_ADCNOISE = const(0x2)
 JD_RNG_VARIANT_WEB_CRYPTO = const(0x3)
 JD_RNG_REG_RANDOM = const(0x180)
 JD_RNG_REG_VARIANT = const(JD_REG_VARIANT)
-JD_RNG__PACK_FORMATS = {
+JD_RNG_PACK_FORMATS = {
     JD_RNG_REG_RANDOM: "b",
     JD_RNG_REG_VARIANT: "u8"
 }
\ No newline at end of file
diff --git a/jacdac/role_manager/constants.py b/jacdac/role_manager/constants.py
index 410c4ea..65cbc96 100644
--- a/jacdac/role_manager/constants.py
+++ b/jacdac/role_manager/constants.py
@@ -10,7 +10,7 @@ JD_ROLE_MANAGER_CMD_CLEAR_ALL_ROLES = const(0x84)
 JD_ROLE_MANAGER_CMD_LIST_STORED_ROLES = const(0x82)
 JD_ROLE_MANAGER_CMD_LIST_REQUIRED_ROLES = const(0x83)
 JD_ROLE_MANAGER_EV_CHANGE = const(JD_EV_CHANGE)
-JD_ROLE_MANAGER__PACK_FORMATS = {
+JD_ROLE_MANAGER_PACK_FORMATS = {
     JD_ROLE_MANAGER_REG_AUTO_BIND: "u8",
     JD_ROLE_MANAGER_REG_ALL_ROLES_ALLOCATED: "u8",
     JD_ROLE_MANAGER_CMD_GET_ROLE: "b[8] u8",
diff --git a/jacdac/rotary_encoder/constants.py b/jacdac/rotary_encoder/constants.py
index b87d51b..676fc10 100644
--- a/jacdac/rotary_encoder/constants.py
+++ b/jacdac/rotary_encoder/constants.py
@@ -4,7 +4,7 @@ from jacdac.system.constants import *
 JD_SERVICE_CLASS_ROTARY_ENCODER = const(0x10fa29c9)
 JD_ROTARY_ENCODER_REG_POSITION = const(JD_REG_READING)
 JD_ROTARY_ENCODER_REG_CLICKS_PER_TURN = const(0x180)
-JD_ROTARY_ENCODER__PACK_FORMATS = {
+JD_ROTARY_ENCODER_PACK_FORMATS = {
     JD_ROTARY_ENCODER_REG_POSITION: "i32",
     JD_ROTARY_ENCODER_REG_CLICKS_PER_TURN: "u16"
 }
\ No newline at end of file
diff --git a/jacdac/rover/constants.py b/jacdac/rover/constants.py
index 025dfa9..8581f3b 100644
--- a/jacdac/rover/constants.py
+++ b/jacdac/rover/constants.py
@@ -3,6 +3,6 @@ from jacdac.constants import *
 from jacdac.system.constants import *
 JD_SERVICE_CLASS_ROVER = const(0x19f4d06b)
 JD_ROVER_REG_KINEMATICS = const(JD_REG_READING)
-JD_ROVER__PACK_FORMATS = {
+JD_ROVER_PACK_FORMATS = {
     JD_ROVER_REG_KINEMATICS: "i16.16 i16.16 i16.16 i16.16 i16.16"
 }
\ No newline at end of file
diff --git a/jacdac/sensor/constants.py b/jacdac/sensor/constants.py
index becf1b9..8aa51c2 100644
--- a/jacdac/sensor/constants.py
+++ b/jacdac/sensor/constants.py
@@ -1,7 +1,7 @@
 # Autogenerated constants for Sensor service
 from jacdac.constants import *
 from jacdac.system.constants import *
-JD__PACK_FORMATS = {
+JD_PACK_FORMATS = {
     JD_REG_STREAMING_SAMPLES: "u8",
     JD_REG_STREAMING_INTERVAL: "u32",
     JD_REG_STREAMING_PREFERRED_INTERVAL: "u32"
diff --git a/jacdac/sensor_aggregator/constants.py b/jacdac/sensor_aggregator/constants.py
index cd4135a..949b04c 100644
--- a/jacdac/sensor_aggregator/constants.py
+++ b/jacdac/sensor_aggregator/constants.py
@@ -13,7 +13,7 @@ JD_SENSOR_AGGREGATOR_REG_NUM_SAMPLES = const(0x180)
 JD_SENSOR_AGGREGATOR_REG_SAMPLE_SIZE = const(0x181)
 JD_SENSOR_AGGREGATOR_REG_STREAMING_SAMPLES = const(0x81)
 JD_SENSOR_AGGREGATOR_REG_CURRENT_SAMPLE = const(JD_REG_READING)
-JD_SENSOR_AGGREGATOR__PACK_FORMATS = {
+JD_SENSOR_AGGREGATOR_PACK_FORMATS = {
     JD_SENSOR_AGGREGATOR_REG_INPUTS: "u16 u16 u32 r: b[8] u32 u8 u8 u8 i8",
     JD_SENSOR_AGGREGATOR_REG_NUM_SAMPLES: "u32",
     JD_SENSOR_AGGREGATOR_REG_SAMPLE_SIZE: "u8",
diff --git a/jacdac/servo/constants.py b/jacdac/servo/constants.py
index 7764901..ec0dbcb 100644
--- a/jacdac/servo/constants.py
+++ b/jacdac/servo/constants.py
@@ -12,7 +12,7 @@ JD_SERVO_REG_MAX_PULSE = const(0x85)
 JD_SERVO_REG_STALL_TORQUE = const(0x180)
 JD_SERVO_REG_RESPONSE_SPEED = const(0x181)
 JD_SERVO_REG_CURRENT_ANGLE = const(JD_REG_READING)
-JD_SERVO__PACK_FORMATS = {
+JD_SERVO_PACK_FORMATS = {
     JD_SERVO_REG_ANGLE: "i16.16",
     JD_SERVO_REG_ENABLED: "u8",
     JD_SERVO_REG_OFFSET: "i16.16",
diff --git a/jacdac/settings/constants.py b/jacdac/settings/constants.py
index 1479731..928ba08 100644
--- a/jacdac/settings/constants.py
+++ b/jacdac/settings/constants.py
@@ -9,7 +9,7 @@ JD_SETTINGS_CMD_LIST_KEYS = const(0x82)
 JD_SETTINGS_CMD_LIST = const(0x83)
 JD_SETTINGS_CMD_CLEAR = const(0x85)
 JD_SETTINGS_EV_CHANGE = const(JD_EV_CHANGE)
-JD_SETTINGS__PACK_FORMATS = {
+JD_SETTINGS_PACK_FORMATS = {
     JD_SETTINGS_CMD_GET: "s",
     JD_SETTINGS_CMD_SET: "z b",
     JD_SETTINGS_CMD_DELETE: "s",
diff --git a/jacdac/seven_segment_display/constants.py b/jacdac/seven_segment_display/constants.py
index d8f64a0..31aef5d 100644
--- a/jacdac/seven_segment_display/constants.py
+++ b/jacdac/seven_segment_display/constants.py
@@ -9,7 +9,7 @@ JD_SEVEN_SEGMENT_DISPLAY_REG_DIGIT_COUNT = const(0x180)
 JD_SEVEN_SEGMENT_DISPLAY_REG_DECIMAL_POINT = const(0x181)
 JD_SEVEN_SEGMENT_DISPLAY_CMD_SET_NUMBER = const(0x80)
 JD_SEVEN_SEGMENT_DISPLAY_CMD_SET_TEXT = const(0x81)
-JD_SEVEN_SEGMENT_DISPLAY__PACK_FORMATS = {
+JD_SEVEN_SEGMENT_DISPLAY_PACK_FORMATS = {
     JD_SEVEN_SEGMENT_DISPLAY_REG_DIGITS: "b",
     JD_SEVEN_SEGMENT_DISPLAY_REG_BRIGHTNESS: "u0.16",
     JD_SEVEN_SEGMENT_DISPLAY_REG_DOUBLE_DOTS: "u8",
diff --git a/jacdac/soil_moisture/constants.py b/jacdac/soil_moisture/constants.py
index 777488b..44c51c6 100644
--- a/jacdac/soil_moisture/constants.py
+++ b/jacdac/soil_moisture/constants.py
@@ -7,7 +7,7 @@ JD_SOIL_MOISTURE_VARIANT_CAPACITIVE = const(0x2)
 JD_SOIL_MOISTURE_REG_MOISTURE = const(JD_REG_READING)
 JD_SOIL_MOISTURE_REG_MOISTURE_ERROR = const(JD_REG_READING_ERROR)
 JD_SOIL_MOISTURE_REG_VARIANT = const(JD_REG_VARIANT)
-JD_SOIL_MOISTURE__PACK_FORMATS = {
+JD_SOIL_MOISTURE_PACK_FORMATS = {
     JD_SOIL_MOISTURE_REG_MOISTURE: "u0.16",
     JD_SOIL_MOISTURE_REG_MOISTURE_ERROR: "u0.16",
     JD_SOIL_MOISTURE_REG_VARIANT: "u8"
diff --git a/jacdac/solenoid/constants.py b/jacdac/solenoid/constants.py
index 0d411e9..5fce01b 100644
--- a/jacdac/solenoid/constants.py
+++ b/jacdac/solenoid/constants.py
@@ -7,7 +7,7 @@ JD_SOLENOID_VARIANT_VALVE = const(0x2)
 JD_SOLENOID_VARIANT_LATCH = const(0x3)
 JD_SOLENOID_REG_PULLED = const(JD_REG_INTENSITY)
 JD_SOLENOID_REG_VARIANT = const(JD_REG_VARIANT)
-JD_SOLENOID__PACK_FORMATS = {
+JD_SOLENOID_PACK_FORMATS = {
     JD_SOLENOID_REG_PULLED: "u8",
     JD_SOLENOID_REG_VARIANT: "u8"
 }
\ No newline at end of file
diff --git a/jacdac/sound_level/constants.py b/jacdac/sound_level/constants.py
index 4f87978..6f68123 100644
--- a/jacdac/sound_level/constants.py
+++ b/jacdac/sound_level/constants.py
@@ -10,7 +10,7 @@ JD_SOUND_LEVEL_REG_LOUD_THRESHOLD = const(JD_REG_ACTIVE_THRESHOLD)
 JD_SOUND_LEVEL_REG_QUIET_THRESHOLD = const(JD_REG_INACTIVE_THRESHOLD)
 JD_SOUND_LEVEL_EV_LOUD = const(JD_EV_ACTIVE)
 JD_SOUND_LEVEL_EV_QUIET = const(JD_EV_INACTIVE)
-JD_SOUND_LEVEL__PACK_FORMATS = {
+JD_SOUND_LEVEL_PACK_FORMATS = {
     JD_SOUND_LEVEL_REG_SOUND_LEVEL: "u0.16",
     JD_SOUND_LEVEL_REG_ENABLED: "u8",
     JD_SOUND_LEVEL_REG_MIN_DECIBELS: "i16",
diff --git a/jacdac/sound_player/constants.py b/jacdac/sound_player/constants.py
index 98214ba..aede32b 100644
--- a/jacdac/sound_player/constants.py
+++ b/jacdac/sound_player/constants.py
@@ -5,7 +5,7 @@ JD_SERVICE_CLASS_SOUND_PLAYER = const(0x1403d338)
 JD_SOUND_PLAYER_REG_VOLUME = const(JD_REG_INTENSITY)
 JD_SOUND_PLAYER_CMD_PLAY = const(0x80)
 JD_SOUND_PLAYER_CMD_LIST_SOUNDS = const(0x81)
-JD_SOUND_PLAYER__PACK_FORMATS = {
+JD_SOUND_PLAYER_PACK_FORMATS = {
     JD_SOUND_PLAYER_REG_VOLUME: "u0.16",
     JD_SOUND_PLAYER_CMD_PLAY: "s",
     JD_SOUND_PLAYER_CMD_LIST_SOUNDS: "b[12]"
diff --git a/jacdac/sound_spectrum/constants.py b/jacdac/sound_spectrum/constants.py
index d14f3e4..5fd2f13 100644
--- a/jacdac/sound_spectrum/constants.py
+++ b/jacdac/sound_spectrum/constants.py
@@ -8,7 +8,7 @@ JD_SOUND_SPECTRUM_REG_FFT_POW2_SIZE = const(0x80)
 JD_SOUND_SPECTRUM_REG_MIN_DECIBELS = const(0x81)
 JD_SOUND_SPECTRUM_REG_MAX_DECIBELS = const(0x82)
 JD_SOUND_SPECTRUM_REG_SMOOTHING_TIME_CONSTANT = const(0x83)
-JD_SOUND_SPECTRUM__PACK_FORMATS = {
+JD_SOUND_SPECTRUM_PACK_FORMATS = {
     JD_SOUND_SPECTRUM_REG_FREQUENCY_BINS: "b",
     JD_SOUND_SPECTRUM_REG_ENABLED: "u8",
     JD_SOUND_SPECTRUM_REG_FFT_POW2_SIZE: "u8",
diff --git a/jacdac/speech_synthesis/constants.py b/jacdac/speech_synthesis/constants.py
index ea0466b..96b12ae 100644
--- a/jacdac/speech_synthesis/constants.py
+++ b/jacdac/speech_synthesis/constants.py
@@ -9,7 +9,7 @@ JD_SPEECH_SYNTHESIS_REG_PITCH = const(0x82)
 JD_SPEECH_SYNTHESIS_REG_RATE = const(0x83)
 JD_SPEECH_SYNTHESIS_CMD_SPEAK = const(0x80)
 JD_SPEECH_SYNTHESIS_CMD_CANCEL = const(0x81)
-JD_SPEECH_SYNTHESIS__PACK_FORMATS = {
+JD_SPEECH_SYNTHESIS_PACK_FORMATS = {
     JD_SPEECH_SYNTHESIS_REG_ENABLED: "u8",
     JD_SPEECH_SYNTHESIS_REG_LANG: "s",
     JD_SPEECH_SYNTHESIS_REG_VOLUME: "u0.8",
diff --git a/jacdac/switch/constants.py b/jacdac/switch/constants.py
index 92ecfb5..15c103a 100644
--- a/jacdac/switch/constants.py
+++ b/jacdac/switch/constants.py
@@ -15,7 +15,7 @@ JD_SWITCH_REG_VARIANT = const(JD_REG_VARIANT)
 JD_SWITCH_REG_AUTO_OFF_DELAY = const(0x180)
 JD_SWITCH_EV_ON = const(JD_EV_ACTIVE)
 JD_SWITCH_EV_OFF = const(JD_EV_INACTIVE)
-JD_SWITCH__PACK_FORMATS = {
+JD_SWITCH_PACK_FORMATS = {
     JD_SWITCH_REG_ACTIVE: "u8",
     JD_SWITCH_REG_VARIANT: "u8",
     JD_SWITCH_REG_AUTO_OFF_DELAY: "u16.16"
diff --git a/jacdac/system/constants.py b/jacdac/system/constants.py
index 70b4605..16d9e77 100644
--- a/jacdac/system/constants.py
+++ b/jacdac/system/constants.py
@@ -42,7 +42,7 @@ JD_EV_INACTIVE = const(0x2)
 JD_EV_CHANGE = const(0x3)
 JD_EV_STATUS_CODE_CHANGED = const(0x4)
 JD_EV_NEUTRAL = const(0x7)
-JD__PACK_FORMATS = {
+JD_PACK_FORMATS = {
     JD_CMD_EVENT: "u32 u32",
     JD_CMD_COMMAND_NOT_IMPLEMENTED: "u16 u16",
     JD_REG_INTENSITY: "u32",
diff --git a/jacdac/tcp/constants.py b/jacdac/tcp/constants.py
index f4f7370..2455d31 100644
--- a/jacdac/tcp/constants.py
+++ b/jacdac/tcp/constants.py
@@ -6,7 +6,7 @@ JD_TCP_TCP_ERROR_INVALID_COMMAND_PAYLOAD = const(0x2)
 JD_TCP_CMD_OPEN = const(0x80)
 JD_TCP_PIPE_OPEN_SSL = const(0x1)
 JD_TCP_PIPE_ERROR = const(0x0)
-JD_TCP__PACK_FORMATS = {
+JD_TCP_PACK_FORMATS = {
     JD_TCP_CMD_OPEN: "b[12]",
     JD_TCP_PIPE_OPEN_SSL: "u16 s",
     JD_TCP_PIPE_ERROR: "i32"
diff --git a/jacdac/thermocouple/constants.py b/jacdac/thermocouple/constants.py
index 208021e..28cefe4 100644
--- a/jacdac/thermocouple/constants.py
+++ b/jacdac/thermocouple/constants.py
@@ -15,7 +15,7 @@ JD_THERMOCOUPLE_REG_MIN_TEMPERATURE = const(JD_REG_MIN_READING)
 JD_THERMOCOUPLE_REG_MAX_TEMPERATURE = const(JD_REG_MAX_READING)
 JD_THERMOCOUPLE_REG_TEMPERATURE_ERROR = const(JD_REG_READING_ERROR)
 JD_THERMOCOUPLE_REG_VARIANT = const(JD_REG_VARIANT)
-JD_THERMOCOUPLE__PACK_FORMATS = {
+JD_THERMOCOUPLE_PACK_FORMATS = {
     JD_THERMOCOUPLE_REG_TEMPERATURE: "i22.10",
     JD_THERMOCOUPLE_REG_MIN_TEMPERATURE: "i22.10",
     JD_THERMOCOUPLE_REG_MAX_TEMPERATURE: "i22.10",
diff --git a/jacdac/thermometer/constants.py b/jacdac/thermometer/constants.py
index 396ee62..d24b446 100644
--- a/jacdac/thermometer/constants.py
+++ b/jacdac/thermometer/constants.py
@@ -10,7 +10,7 @@ JD_THERMOMETER_REG_MIN_TEMPERATURE = const(JD_REG_MIN_READING)
 JD_THERMOMETER_REG_MAX_TEMPERATURE = const(JD_REG_MAX_READING)
 JD_THERMOMETER_REG_TEMPERATURE_ERROR = const(JD_REG_READING_ERROR)
 JD_THERMOMETER_REG_VARIANT = const(JD_REG_VARIANT)
-JD_THERMOMETER__PACK_FORMATS = {
+JD_THERMOMETER_PACK_FORMATS = {
     JD_THERMOMETER_REG_TEMPERATURE: "i22.10",
     JD_THERMOMETER_REG_MIN_TEMPERATURE: "i22.10",
     JD_THERMOMETER_REG_MAX_TEMPERATURE: "i22.10",
diff --git a/jacdac/traffic_light/constants.py b/jacdac/traffic_light/constants.py
index 3d4518a..6fb67d5 100644
--- a/jacdac/traffic_light/constants.py
+++ b/jacdac/traffic_light/constants.py
@@ -4,7 +4,7 @@ JD_SERVICE_CLASS_TRAFFIC_LIGHT = const(0x15c38d9b)
 JD_TRAFFIC_LIGHT_REG_RED = const(0x80)
 JD_TRAFFIC_LIGHT_REG_ORANGE = const(0x81)
 JD_TRAFFIC_LIGHT_REG_GREEN = const(0x82)
-JD_TRAFFIC_LIGHT__PACK_FORMATS = {
+JD_TRAFFIC_LIGHT_PACK_FORMATS = {
     JD_TRAFFIC_LIGHT_REG_RED: "u8",
     JD_TRAFFIC_LIGHT_REG_ORANGE: "u8",
     JD_TRAFFIC_LIGHT_REG_GREEN: "u8"
diff --git a/jacdac/tvoc/constants.py b/jacdac/tvoc/constants.py
index f3c9262..3a39540 100644
--- a/jacdac/tvoc/constants.py
+++ b/jacdac/tvoc/constants.py
@@ -7,7 +7,7 @@ JD_TVOC_REG_TVOC_ERROR = const(JD_REG_READING_ERROR)
 JD_TVOC_REG_MIN_TVOC = const(JD_REG_MIN_READING)
 JD_TVOC_REG_MAX_TVOC = const(JD_REG_MAX_READING)
 JD_TVOC_REG_CONDITIONING_PERIOD = const(0x180)
-JD_TVOC__PACK_FORMATS = {
+JD_TVOC_PACK_FORMATS = {
     JD_TVOC_REG_TVOC: "u22.10",
     JD_TVOC_REG_TVOC_ERROR: "u22.10",
     JD_TVOC_REG_MIN_TVOC: "u22.10",
diff --git a/jacdac/unique_brain/constants.py b/jacdac/unique_brain/constants.py
index de7d93e..6462153 100644
--- a/jacdac/unique_brain/constants.py
+++ b/jacdac/unique_brain/constants.py
@@ -1,6 +1,6 @@
 # Autogenerated constants for Unique Brain service
 from jacdac.constants import *
 JD_SERVICE_CLASS_UNIQUE_BRAIN = const(0x103c4ee5)
-JD_UNIQUE_BRAIN__PACK_FORMATS = {
+JD_UNIQUE_BRAIN_PACK_FORMATS = {
 
 }
\ No newline at end of file
diff --git a/jacdac/uv_index/constants.py b/jacdac/uv_index/constants.py
index 4ffec3b..591b754 100644
--- a/jacdac/uv_index/constants.py
+++ b/jacdac/uv_index/constants.py
@@ -7,7 +7,7 @@ JD_UV_INDEX_VARIANT_VISIBLE_IR = const(0x2)
 JD_UV_INDEX_REG_UV_INDEX = const(JD_REG_READING)
 JD_UV_INDEX_REG_UV_INDEX_ERROR = const(JD_REG_READING_ERROR)
 JD_UV_INDEX_REG_VARIANT = const(JD_REG_VARIANT)
-JD_UV_INDEX__PACK_FORMATS = {
+JD_UV_INDEX_PACK_FORMATS = {
     JD_UV_INDEX_REG_UV_INDEX: "u16.16",
     JD_UV_INDEX_REG_UV_INDEX_ERROR: "u16.16",
     JD_UV_INDEX_REG_VARIANT: "u8"
diff --git a/jacdac/verified_telemetry/constants.py b/jacdac/verified_telemetry/constants.py
index a1a1561..39160fa 100644
--- a/jacdac/verified_telemetry/constants.py
+++ b/jacdac/verified_telemetry/constants.py
@@ -16,7 +16,7 @@ JD_VERIFIED_TELEMETRY_CMD_RESET_FINGERPRINT_TEMPLATE = const(0x80)
 JD_VERIFIED_TELEMETRY_CMD_RETRAIN_FINGERPRINT_TEMPLATE = const(0x81)
 JD_VERIFIED_TELEMETRY_EV_TELEMETRY_STATUS_CHANGE = const(JD_EV_CHANGE)
 JD_VERIFIED_TELEMETRY_EV_FINGERPRINT_TEMPLATE_CHANGE = const(0x80)
-JD_VERIFIED_TELEMETRY__PACK_FORMATS = {
+JD_VERIFIED_TELEMETRY_PACK_FORMATS = {
     JD_VERIFIED_TELEMETRY_REG_TELEMETRY_STATUS: "u8",
     JD_VERIFIED_TELEMETRY_REG_TELEMETRY_STATUS_INTERVAL: "u32",
     JD_VERIFIED_TELEMETRY_REG_FINGERPRINT_TYPE: "u8",
diff --git a/jacdac/vibration_motor/constants.py b/jacdac/vibration_motor/constants.py
index 0735b49..a254136 100644
--- a/jacdac/vibration_motor/constants.py
+++ b/jacdac/vibration_motor/constants.py
@@ -4,7 +4,7 @@ from jacdac.system.constants import *
 JD_SERVICE_CLASS_VIBRATION_MOTOR = const(0x183fc4a2)
 JD_VIBRATION_MOTOR_REG_ENABLED = const(JD_REG_INTENSITY)
 JD_VIBRATION_MOTOR_CMD_VIBRATE = const(0x80)
-JD_VIBRATION_MOTOR__PACK_FORMATS = {
+JD_VIBRATION_MOTOR_PACK_FORMATS = {
     JD_VIBRATION_MOTOR_REG_ENABLED: "u8",
     JD_VIBRATION_MOTOR_CMD_VIBRATE: "r: u8 u0.8"
 }
\ No newline at end of file
diff --git a/jacdac/water_level/constants.py b/jacdac/water_level/constants.py
index 9020c3f..981526a 100644
--- a/jacdac/water_level/constants.py
+++ b/jacdac/water_level/constants.py
@@ -7,7 +7,7 @@ JD_WATER_LEVEL_VARIANT_CONTACT_PHOTO_ELECTRIC = const(0x2)
 JD_WATER_LEVEL_VARIANT_NON_CONTACT_PHOTO_ELECTRIC = const(0x3)
 JD_WATER_LEVEL_REG_LEVEL = const(JD_REG_READING)
 JD_WATER_LEVEL_REG_VARIANT = const(JD_REG_VARIANT)
-JD_WATER_LEVEL__PACK_FORMATS = {
+JD_WATER_LEVEL_PACK_FORMATS = {
     JD_WATER_LEVEL_REG_LEVEL: "u0.16",
     JD_WATER_LEVEL_REG_VARIANT: "u8"
 }
\ No newline at end of file
diff --git a/jacdac/weight_scale/constants.py b/jacdac/weight_scale/constants.py
index ae5e0bf..b009a52 100644
--- a/jacdac/weight_scale/constants.py
+++ b/jacdac/weight_scale/constants.py
@@ -15,7 +15,7 @@ JD_WEIGHT_SCALE_REG_WEIGHT_RESOLUTION = const(JD_REG_READING_RESOLUTION)
 JD_WEIGHT_SCALE_REG_VARIANT = const(JD_REG_VARIANT)
 JD_WEIGHT_SCALE_CMD_CALIBRATE_ZERO_OFFSET = const(0x80)
 JD_WEIGHT_SCALE_CMD_CALIBRATE_GAIN = const(0x81)
-JD_WEIGHT_SCALE__PACK_FORMATS = {
+JD_WEIGHT_SCALE_PACK_FORMATS = {
     JD_WEIGHT_SCALE_REG_WEIGHT: "u16.16",
     JD_WEIGHT_SCALE_REG_WEIGHT_ERROR: "u16.16",
     JD_WEIGHT_SCALE_REG_ZERO_OFFSET: "u16.16",
diff --git a/jacdac/wifi/constants.py b/jacdac/wifi/constants.py
index 0562fea..0f476dd 100644
--- a/jacdac/wifi/constants.py
+++ b/jacdac/wifi/constants.py
@@ -31,7 +31,7 @@ JD_WIFI_EV_LOST_IP = const(JD_EV_INACTIVE)
 JD_WIFI_EV_SCAN_COMPLETE = const(0x80)
 JD_WIFI_EV_NETWORKS_CHANGED = const(0x81)
 JD_WIFI_EV_CONNECTION_FAILED = const(0x82)
-JD_WIFI__PACK_FORMATS = {
+JD_WIFI_PACK_FORMATS = {
     JD_WIFI_CMD_LAST_SCAN_RESULTS: "b[12]",
     JD_WIFI_CMD_ADD_NETWORK: "z z",
     JD_WIFI_CMD_FORGET_NETWORK: "s",
diff --git a/jacdac/wind_direction/constants.py b/jacdac/wind_direction/constants.py
index 6d00a87..8849ba1 100644
--- a/jacdac/wind_direction/constants.py
+++ b/jacdac/wind_direction/constants.py
@@ -4,7 +4,7 @@ from jacdac.system.constants import *
 JD_SERVICE_CLASS_WIND_DIRECTION = const(0x186be92b)
 JD_WIND_DIRECTION_REG_WIND_DIRECTION = const(JD_REG_READING)
 JD_WIND_DIRECTION_REG_WIND_DIRECTION_ERROR = const(JD_REG_READING_ERROR)
-JD_WIND_DIRECTION__PACK_FORMATS = {
+JD_WIND_DIRECTION_PACK_FORMATS = {
     JD_WIND_DIRECTION_REG_WIND_DIRECTION: "u16",
     JD_WIND_DIRECTION_REG_WIND_DIRECTION_ERROR: "u16"
 }
\ No newline at end of file
diff --git a/jacdac/wind_speed/constants.py b/jacdac/wind_speed/constants.py
index dfd927c..7c680b3 100644
--- a/jacdac/wind_speed/constants.py
+++ b/jacdac/wind_speed/constants.py
@@ -5,7 +5,7 @@ JD_SERVICE_CLASS_WIND_SPEED = const(0x1b591bbf)
 JD_WIND_SPEED_REG_WIND_SPEED = const(JD_REG_READING)
 JD_WIND_SPEED_REG_WIND_SPEED_ERROR = const(JD_REG_READING_ERROR)
 JD_WIND_SPEED_REG_MAX_WIND_SPEED = const(JD_REG_MAX_READING)
-JD_WIND_SPEED__PACK_FORMATS = {
+JD_WIND_SPEED_PACK_FORMATS = {
     JD_WIND_SPEED_REG_WIND_SPEED: "u16.16",
     JD_WIND_SPEED_REG_WIND_SPEED_ERROR: "u16.16",
     JD_WIND_SPEED_REG_MAX_WIND_SPEED: "u16.16"