diff --git a/Demos/Device/ClassDriver/DualCDC/Descriptors.c b/Demos/Device/ClassDriver/DualVirtualSerial/Descriptors.c
similarity index 100%
rename from Demos/Device/ClassDriver/DualCDC/Descriptors.c
rename to Demos/Device/ClassDriver/DualVirtualSerial/Descriptors.c
diff --git a/Demos/Device/ClassDriver/DualCDC/Descriptors.h b/Demos/Device/ClassDriver/DualVirtualSerial/Descriptors.h
similarity index 100%
rename from Demos/Device/ClassDriver/DualCDC/Descriptors.h
rename to Demos/Device/ClassDriver/DualVirtualSerial/Descriptors.h
diff --git a/Demos/Device/ClassDriver/DualCDC/Doxygen.conf b/Demos/Device/ClassDriver/DualVirtualSerial/Doxygen.conf
similarity index 100%
rename from Demos/Device/ClassDriver/DualCDC/Doxygen.conf
rename to Demos/Device/ClassDriver/DualVirtualSerial/Doxygen.conf
diff --git a/Demos/Device/ClassDriver/DualCDC/DualCDC.c b/Demos/Device/ClassDriver/DualVirtualSerial/DualCDC.c
similarity index 100%
rename from Demos/Device/ClassDriver/DualCDC/DualCDC.c
rename to Demos/Device/ClassDriver/DualVirtualSerial/DualCDC.c
diff --git a/Demos/Device/ClassDriver/DualCDC/DualCDC.h b/Demos/Device/ClassDriver/DualVirtualSerial/DualCDC.h
similarity index 100%
rename from Demos/Device/ClassDriver/DualCDC/DualCDC.h
rename to Demos/Device/ClassDriver/DualVirtualSerial/DualCDC.h
diff --git a/Demos/Device/ClassDriver/DualCDC/DualCDC.txt b/Demos/Device/ClassDriver/DualVirtualSerial/DualCDC.txt
similarity index 100%
rename from Demos/Device/ClassDriver/DualCDC/DualCDC.txt
rename to Demos/Device/ClassDriver/DualVirtualSerial/DualCDC.txt
diff --git a/Demos/Device/ClassDriver/DualCDC/LUFA DualCDC.inf b/Demos/Device/ClassDriver/DualVirtualSerial/LUFA DualCDC.inf
similarity index 100%
rename from Demos/Device/ClassDriver/DualCDC/LUFA DualCDC.inf
rename to Demos/Device/ClassDriver/DualVirtualSerial/LUFA DualCDC.inf
diff --git a/Demos/Device/ClassDriver/DualCDC/makefile b/Demos/Device/ClassDriver/DualVirtualSerial/makefile
similarity index 100%
rename from Demos/Device/ClassDriver/DualCDC/makefile
rename to Demos/Device/ClassDriver/DualVirtualSerial/makefile
diff --git a/Demos/Device/ClassDriver/CDC/CDC.c b/Demos/Device/ClassDriver/VirtualSerial/CDC.c
similarity index 100%
rename from Demos/Device/ClassDriver/CDC/CDC.c
rename to Demos/Device/ClassDriver/VirtualSerial/CDC.c
diff --git a/Demos/Device/ClassDriver/CDC/CDC.h b/Demos/Device/ClassDriver/VirtualSerial/CDC.h
similarity index 100%
rename from Demos/Device/ClassDriver/CDC/CDC.h
rename to Demos/Device/ClassDriver/VirtualSerial/CDC.h
diff --git a/Demos/Device/ClassDriver/CDC/CDC.txt b/Demos/Device/ClassDriver/VirtualSerial/CDC.txt
similarity index 100%
rename from Demos/Device/ClassDriver/CDC/CDC.txt
rename to Demos/Device/ClassDriver/VirtualSerial/CDC.txt
diff --git a/Demos/Device/ClassDriver/CDC/Descriptors.c b/Demos/Device/ClassDriver/VirtualSerial/Descriptors.c
similarity index 100%
rename from Demos/Device/ClassDriver/CDC/Descriptors.c
rename to Demos/Device/ClassDriver/VirtualSerial/Descriptors.c
diff --git a/Demos/Device/ClassDriver/CDC/Descriptors.h b/Demos/Device/ClassDriver/VirtualSerial/Descriptors.h
similarity index 100%
rename from Demos/Device/ClassDriver/CDC/Descriptors.h
rename to Demos/Device/ClassDriver/VirtualSerial/Descriptors.h
diff --git a/Demos/Device/ClassDriver/CDC/Doxygen.conf b/Demos/Device/ClassDriver/VirtualSerial/Doxygen.conf
similarity index 100%
rename from Demos/Device/ClassDriver/CDC/Doxygen.conf
rename to Demos/Device/ClassDriver/VirtualSerial/Doxygen.conf
diff --git a/Demos/Device/ClassDriver/CDC/LUFA CDC.inf b/Demos/Device/ClassDriver/VirtualSerial/LUFA CDC.inf
similarity index 100%
rename from Demos/Device/ClassDriver/CDC/LUFA CDC.inf
rename to Demos/Device/ClassDriver/VirtualSerial/LUFA CDC.inf
diff --git a/Demos/Device/ClassDriver/CDC/makefile b/Demos/Device/ClassDriver/VirtualSerial/makefile
similarity index 100%
rename from Demos/Device/ClassDriver/CDC/makefile
rename to Demos/Device/ClassDriver/VirtualSerial/makefile
diff --git a/Demos/Device/ClassDriver/CDCMouse/CDCMouse.c b/Demos/Device/ClassDriver/VirtualSerialMouse/CDCMouse.c
similarity index 100%
rename from Demos/Device/ClassDriver/CDCMouse/CDCMouse.c
rename to Demos/Device/ClassDriver/VirtualSerialMouse/CDCMouse.c
diff --git a/Demos/Device/ClassDriver/CDCMouse/CDCMouse.h b/Demos/Device/ClassDriver/VirtualSerialMouse/CDCMouse.h
similarity index 100%
rename from Demos/Device/ClassDriver/CDCMouse/CDCMouse.h
rename to Demos/Device/ClassDriver/VirtualSerialMouse/CDCMouse.h
diff --git a/Demos/Device/ClassDriver/CDCMouse/CDCMouse.txt b/Demos/Device/ClassDriver/VirtualSerialMouse/CDCMouse.txt
similarity index 100%
rename from Demos/Device/ClassDriver/CDCMouse/CDCMouse.txt
rename to Demos/Device/ClassDriver/VirtualSerialMouse/CDCMouse.txt
diff --git a/Demos/Device/ClassDriver/CDCMouse/Descriptors.c b/Demos/Device/ClassDriver/VirtualSerialMouse/Descriptors.c
similarity index 100%
rename from Demos/Device/ClassDriver/CDCMouse/Descriptors.c
rename to Demos/Device/ClassDriver/VirtualSerialMouse/Descriptors.c
diff --git a/Demos/Device/ClassDriver/CDCMouse/Descriptors.h b/Demos/Device/ClassDriver/VirtualSerialMouse/Descriptors.h
similarity index 100%
rename from Demos/Device/ClassDriver/CDCMouse/Descriptors.h
rename to Demos/Device/ClassDriver/VirtualSerialMouse/Descriptors.h
diff --git a/Demos/Device/ClassDriver/CDCMouse/Doxygen.conf b/Demos/Device/ClassDriver/VirtualSerialMouse/Doxygen.conf
similarity index 100%
rename from Demos/Device/ClassDriver/CDCMouse/Doxygen.conf
rename to Demos/Device/ClassDriver/VirtualSerialMouse/Doxygen.conf
diff --git a/Demos/Device/ClassDriver/CDCMouse/LUFA CDCMouse.inf b/Demos/Device/ClassDriver/VirtualSerialMouse/LUFA CDCMouse.inf
similarity index 100%
rename from Demos/Device/ClassDriver/CDCMouse/LUFA CDCMouse.inf
rename to Demos/Device/ClassDriver/VirtualSerialMouse/LUFA CDCMouse.inf
diff --git a/Demos/Device/ClassDriver/CDCMouse/makefile b/Demos/Device/ClassDriver/VirtualSerialMouse/makefile
similarity index 100%
rename from Demos/Device/ClassDriver/CDCMouse/makefile
rename to Demos/Device/ClassDriver/VirtualSerialMouse/makefile
diff --git a/Demos/Device/LowLevel/DualCDC/Descriptors.c b/Demos/Device/LowLevel/DualVirtualSerial/Descriptors.c
similarity index 100%
rename from Demos/Device/LowLevel/DualCDC/Descriptors.c
rename to Demos/Device/LowLevel/DualVirtualSerial/Descriptors.c
diff --git a/Demos/Device/LowLevel/DualCDC/Descriptors.h b/Demos/Device/LowLevel/DualVirtualSerial/Descriptors.h
similarity index 100%
rename from Demos/Device/LowLevel/DualCDC/Descriptors.h
rename to Demos/Device/LowLevel/DualVirtualSerial/Descriptors.h
diff --git a/Demos/Device/LowLevel/DualCDC/Doxygen.conf b/Demos/Device/LowLevel/DualVirtualSerial/Doxygen.conf
similarity index 100%
rename from Demos/Device/LowLevel/DualCDC/Doxygen.conf
rename to Demos/Device/LowLevel/DualVirtualSerial/Doxygen.conf
diff --git a/Demos/Device/LowLevel/DualCDC/DualCDC.c b/Demos/Device/LowLevel/DualVirtualSerial/DualCDC.c
similarity index 100%
rename from Demos/Device/LowLevel/DualCDC/DualCDC.c
rename to Demos/Device/LowLevel/DualVirtualSerial/DualCDC.c
diff --git a/Demos/Device/LowLevel/DualCDC/DualCDC.h b/Demos/Device/LowLevel/DualVirtualSerial/DualCDC.h
similarity index 100%
rename from Demos/Device/LowLevel/DualCDC/DualCDC.h
rename to Demos/Device/LowLevel/DualVirtualSerial/DualCDC.h
diff --git a/Demos/Device/LowLevel/DualCDC/DualCDC.txt b/Demos/Device/LowLevel/DualVirtualSerial/DualCDC.txt
similarity index 100%
rename from Demos/Device/LowLevel/DualCDC/DualCDC.txt
rename to Demos/Device/LowLevel/DualVirtualSerial/DualCDC.txt
diff --git a/Demos/Device/LowLevel/DualCDC/LUFA DualCDC.inf b/Demos/Device/LowLevel/DualVirtualSerial/LUFA DualCDC.inf
similarity index 100%
rename from Demos/Device/LowLevel/DualCDC/LUFA DualCDC.inf
rename to Demos/Device/LowLevel/DualVirtualSerial/LUFA DualCDC.inf
diff --git a/Demos/Device/LowLevel/DualCDC/makefile b/Demos/Device/LowLevel/DualVirtualSerial/makefile
similarity index 100%
rename from Demos/Device/LowLevel/DualCDC/makefile
rename to Demos/Device/LowLevel/DualVirtualSerial/makefile
diff --git a/Demos/Device/LowLevel/CDC/CDC.c b/Demos/Device/LowLevel/VirtualSerial/CDC.c
similarity index 100%
rename from Demos/Device/LowLevel/CDC/CDC.c
rename to Demos/Device/LowLevel/VirtualSerial/CDC.c
diff --git a/Demos/Device/LowLevel/CDC/CDC.h b/Demos/Device/LowLevel/VirtualSerial/CDC.h
similarity index 100%
rename from Demos/Device/LowLevel/CDC/CDC.h
rename to Demos/Device/LowLevel/VirtualSerial/CDC.h
diff --git a/Demos/Device/LowLevel/CDC/CDC.txt b/Demos/Device/LowLevel/VirtualSerial/CDC.txt
similarity index 100%
rename from Demos/Device/LowLevel/CDC/CDC.txt
rename to Demos/Device/LowLevel/VirtualSerial/CDC.txt
diff --git a/Demos/Device/LowLevel/CDC/Descriptors.c b/Demos/Device/LowLevel/VirtualSerial/Descriptors.c
similarity index 100%
rename from Demos/Device/LowLevel/CDC/Descriptors.c
rename to Demos/Device/LowLevel/VirtualSerial/Descriptors.c
diff --git a/Demos/Device/LowLevel/CDC/Descriptors.h b/Demos/Device/LowLevel/VirtualSerial/Descriptors.h
similarity index 100%
rename from Demos/Device/LowLevel/CDC/Descriptors.h
rename to Demos/Device/LowLevel/VirtualSerial/Descriptors.h
diff --git a/Demos/Device/LowLevel/CDC/Doxygen.conf b/Demos/Device/LowLevel/VirtualSerial/Doxygen.conf
similarity index 100%
rename from Demos/Device/LowLevel/CDC/Doxygen.conf
rename to Demos/Device/LowLevel/VirtualSerial/Doxygen.conf
diff --git a/Demos/Device/LowLevel/CDC/LUFA CDC.inf b/Demos/Device/LowLevel/VirtualSerial/LUFA CDC.inf
similarity index 100%
rename from Demos/Device/LowLevel/CDC/LUFA CDC.inf
rename to Demos/Device/LowLevel/VirtualSerial/LUFA CDC.inf
diff --git a/Demos/Device/LowLevel/CDC/makefile b/Demos/Device/LowLevel/VirtualSerial/makefile
similarity index 100%
rename from Demos/Device/LowLevel/CDC/makefile
rename to Demos/Device/LowLevel/VirtualSerial/makefile
diff --git a/Demos/Host/ClassDriver/CDCHost/CDCHost.c b/Demos/Host/ClassDriver/VirtualSerialHost/CDCHost.c
similarity index 100%
rename from Demos/Host/ClassDriver/CDCHost/CDCHost.c
rename to Demos/Host/ClassDriver/VirtualSerialHost/CDCHost.c
diff --git a/Demos/Host/ClassDriver/CDCHost/CDCHost.h b/Demos/Host/ClassDriver/VirtualSerialHost/CDCHost.h
similarity index 100%
rename from Demos/Host/ClassDriver/CDCHost/CDCHost.h
rename to Demos/Host/ClassDriver/VirtualSerialHost/CDCHost.h
diff --git a/Demos/Host/ClassDriver/CDCHost/CDCHost.txt b/Demos/Host/ClassDriver/VirtualSerialHost/CDCHost.txt
similarity index 100%
rename from Demos/Host/ClassDriver/CDCHost/CDCHost.txt
rename to Demos/Host/ClassDriver/VirtualSerialHost/CDCHost.txt
diff --git a/Demos/Host/ClassDriver/CDCHost/Doxygen.conf b/Demos/Host/ClassDriver/VirtualSerialHost/Doxygen.conf
similarity index 100%
rename from Demos/Host/ClassDriver/CDCHost/Doxygen.conf
rename to Demos/Host/ClassDriver/VirtualSerialHost/Doxygen.conf
diff --git a/Demos/Host/ClassDriver/CDCHost/makefile b/Demos/Host/ClassDriver/VirtualSerialHost/makefile
similarity index 100%
rename from Demos/Host/ClassDriver/CDCHost/makefile
rename to Demos/Host/ClassDriver/VirtualSerialHost/makefile
diff --git a/Demos/Host/LowLevel/CDCHost/CDCHost.c b/Demos/Host/LowLevel/VirtualSerialHost/CDCHost.c
similarity index 100%
rename from Demos/Host/LowLevel/CDCHost/CDCHost.c
rename to Demos/Host/LowLevel/VirtualSerialHost/CDCHost.c
diff --git a/Demos/Host/LowLevel/CDCHost/CDCHost.h b/Demos/Host/LowLevel/VirtualSerialHost/CDCHost.h
similarity index 100%
rename from Demos/Host/LowLevel/CDCHost/CDCHost.h
rename to Demos/Host/LowLevel/VirtualSerialHost/CDCHost.h
diff --git a/Demos/Host/LowLevel/CDCHost/CDCHost.txt b/Demos/Host/LowLevel/VirtualSerialHost/CDCHost.txt
similarity index 100%
rename from Demos/Host/LowLevel/CDCHost/CDCHost.txt
rename to Demos/Host/LowLevel/VirtualSerialHost/CDCHost.txt
diff --git a/Demos/Host/LowLevel/CDCHost/ConfigDescriptor.c b/Demos/Host/LowLevel/VirtualSerialHost/ConfigDescriptor.c
similarity index 100%
rename from Demos/Host/LowLevel/CDCHost/ConfigDescriptor.c
rename to Demos/Host/LowLevel/VirtualSerialHost/ConfigDescriptor.c
diff --git a/Demos/Host/LowLevel/CDCHost/ConfigDescriptor.h b/Demos/Host/LowLevel/VirtualSerialHost/ConfigDescriptor.h
similarity index 100%
rename from Demos/Host/LowLevel/CDCHost/ConfigDescriptor.h
rename to Demos/Host/LowLevel/VirtualSerialHost/ConfigDescriptor.h
diff --git a/Demos/Host/LowLevel/CDCHost/Doxygen.conf b/Demos/Host/LowLevel/VirtualSerialHost/Doxygen.conf
similarity index 100%
rename from Demos/Host/LowLevel/CDCHost/Doxygen.conf
rename to Demos/Host/LowLevel/VirtualSerialHost/Doxygen.conf
diff --git a/Demos/Host/LowLevel/CDCHost/makefile b/Demos/Host/LowLevel/VirtualSerialHost/makefile
similarity index 100%
rename from Demos/Host/LowLevel/CDCHost/makefile
rename to Demos/Host/LowLevel/VirtualSerialHost/makefile
diff --git a/LUFA/ManPages/LibraryApps.txt b/LUFA/ManPages/LibraryApps.txt
index 58441ab16..19d2f108b 100644
--- a/LUFA/ManPages/LibraryApps.txt
+++ b/LUFA/ManPages/LibraryApps.txt
@@ -34,9 +34,7 @@
  *      - <b>ClassDriver</b>
  *        - <b>AudioInput</b> - Audio In (microphone) demo, using the library USB Audio Class driver framework
  *        - <b>AudioOutput</b> - Audio Out (speaker) demo, using the library USB Audio Class driver framework
- *        - <b>CDC</b> - Virtual Serial Port demo, using the library USB CDC Class driver framework
- *        - <b>CDCMouse</b> - Virtual Serial Port and Mouse demo, using the library USB CDC and HID Class driver frameworks
- *        - <b>DualCDC</b> - Dual Virtual Serial Port demo, using the library USB CDC Class driver framework
+ *        - <b>DualVirtualSerial</b> - Dual Virtual Serial Port demo, using the library USB CDC Class driver framework
  *        - <b>GenericHID</b> - Generic Human Interface Class demo, using the library USB HID Class driver framework
  *        - <b>Joystick</b> - USB Joystick demo, using the library USB HID Class driver framework
  *        - <b>Keyboard</b> - USB Keyboard demo, using the library USB HID Class driver framework
@@ -46,11 +44,12 @@
  *        - <b>MIDI</b> - MIDI In demo, using the library USB MIDI-Audio Class driver framework
  *        - <b>Mouse</b> - USB Mouse demo, using the library USB HID driver framework
  *        - <b>RNDISEthernet</b> - RNDIS Ethernet Webserver demo, using the library USB RNDIS driver framework
+ *        - <b>VirtualSerial</b> - Virtual Serial Port demo, using the library USB CDC Class driver framework
+ *        - <b>VirtualSerialMouse</b> - Virtual Serial Port and Mouse demo, using the library USB CDC and HID Class driver frameworks
  *      - <b>LowLevel</b>
  *        - <b>AudioInput</b> - Audio In (microphone) demo, using the low level LUFA APIs to implement the USB Audio class
  *        - <b>AudioOutput</b> - Audio Out (speaker) demo, using the low level LUFA APIs to implement the USB Audio class
- *        - <b>CDC</b> - Virtual Serial Port demo, using the low level LUFA APIs to implement the USB CDC class
- *        - <b>DualCDC</b> - Dual Virtual Serial Port demo, using the low level LUFA APIs to implement the USB CDC class
+ *        - <b>DualVirtualSerial</b> - Dual Virtual Serial Port demo, using the low level LUFA APIs to implement the USB CDC class
  *        - <b>GenericHID</b> - Generic Human Interface Class demo, using the low level LUFA APIs to implement the USB HID class
  *        - <b>Joystick</b> - USB Joystick demo, using the low level LUFA APIs to implement the USB HID class
  *        - <b>Keyboard</b> - USB Keyboard demo, using the low level LUFA APIs to implement the USB HID class
@@ -59,11 +58,11 @@
  *        - <b>MIDI</b> - MIDI In demo, using the low level LUFA APIs to implement the USB MIDI-Audio class
  *        - <b>Mouse</b> - USB Mouse demo, using the low level LUFA APIs to implement the USB HID class
  *        - <b>RNDISEthernet</b> - RNDIS Ethernet Webserver demo, using the low level LUFA APIs to implement the USB RNDIS class
+ *        - <b>VirtualSerial</b> - Virtual Serial Port demo, using the low level LUFA APIs to implement the USB CDC class
  *      - <b>Incomplete</b>
  *        - <b>SideShow</b> - Incomplete Windows SideShow demo, using the low level LUFA APIs to implement the USB SideShow class
  *    - <b>Host</b>
  *      - <b>ClassDriver</b>
- *        - <b>CDCHost</b> - Virtual Serial Port host demo, using the library USB CDC Class driver framework
  *        - <b>JoystickHostWithParser</b> - Joystick host demo with HID Descriptor parser, using the library USB HID Class driver framework
  *        - <b>KeyboardHost</b> - USB Keyboard host demo, using the library USB HID Class driver framework
  *        - <b>KeyboardHostWithParser</b> - USB Keyboard host demo with HID Descriptor parser, using the library USB HID Class
@@ -73,8 +72,8 @@
  *        - <b>MouseHostWithParser</b> - Mouse host demo with HID Descriptor parser, using the library USB HID Class driver framework
  *        - <b>RNDISHost</b> - RNDIS Ethernet host demo, using the library USB RNDIS Class driver framework
  *        - <b>StillImageHost</b> - Still Image Camera host demo, using the library USB Still Image Class driver framework
+ *        - <b>VirtualSerialHost</b> - Virtual Serial Port host demo, using the library USB CDC Class driver framework
  *      - <b>LowLevel</b>
- *        - <b>CDCHost</b> - Virtual Serial Port host demo, using the low level LUFA APIs to implement the USB CDC class
  *        - <b>JoystickHostWithParser</b> - Joystick host demo with HID Descriptor parser, using the low level LUFA APIs to implement 
  *                                          the USB HID class
  *        - <b>GenericHIDHost</b> - Generic HID host demo, using the low level LUFA APIs to implement the USB HID class
@@ -88,6 +87,7 @@
  *        - <b>PrinterHost</b> - Printer host demo, using the low level LUFA APIs to implement the USB Printer class
  *        - <b>RNDISHost</b> - RNDIS Ethernet host demo, using the low level LUFA APIs to implement the RNDIS class
  *        - <b>StillImageHost</b> - Still Image Camera host demo, using the low level LUFA APIs to implement the USB Still Image class
+ *        - <b>VirtualSerialHost</b> - Virtual Serial Port host demo, using the low level LUFA APIs to implement the USB CDC class
  *      - <b>Incomplete</b>
  *        - <b>BluetoothHost</b> - Incomplete Bluetooth host demo, using the low level LUFA APIs to implement the USB Bluetooth class
  *    - <b>DualRole</b>