diff --git a/hardware/arduino/avr/cores/arduino/PluggableUSB.cpp b/hardware/arduino/avr/cores/arduino/PluggableUSB.cpp
index 21dc7a89d..7a6351d8e 100644
--- a/hardware/arduino/avr/cores/arduino/PluggableUSB.cpp
+++ b/hardware/arduino/avr/cores/arduino/PluggableUSB.cpp
@@ -28,7 +28,7 @@ extern uint8_t _initEndpoints[];
 int PluggableUSB_::getInterface(uint8_t* interfaceCount)
 {
 	int sent = 0;
-	PUSBListNode* node;
+	PluggableUSBModule* node;
 	for (node = rootNode; node; node = node->next) {
 		int res = node->getInterface(interfaceCount);
 		if (res < 0)
@@ -40,7 +40,7 @@ int PluggableUSB_::getInterface(uint8_t* interfaceCount)
 
 int PluggableUSB_::getDescriptor(USBSetup& setup)
 {
-	PUSBListNode* node;
+	PluggableUSBModule* node;
 	for (node = rootNode; node; node = node->next) {
 		int ret = node->getDescriptor(setup);
 		// ret!=0 -> request has been processed
@@ -52,7 +52,7 @@ int PluggableUSB_::getDescriptor(USBSetup& setup)
 
 bool PluggableUSB_::setup(USBSetup& setup)
 {
-	PUSBListNode* node;
+	PluggableUSBModule* node;
 	for (node = rootNode; node; node = node->next) {
 		if (node->setup(setup)) {
 			return true;
@@ -61,7 +61,7 @@ bool PluggableUSB_::setup(USBSetup& setup)
 	return false;
 }
 
-bool PluggableUSB_::plug(PUSBListNode *node)
+bool PluggableUSB_::plug(PluggableUSBModule *node)
 {
 	if ((lastEp + node->numEndpoints) > USB_ENDPOINTS) {
 		return false;
@@ -70,7 +70,7 @@ bool PluggableUSB_::plug(PUSBListNode *node)
 	if (!rootNode) {
 		rootNode = node;
 	} else {
-		PUSBListNode *current = rootNode;
+		PluggableUSBModule *current = rootNode;
 		while (current->next) {
 			current = current->next;
 		}
diff --git a/hardware/arduino/avr/cores/arduino/PluggableUSB.h b/hardware/arduino/avr/cores/arduino/PluggableUSB.h
index 1f3057ad2..3df9bfff5 100644
--- a/hardware/arduino/avr/cores/arduino/PluggableUSB.h
+++ b/hardware/arduino/avr/cores/arduino/PluggableUSB.h
@@ -25,9 +25,9 @@
 
 #if defined(USBCON)
 
-class PUSBListNode {
+class PluggableUSBModule {
 public:
-  PUSBListNode(uint8_t numEps, uint8_t numIfs, uint8_t *epType) :
+  PluggableUSBModule(uint8_t numEps, uint8_t numIfs, uint8_t *epType) :
     numEndpoints(numEps), numInterfaces(numIfs), endpointType(epType)
   { }
 
@@ -43,7 +43,7 @@ protected:
   const uint8_t numInterfaces;
   const uint8_t *endpointType;
 
-  PUSBListNode *next = NULL;
+  PluggableUSBModule *next = NULL;
 
   friend class PluggableUSB_;
 };
@@ -51,7 +51,7 @@ protected:
 class PluggableUSB_ {
 public:
   PluggableUSB_();
-  bool plug(PUSBListNode *node);
+  bool plug(PluggableUSBModule *node);
   int getInterface(uint8_t* interfaceCount);
   int getDescriptor(USBSetup& setup);
   bool setup(USBSetup& setup);
@@ -59,7 +59,7 @@ public:
 private:
   uint8_t lastIf;
   uint8_t lastEp;
-  PUSBListNode* rootNode;
+  PluggableUSBModule* rootNode;
 };
 
 // Replacement for global singleton.
diff --git a/hardware/arduino/avr/libraries/HID/HID.cpp b/hardware/arduino/avr/libraries/HID/HID.cpp
index cce3834da..411529ecf 100644
--- a/hardware/arduino/avr/libraries/HID/HID.cpp
+++ b/hardware/arduino/avr/libraries/HID/HID.cpp
@@ -47,7 +47,7 @@ int HID_::getDescriptor(USBSetup& setup)
 	if (setup.wIndex != pluggedInterface) { return 0; }
 
 	int total = 0;
-	HIDDescriptorListNode* node;
+	HIDSubDescriptor* node;
 	for (node = rootNode; node; node = node->next) {
 		int res = USB_SendControl(TRANSFER_PGM, node->data, node->length);
 		if (res == -1)
@@ -57,12 +57,12 @@ int HID_::getDescriptor(USBSetup& setup)
 	return total;
 }
 
-void HID_::AppendDescriptor(HIDDescriptorListNode *node)
+void HID_::AppendDescriptor(HIDSubDescriptor *node)
 {
 	if (!rootNode) {
 		rootNode = node;
 	} else {
-		HIDDescriptorListNode *current = rootNode;
+		HIDSubDescriptor *current = rootNode;
 		while (current->next) {
 			current = current->next;
 		}
@@ -128,7 +128,7 @@ bool HID_::setup(USBSetup& setup)
 	return false;
 }
 
-HID_::HID_(void) : PUSBListNode(1, 1, epType),
+HID_::HID_(void) : PluggableUSBModule(1, 1, epType),
                    rootNode(NULL), descriptorSize(0),
                    protocol(1), idle(1)
 {
diff --git a/hardware/arduino/avr/libraries/HID/HID.h b/hardware/arduino/avr/libraries/HID/HID.h
index c0c2b596f..ba08da7be 100644
--- a/hardware/arduino/avr/libraries/HID/HID.h
+++ b/hardware/arduino/avr/libraries/HID/HID.h
@@ -74,25 +74,25 @@ typedef struct
   EndpointDescriptor  in;
 } HIDDescriptor;
 
-class HIDDescriptorListNode {
+class HIDSubDescriptor {
 public:
-  HIDDescriptorListNode *next = NULL;
-  HIDDescriptorListNode(const void *d, const uint16_t l) : data(d), length(l) { }
+  HIDSubDescriptor *next = NULL;
+  HIDSubDescriptor(const void *d, const uint16_t l) : data(d), length(l) { }
 
   const void* data;
   const uint16_t length;
 };
 
-class HID_ : public PUSBListNode
+class HID_ : public PluggableUSBModule
 {
 public:
   HID_(void);
   int begin(void);
   void SendReport(uint8_t id, const void* data, int len);
-  void AppendDescriptor(HIDDescriptorListNode* node);
+  void AppendDescriptor(HIDSubDescriptor* node);
 
 protected:
-  // Implementation of the PUSBListNode
+  // Implementation of the PluggableUSBModule
   int getInterface(uint8_t* interfaceCount);
   int getDescriptor(USBSetup& setup);
   bool setup(USBSetup& setup);
@@ -100,7 +100,7 @@ protected:
 private:
   uint8_t epType[1];
 
-  HIDDescriptorListNode* rootNode;
+  HIDSubDescriptor* rootNode;
   uint16_t descriptorSize;
 
   uint8_t protocol;
diff --git a/libraries/Keyboard/src/Keyboard.cpp b/libraries/Keyboard/src/Keyboard.cpp
index d899e92e4..48f085219 100644
--- a/libraries/Keyboard/src/Keyboard.cpp
+++ b/libraries/Keyboard/src/Keyboard.cpp
@@ -62,7 +62,7 @@ static const uint8_t _hidReportDescriptor[] PROGMEM = {
 
 Keyboard_::Keyboard_(void) 
 {
-	static HIDDescriptorListNode node(_hidReportDescriptor, sizeof(_hidReportDescriptor));
+	static HIDSubDescriptor node(_hidReportDescriptor, sizeof(_hidReportDescriptor));
 	HID().AppendDescriptor(&node);
 }
 
diff --git a/libraries/Mouse/src/Mouse.cpp b/libraries/Mouse/src/Mouse.cpp
index 64d02bc86..b2a2cd7b8 100644
--- a/libraries/Mouse/src/Mouse.cpp
+++ b/libraries/Mouse/src/Mouse.cpp
@@ -62,7 +62,7 @@ static const uint8_t _hidReportDescriptor[] PROGMEM = {
 
 Mouse_::Mouse_(void) : _buttons(0)
 {
-    static HIDDescriptorListNode node(_hidReportDescriptor, sizeof(_hidReportDescriptor));
+    static HIDSubDescriptor node(_hidReportDescriptor, sizeof(_hidReportDescriptor));
     HID().AppendDescriptor(&node);
 }