.MaxPowerConsumption    = USB_CONFIG_POWER_MA(100)
                },
 
-       .Interface =
+       .TM_Interface =
                {
                        .Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
 
                        .InterfaceStrIndex      = NO_DESCRIPTOR
                },
 
-       .DataOutEndpoint =
+       .TM_DataOutEndpoint =
                {
                        .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
 
-                       .EndpointAddress        = (ENDPOINT_DESCRIPTOR_DIR_OUT | TMC_OUT_EPNUM),
+                       .EndpointAddress        = (ENDPOINT_DIR_OUT | TMC_OUT_EPNUM),
                        .Attributes             = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
                        .EndpointSize           = TMC_IO_EPSIZE,
                        .PollingIntervalMS      = 0x01
                },
 
-       .DataInEndpoint =
+       .TM_DataInEndpoint =
                {
                        .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
 
-                       .EndpointAddress        = (ENDPOINT_DESCRIPTOR_DIR_IN | TMC_IN_EPNUM),
+                       .EndpointAddress        = (ENDPOINT_DIR_IN | TMC_IN_EPNUM),
                        .Attributes             = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
                        .EndpointSize           = TMC_IO_EPSIZE,
                        .PollingIntervalMS      = 0x01
                },
 
-       .NotificationEndpoint =
+       .TM_NotificationEndpoint =
                {
                        .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
 
-                       .EndpointAddress        = (ENDPOINT_DESCRIPTOR_DIR_IN | TMC_NOTIFICATION_EPNUM),
+                       .EndpointAddress        = (ENDPOINT_DIR_IN | TMC_NOTIFICATION_EPNUM),
                        .Attributes             = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
                        .EndpointSize           = TMC_NOTIFICATION_EPSIZE,
                        .PollingIntervalMS      = 0xFF