diff --git a/v1/characteristic_uuids.json b/v1/characteristic_uuids.json
index e89b95b..e248772 100644
--- a/v1/characteristic_uuids.json
+++ b/v1/characteristic_uuids.json
@@ -524,13 +524,13 @@
     { "name": "Thingy Speaker Status", "identifier": "com.nordicsemi.characteristic.thingy.speaker_status", "uuid": "EF680503-9B35-4933-9B10-52FFA9740042" , "source": "nordic"},
     { "name": "Thingy Microphone", "identifier": "com.nordicsemi.characteristic.thingy.microphone", "uuid": "EF680504-9B35-4933-9B10-52FFA9740042" , "source": "nordic"},
 
-    { "name": "Temperature Reading Characteristic", "identifier": "com.nordicsemi.characteristic.thingy.sensorhub.temperature", "uuid": "506A55C4-B5E7-46FA-8326-8ACAEB1189EB", "source": "nordic"},
-    { "name": "Pressure Reading Characteristic", "identifier": "com.nordicsemi.characteristic.thingy.sensorhub.pressure", "uuid": "51838AFF-2D9A-B32A-B32A-8187E41664BA", "source": "nordic"},
-    { "name": "Humidity Reading Characteristic", "identifier": "com.nordicsemi.characteristic.thingy.sensorhub.humidity", "uuid": "753E3050-DF06-4B53-B090-5E1D810C4383", "source": "nordic"},
-    { "name": "Red Color Reading Characteristic", "identifier": "com.nordicsemi.characteristic.thingy.sensorhub.red", "uuid": "82754BBB-6ED3-4D69-A0E1-F19F6B654EC2", "source": "nordic"},
-    { "name": "Green Color Reading Characteristic", "identifier": "com.nordicsemi.characteristic.thingy.sensorhub.green", "uuid": "DB7F9F36-92CE-4509-A2EF-AF72BA38FB48", "source": "nordic"},
-    { "name": "Blue Color Reading Characteristic", "identifier": "com.nordicsemi.characteristic.thingy.sensorhub.blue", "uuid": "F5D2EAB5-41E8-4F7C-AEF7-C9FFF4C544C0", "source": "nordic"},
-    { "name": "Battery Reading Characteristic", "identifier": "com.nordicsemi.characteristic.thingy.sensorhub.battery", "uuid": "FA3CF070-D0C7-4668-96C4-86125C8AC5DF", "source": "nordic"},
+    { "name": "Sensor Hub Temperature", "identifier": "com.nordicsemi.characteristic.thingy.sensorhub.temperature", "uuid": "506A55C4-B5E7-46FA-8326-8ACAEB1189EB", "source": "nordic"},
+    { "name": "Sensor Hub Pressure", "identifier": "com.nordicsemi.characteristic.thingy.sensorhub.pressure", "uuid": "51838AFF-2D9A-B32A-B32A-8187E41664BA", "source": "nordic"},
+    { "name": "Sensor Hub Humidity", "identifier": "com.nordicsemi.characteristic.thingy.sensorhub.humidity", "uuid": "753E3050-DF06-4B53-B090-5E1D810C4383", "source": "nordic"},
+    { "name": "Sensor Hub Red Color", "identifier": "com.nordicsemi.characteristic.thingy.sensorhub.red", "uuid": "82754BBB-6ED3-4D69-A0E1-F19F6B654EC2", "source": "nordic"},
+    { "name": "Sensor Hub Green Color", "identifier": "com.nordicsemi.characteristic.thingy.sensorhub.green", "uuid": "DB7F9F36-92CE-4509-A2EF-AF72BA38FB48", "source": "nordic"},
+    { "name": "Sensor Hub Blue Color", "identifier": "com.nordicsemi.characteristic.thingy.sensorhub.blue", "uuid": "F5D2EAB5-41E8-4F7C-AEF7-C9FFF4C544C0", "source": "nordic"},
+    { "name": "Sensor Hub Battery", "identifier": "com.nordicsemi.characteristic.thingy.sensorhub.battery", "uuid": "FA3CF070-D0C7-4668-96C4-86125C8AC5DF", "source": "nordic"},
 
     { "name": "UART RX Characteristic", "identifier": "com.nordicsemi.characteristic.uart_rx", "uuid": "6E400002-B5A3-F393-E0A9-E50E24DCCA9E" , "source": "nordic"},
     { "name": "UART TX Characteristic", "identifier": "com.nordicsemi.characteristic.uart_tx", "uuid": "6E400003-B5A3-F393-E0A9-E50E24DCCA9E" , "source": "nordic"},
diff --git a/v1/service_uuids.json b/v1/service_uuids.json
index d50da8a..c31daff 100644
--- a/v1/service_uuids.json
+++ b/v1/service_uuids.json
@@ -88,12 +88,12 @@
     { "name": "micro:bit DFU Control Service", "identifier": "org.microbit.service.dfu_control", "uuid": "E95D93B0-251D-470A-A062-FA1922DFA9A8" , "source": "microbit"},
     { "name": "micro:bit Temperature Service", "identifier": "org.microbit.service.temperature", "uuid": "E95D6100-251D-470A-A062-FA1922DFA9A8" , "source": "microbit"},
 
-    { "name": "Thingy Configuration Service", "identifier": "com.nordicsemi.service.thingy_configuration", "uuid": "EF680100-9B35-4933-9B10-52FFA9740042" , "source": "nordic"},
-    { "name": "Thingy Weather Station Service", "identifier": "com.nordicsemi.service.thingy_weather_station", "uuid": "EF680200-9B35-4933-9B10-52FFA9740042" , "source": "nordic"},
-    { "name": "Thingy UI Service", "identifier": "com.nordicsemi.service.thingy_ui", "uuid": "EF680300-9B35-4933-9B10-52FFA9740042" , "source": "nordic"},
-    { "name": "Thingy Motion Service", "identifier": "com.nordicsemi.service.thingy_motion", "uuid": "EF680400-9B35-4933-9B10-52FFA9740042" , "source": "nordic"},
-    { "name": "Thingy Sound Service", "identifier": "com.nordicsemi.service.thingy_sound", "uuid": "EF680500-9B35-4933-9B10-52FFA9740042" , "source": "nordic"},
-    { "name": "Thingy:53 Demo Service", "identifier": "com.nordicsemi.service.thingy_53_demo", "uuid": "A5B46352-9D13-479F-9FCB-3DCDF0A13F4D" , "source": "nordic"},
+    { "name": "Thingy Configuration Service", "identifier": "com.nordicsemi.service.thingy.configuration", "uuid": "EF680100-9B35-4933-9B10-52FFA9740042" , "source": "nordic"},
+    { "name": "Thingy Weather Station Service", "identifier": "com.nordicsemi.service.thingy.weather_station", "uuid": "EF680200-9B35-4933-9B10-52FFA9740042" , "source": "nordic"},
+    { "name": "Thingy UI Service", "identifier": "com.nordicsemi.service.thingy.ui", "uuid": "EF680300-9B35-4933-9B10-52FFA9740042" , "source": "nordic"},
+    { "name": "Thingy Motion Service", "identifier": "com.nordicsemi.service.thingy.motion", "uuid": "EF680400-9B35-4933-9B10-52FFA9740042" , "source": "nordic"},
+    { "name": "Thingy Sound Service", "identifier": "com.nordicsemi.service.thingy.sound", "uuid": "EF680500-9B35-4933-9B10-52FFA9740042" , "source": "nordic"},
+    { "name": "Nordic Sensor Hub Service", "identifier": "com.nordicsemi.service.thingy.sensorhub", "uuid": "A5B46352-9D13-479F-9FCB-3DCDF0A13F4D" , "source": "nordic"},
 
     { "name": "Nordic LED and Button Service", "identifier": "com.nordicsemi.service.led_and_button", "uuid": "00001523-1212-EFDE-1523-785FEABCD123" , "source": "nordic"},
     { "name": "Nordic UART Service", "identifier": "com.nordicsemi.service.uart", "uuid": "6E400001-B5A3-F393-E0A9-E50E24DCCA9E" , "source": "nordic"},