diff --git a/libraries/HID/HID.cpp b/libraries/HID/HID.cpp
index c5954ed..c1b5fdf 100644
--- a/libraries/HID/HID.cpp
+++ b/libraries/HID/HID.cpp
@@ -61,7 +61,7 @@ int HID_GetDescriptor(int8_t t)
 		HIDDescriptorListNode* current = rootNode;
 		int total = 0;
 		while(current != NULL) {
-			total += USB_SendControl(TRANSFER_PGM,current->cb->descriptor,current->cb->length);
+			total += USB_SendControl(TRANSFER_PGM,current->descriptor->data,current->descriptor->length);
 			current = current->next;
 		}
 		return total;
@@ -82,7 +82,7 @@ void HID_::AppendDescriptor(HIDDescriptorListNode *node)
 		current->next = node;
 	}
 	modules_count++;
-	sizeof_hidReportDescriptor += (uint16_t)node->cb->length;
+	sizeof_hidReportDescriptor += (uint16_t)node->descriptor->length;
 }
 
 void HID_::SendReport(u8 id, const void* data, int len)
diff --git a/libraries/HID/HID.h b/libraries/HID/HID.h
index b9f29b4..760090a 100644
--- a/libraries/HID/HID.h
+++ b/libraries/HID/HID.h
@@ -46,14 +46,14 @@
 
 typedef struct __attribute__((packed)) {
   uint16_t length;
-  const void* descriptor;
+  const void* data;
 } HID_Descriptor;
 
 class HIDDescriptorListNode {
 public:
   HIDDescriptorListNode *next = NULL;
-  const HID_Descriptor * cb;
-  HIDDescriptorListNode(const HID_Descriptor *ncb) {cb = ncb;}
+  const HID_Descriptor *descriptor;
+  HIDDescriptorListNode(const HID_Descriptor *d) : descriptor(d) { }
 };
 
 class HID_