diff --git a/include/ola/rdm/RDMEnums.h b/include/ola/rdm/RDMEnums.h
index 72bc8aabe..b4c7230c0 100644
--- a/include/ola/rdm/RDMEnums.h
+++ b/include/ola/rdm/RDMEnums.h
@@ -159,28 +159,6 @@ typedef enum {
   PID_PRESET_MERGEMODE = 0x1043,
   PID_POWER_ON_SELF_TEST = 0x1044,
 
-  // Draft E1.33 PIDs - DO NOT USE
-  PID_ENDPOINT_LIST = 0x7FE0,
-  PID_ENDPOINT_TO_UNIVERSE = 0x7FE1,
-  PID_RDM_TRAFFIC_ENABLE = 0x7FE2,
-  PID_ENDPOINT_MODE = 0x7FE3,
-  PID_ENDPOINT_LABEL = 0x7FE4,
-  PID_DISCOVERY_STATE = 0x7FE5,
-  PID_ENDPOINT_TIMING = 0x7FE6,
-  PID_ENDPOINT_TIMING_DESCRIPTION = 0x7FE7,
-  PID_BINDING_CONTROL_FIELDS = 0x7FE8,
-  PID_ENDPOINT_IDENTIFY = 0x7FE9,
-  PID_BACKGROUND_DISCOVERY = 0x7FEA,
-  PID_ENDPOINT_DEVICE_LIST_CHANGE = 0x7FEB,
-  PID_ENDPOINT_DEVICES = 0x7FEC,
-  PID_TCP_COMMS_STATUS = 0x7FED,
-  PID_ENDPOINT_LIST_CHANGE = 0x7FEE,
-  PID_BACKGROUND_QUEUED_STATUS_POLICY = 0x7FD0,
-  PID_BACKGROUND_QUEUED_STATUS_POLICY_DESCRIPTION = 0x7FD1,
-  PID_BACKGROUND_STATUS_TYPE = 0x7FD2,
-  PID_QUEUED_STATUS_ENDPOINT_COLLECTION = 0x7FD3,
-  PID_QUEUED_STATUS_UID_COLLECTION = 0x7FD4,
-
   // E1.37-2 PIDs
   PID_LIST_INTERFACES = 0x0700,
   PID_INTERFACE_LABEL = 0x0701,
@@ -196,6 +174,30 @@ typedef enum {
   PID_DNS_NAME_SERVER = 0x070B,
   PID_DNS_HOSTNAME = 0x070C,
   PID_DNS_DOMAIN_NAME = 0x070D,
+
+  // E1.33 PIDs
+  PID_COMPONENT_SCOPE = 0x0800,
+  PID_SEARCH_DOMAIN = 0x0801,
+  PID_TCP_COMMS_STATUS = 0x0802,
+  PID_BROKER_STATUS = 0x0803,
+
+  // E1.37-7 PIDs
+  PID_ENDPOINT_LIST = 0x0900,
+  PID_ENDPOINT_LIST_CHANGE = 0x0901,
+  PID_IDENTIFY_ENDPOINT = 0x0902,
+  PID_ENDPOINT_TO_UNIVERSE = 0x0903,
+  PID_ENDPOINT_MODE = 0x0904,
+  PID_ENDPOINT_LABEL = 0x0905,
+  PID_RDM_TRAFFIC_ENABLE = 0x0906,
+  PID_DISCOVERY_STATE = 0x0907,
+  PID_BACKGROUND_DISCOVERY = 0x908,
+  PID_ENDPOINT_TIMING = 0x0909,
+  PID_ENDPOINT_TIMING_DESCRIPTION = 0x090A,
+  PID_ENDPOINT_RESPONDERS = 0x090B,
+  PID_ENDPOINT_RESPONDER_LIST_CHANGE = 0x090C,
+  PID_BINDING_CONTROL_FIELDS = 0x090D,
+  PID_BACKGROUND_QUEUED_STATUS_POLICY = 0x090E,
+  PID_BACKGROUND_QUEUED_STATUS_POLICY_DESCRIPTION = 0x090F,
 } rdm_pid;