diff --git a/Demos/Device/ClassDriver/DualVirtualSerial/DualVirtualSerial.c b/Demos/Device/ClassDriver/DualVirtualSerial/DualVirtualSerial.c
index 000d18b9affe279d30673015dacc67b7f904f450..4765af4b23f0e44eae062ede6c9a4e3c8a74c925 100644
--- a/Demos/Device/ClassDriver/DualVirtualSerial/DualVirtualSerial.c
+++ b/Demos/Device/ClassDriver/DualVirtualSerial/DualVirtualSerial.c
@@ -30,11 +30,11 @@
 
 /** \file
  *
- *  Main source file for the DualCDC demo. This file contains the main tasks of
+ *  Main source file for the DualVirtualSerial demo. This file contains the main tasks of
  *  the demo and is responsible for the initial application hardware configuration.
  */
 
-#include "DualCDC.h"
+#include "DualVirtualSerial.h"
 
 /** LUFA CDC Class driver interface configuration and state information. This structure is
  *  passed to all CDC Class driver functions, so that multiple instances of the same class
diff --git a/Demos/Device/ClassDriver/DualVirtualSerial/DualVirtualSerial.h b/Demos/Device/ClassDriver/DualVirtualSerial/DualVirtualSerial.h
index 2f12aca88ea322acd298c06ec73d3e67544c3a70..ab406f99faa1717b5e319f9cc366fefbfae91d98 100644
--- a/Demos/Device/ClassDriver/DualVirtualSerial/DualVirtualSerial.h
+++ b/Demos/Device/ClassDriver/DualVirtualSerial/DualVirtualSerial.h
@@ -30,11 +30,11 @@
 
 /** \file
  *
- *  Header file for DualCDC.c.
+ *  Header file for DualVirtualSerial.c.
  */
 
-#ifndef _DUAL_CDC_H_
-#define _DUAL_CDC_H_
+#ifndef _DUAL_VIRTUALSERIAL_H_
+#define _DUAL_VIRTUALSERIAL_H_
 
 	/* Includes: */
 		#include <avr/io.h>
diff --git a/Demos/Device/ClassDriver/VirtualSerial/VirtualSerial.c b/Demos/Device/ClassDriver/VirtualSerial/VirtualSerial.c
index 8940ae0428a9d6a2df7dd8fb5f6078b50e8fa2e7..41bf52df1bb07c2e6268a75601828fe4bd5b4812 100644
--- a/Demos/Device/ClassDriver/VirtualSerial/VirtualSerial.c
+++ b/Demos/Device/ClassDriver/VirtualSerial/VirtualSerial.c
@@ -30,11 +30,11 @@
 
 /** \file
  *
- *  Main source file for the CDC demo. This file contains the main tasks of
+ *  Main source file for the VirtualSerial demo. This file contains the main tasks of
  *  the demo and is responsible for the initial application hardware configuration.
  */
  
-#include "CDC.h"
+#include "VirtualSerial.h"
 
 /** LUFA CDC Class driver interface configuration and state information. This structure is
  *  passed to all CDC Class driver functions, so that multiple instances of the same class
diff --git a/Demos/Device/ClassDriver/VirtualSerial/VirtualSerial.h b/Demos/Device/ClassDriver/VirtualSerial/VirtualSerial.h
index 9cc72487c27402690f981942e8f8cc687cec2014..3ffb897b17bafca6a9f708bb7b614723a2fd2faf 100644
--- a/Demos/Device/ClassDriver/VirtualSerial/VirtualSerial.h
+++ b/Demos/Device/ClassDriver/VirtualSerial/VirtualSerial.h
@@ -30,11 +30,11 @@
 
 /** \file
  *
- *  Header file for CDC.c.
+ *  Header file for VirtualSerial.c.
  */
 
-#ifndef _CDC_H_
-#define _CDC_H_
+#ifndef _VIRTUALSERIAL_H_
+#define _VIRTUALSERIAL_H_
 
 	/* Includes: */
 		#include <avr/io.h>
diff --git a/Demos/Device/ClassDriver/VirtualSerialMouse/VirtualSerialMouse.c b/Demos/Device/ClassDriver/VirtualSerialMouse/VirtualSerialMouse.c
index d979e665c2736c1d0e6886f856afcf0dec2fcb97..2c7c9552046ad6f81b37d10476d05d911ad5a8b5 100644
--- a/Demos/Device/ClassDriver/VirtualSerialMouse/VirtualSerialMouse.c
+++ b/Demos/Device/ClassDriver/VirtualSerialMouse/VirtualSerialMouse.c
@@ -30,11 +30,11 @@
 
 /** \file
  *
- *  Main source file for the CDCMouse demo. This file contains the main tasks of
+ *  Main source file for the VirtualSerialMouse demo. This file contains the main tasks of
  *  the demo and is responsible for the initial application hardware configuration.
  */
  
-#include "CDCMouse.h"
+#include "VirtualSerialMouse.h"
 
 /** LUFA CDC Class driver interface configuration and state information. This structure is
  *  passed to all CDC Class driver functions, so that multiple instances of the same class
diff --git a/Demos/Device/ClassDriver/VirtualSerialMouse/VirtualSerialMouse.h b/Demos/Device/ClassDriver/VirtualSerialMouse/VirtualSerialMouse.h
index bee1b0435066725d514f42f17cda2cdf452cd54d..79cacce78ace6593a081f4912051b71b6c4d8195 100644
--- a/Demos/Device/ClassDriver/VirtualSerialMouse/VirtualSerialMouse.h
+++ b/Demos/Device/ClassDriver/VirtualSerialMouse/VirtualSerialMouse.h
@@ -30,11 +30,11 @@
 
 /** \file
  *
- *  Header file for CDCMouse.c.
+ *  Header file for VirtualSerialMouse.c.
  */
 
-#ifndef _CDC_MOUSE_H_
-#define _CDC_MOUSE_H_
+#ifndef _VIRTUALSERIAL_MOUSE_H_
+#define _VIRTUALSERIAL_MOUSE_H_
 
 	/* Includes: */
 		#include <avr/io.h>
diff --git a/Demos/Device/LowLevel/DualVirtualSerial/DualVirtualSerial.c b/Demos/Device/LowLevel/DualVirtualSerial/DualVirtualSerial.c
index 8b1da03486db1854cf458b44960ea53fbe397596..2993b90cae97b0cf71e4c43e0d66fa6a82286ff8 100644
--- a/Demos/Device/LowLevel/DualVirtualSerial/DualVirtualSerial.c
+++ b/Demos/Device/LowLevel/DualVirtualSerial/DualVirtualSerial.c
@@ -30,11 +30,11 @@
 
 /** \file
  *
- *  Main source file for the DualCDC demo. This file contains the main tasks of the demo and
+ *  Main source file for the DualVirtualSerial demo. This file contains the main tasks of the demo and
  *  is responsible for the initial application hardware configuration.
  */
  
-#include "DualCDC.h"
+#include "DualVirtualSerial.h"
 
 /** Contains the current baud rate and other settings of the first virtual serial port. While this demo does not use
  *  the physical USART and thus does not use these settings, they must still be retained and returned to the host
diff --git a/Demos/Device/LowLevel/DualVirtualSerial/DualVirtualSerial.h b/Demos/Device/LowLevel/DualVirtualSerial/DualVirtualSerial.h
index b2085c452bb839671c778677df8187268b4ec233..55ab6b21471475f66955fd0dda4b1927ec11e43a 100644
--- a/Demos/Device/LowLevel/DualVirtualSerial/DualVirtualSerial.h
+++ b/Demos/Device/LowLevel/DualVirtualSerial/DualVirtualSerial.h
@@ -30,11 +30,11 @@
 
 /** \file
  *
- *  Header file for DualCDC.c.
+ *  Header file for DualVirtualSerial.c.
  */
 
-#ifndef _DUAL_CDC_H_
-#define _DUAL_CDC_H_
+#ifndef _DUAL_VIRTUALSERIAL_H_
+#define _DUAL_VIRTUALSERIAL_H_
 
 	/* Includes: */
 		#include <avr/io.h>
diff --git a/Demos/Device/LowLevel/VirtualSerial/VirtualSerial.c b/Demos/Device/LowLevel/VirtualSerial/VirtualSerial.c
index 444dc019d88951d1100f2426f042f3fabe6ddaf2..89413a41ad3e1652ef27aa2f0e26476509cdbf37 100644
--- a/Demos/Device/LowLevel/VirtualSerial/VirtualSerial.c
+++ b/Demos/Device/LowLevel/VirtualSerial/VirtualSerial.c
@@ -30,11 +30,11 @@
 
 /** \file
  *
- *  Main source file for the CDC demo. This file contains the main tasks of the demo and
+ *  Main source file for the VirtualSerial demo. This file contains the main tasks of the demo and
  *  is responsible for the initial application hardware configuration.
  */
 
-#include "CDC.h"
+#include "VirtualSerial.h"
 
 /** Contains the current baud rate and other settings of the virtual serial port. While this demo does not use
  *  the physical USART and thus does not use these settings, they must still be retained and returned to the host
diff --git a/Demos/Device/LowLevel/VirtualSerial/VirtualSerial.h b/Demos/Device/LowLevel/VirtualSerial/VirtualSerial.h
index 4a7b6b1586cece6ee661bd01175bb24263cb5a9e..d8abc1207663c5e306510874d72a55a99dafa149 100644
--- a/Demos/Device/LowLevel/VirtualSerial/VirtualSerial.h
+++ b/Demos/Device/LowLevel/VirtualSerial/VirtualSerial.h
@@ -30,11 +30,11 @@
 
 /** \file
  *
- *  Header file for CDC.c.
+ *  Header file for VirtualSerial.c.
  */
 
-#ifndef _CDC_H_
-#define _CDC_H_
+#ifndef _VIRTUALSERIAL_H_
+#define _VIRTUALSERIAL_H_
 
 	/* Includes: */
 		#include <avr/io.h>
diff --git a/Demos/Host/ClassDriver/VirtualSerialHost/VirtualSerialHost.c b/Demos/Host/ClassDriver/VirtualSerialHost/VirtualSerialHost.c
index 4b08f7d57cd3fca1c53f4b40e8b98587f8221d76..b3c114313b23bccae96063a0974cce6e339d9b48 100644
--- a/Demos/Host/ClassDriver/VirtualSerialHost/VirtualSerialHost.c
+++ b/Demos/Host/ClassDriver/VirtualSerialHost/VirtualSerialHost.c
@@ -30,11 +30,11 @@
 
 /** \file
  *
- *  Main source file for the CDCHost demo. This file contains the main tasks of
+ *  Main source file for the VirtualSerialHost demo. This file contains the main tasks of
  *  the demo and is responsible for the initial application hardware configuration.
  */
  
-#include "CDCHost.h"
+#include "VirtualSerialHost.h"
 
 /** LUFA CDC Class driver interface configuration and state information. This structure is
  *  passed to all CDC Class driver functions, so that multiple instances of the same class
diff --git a/Demos/Host/ClassDriver/VirtualSerialHost/VirtualSerialHost.h b/Demos/Host/ClassDriver/VirtualSerialHost/VirtualSerialHost.h
index d666b73d64df93ae39276ba3bcad281d949db98d..dbd85a1d07e5b1aefbdfc1cc6224b0fda8cc4638 100644
--- a/Demos/Host/ClassDriver/VirtualSerialHost/VirtualSerialHost.h
+++ b/Demos/Host/ClassDriver/VirtualSerialHost/VirtualSerialHost.h
@@ -30,11 +30,11 @@
 
 /** \file
  *
- *  Header file for CDCHost.c.
+ *  Header file for VirtualSerialHost.c.
  */
 
-#ifndef _CDC_HOST_H_
-#define _CDC_HOST_H_
+#ifndef _VIRTUALSERIAL_HOST_H_
+#define _VIRTUALSERIAL_HOST_H_
 
 	/* Includes: */
 		#include <avr/io.h>
diff --git a/Demos/Host/LowLevel/VirtualSerialHost/ConfigDescriptor.h b/Demos/Host/LowLevel/VirtualSerialHost/ConfigDescriptor.h
index 17aa83182093d0bd354ececd3a34e535dec74ab2..3a2b2b44466d7dcbd95966144058b728fcff8d73 100644
--- a/Demos/Host/LowLevel/VirtualSerialHost/ConfigDescriptor.h
+++ b/Demos/Host/LowLevel/VirtualSerialHost/ConfigDescriptor.h
@@ -37,9 +37,9 @@
 #define _CONFIGDESCRIPTOR_H_
 
 	/* Includes: */
-		#include <LUFA/Drivers/USB/USB.h>                        // USB Functionality
+		#include <LUFA/Drivers/USB/USB.h>
 		
-		#include "CDCHost.h"
+		#include "VirtualSerialHost.h"
 		
 	/* Macros: */
 		/** Interface Class value for the CDC class */
diff --git a/Demos/Host/LowLevel/VirtualSerialHost/VirtualSerialHost.c b/Demos/Host/LowLevel/VirtualSerialHost/VirtualSerialHost.c
index c4322587ec974df15a5918ecf79d24923ce2d39d..3aaaef3a8e646315552dbca8871a1d492838986e 100644
--- a/Demos/Host/LowLevel/VirtualSerialHost/VirtualSerialHost.c
+++ b/Demos/Host/LowLevel/VirtualSerialHost/VirtualSerialHost.c
@@ -30,11 +30,11 @@
 
 /** \file
  *
- *  Main source file for the CDCHost demo. This file contains the main tasks of
+ *  Main source file for the VirtualSerialHost demo. This file contains the main tasks of
  *  the demo and is responsible for the initial application hardware configuration.
  */
  
-#include "CDCHost.h"
+#include "VirtualSerialHost.h"
 
 #if 0
 /* NOTE: Here you can set up a standard stream using the created virtual serial port, so that the standard stream functions in
diff --git a/Demos/Host/LowLevel/VirtualSerialHost/VirtualSerialHost.h b/Demos/Host/LowLevel/VirtualSerialHost/VirtualSerialHost.h
index b6d3a3cd4b60e6b6c13d45579c4def4d7db0cb15..679fd99ecfd4c339beb59e6d2bb921167aae5bff 100644
--- a/Demos/Host/LowLevel/VirtualSerialHost/VirtualSerialHost.h
+++ b/Demos/Host/LowLevel/VirtualSerialHost/VirtualSerialHost.h
@@ -30,11 +30,11 @@
 
 /** \file
  *
- *  Header file for CDCHost.c.
+ *  Header file for VirtualSerialHost.c.
  */
 
-#ifndef _CDC_HOST_H_
-#define _CDC_HOST_H_
+#ifndef _VIRTUALSERIAL_HOST_H_
+#define _VIRTUALSERIAL_HOST_H_
 
 	/* Includes: */
 		#include <avr/io.h>