6 files changed, 6 insertions, 5 deletions
diff --git a/LUFA/ChangeLog.txt b/LUFA/ChangeLog.txt
index 760aec241..115a04a12 100644
--- a/LUFA/ChangeLog.txt
+++ b/LUFA/ChangeLog.txt
@@ -47,7 +47,7 @@
   *  - Updated library doxygen documentation, added groups, changed documentation macro functions to real functions for clarity
   *  - Removed old endpoint and pipe aliased read/write/discard routines which did not have an explicit endian specifier for clarity
   *  - Removed the ButtLoadTag.h header file, as no one used for its intended purpose anyway
-  *  - Renamed the main Drivers/AT90USBXXX directory to Drivers/Peripheral
+  *  - Renamed the main Drivers/AT90USBXXX directory to Drivers/Peripheral, renamed the Serial_Stream driver to SerialStream
   *    
   *
   *  \section Sec_ChangeLog090401 Version 090401
diff --git a/LUFA/Common/Common.h b/LUFA/Common/Common.h
index 0923d513b..24ba1f68b 100644
--- a/LUFA/Common/Common.h
+++ b/LUFA/Common/Common.h
@@ -103,7 +103,7 @@
 			#define JTAG_DEBUG_ASSERT(x)    MACROS{ if (!(x)) { JTAG_DEBUG_BREAK(); } }MACROE
 
 			/** Macro for testing condition "x" and writing debug data to the serial stream if false. As a
-			 *  prerequisite for this macro, the serial stream should be configured via the Serial_Stream driver.
+			 *  prerequisite for this macro, the serial stream should be configured via the Peripheral/SerialStream driver.
 			 *
 			 *  The serial output takes the form "{FILENAME}: Function {FUNCTION NAME}, Line {LINE NUMBER}: Assertion
 			 *  {x} failed."
diff --git a/LUFA/Drivers/Peripheral/Serial_Stream.c b/LUFA/Drivers/Peripheral/SerialStream.c
index d986af424..fec5f7314 100644
--- a/LUFA/Drivers/Peripheral/Serial_Stream.c
+++ b/LUFA/Drivers/Peripheral/SerialStream.c
@@ -28,7 +28,7 @@
   this software.
 */
 
-#include "Serial_Stream.h"
+#include "SerialStream.h"
 
 FILE USARTStream = FDEV_SETUP_STREAM(SerialStream_TxByte, SerialStream_RxByte, _FDEV_SETUP_RW);
 
diff --git a/LUFA/Drivers/Peripheral/Serial_Stream.h b/LUFA/Drivers/Peripheral/SerialStream.h
index 406cbed88..394fd081d 100644
--- a/LUFA/Drivers/Peripheral/Serial_Stream.h
+++ b/LUFA/Drivers/Peripheral/SerialStream.h
@@ -36,7 +36,7 @@
  **/
 
 /** \ingroup Group_SubsystemDrivers
- *  @defgroup Group_SerialStream Serial Stream Driver - LUFA/Drivers/Peripheral/Serial_Stream.h
+ *  @defgroup Group_SerialStream Serial Stream Driver - LUFA/Drivers/Peripheral/SerialStream.h
  *
  *  Functions, macros, variables, enums and types related to the setup of a serial stream, so that standard printf and other
  *  C stream functions can be used on the serial port.
diff --git a/LUFA/MigrationInformation.txt b/LUFA/MigrationInformation.txt
index 8b8e416f5..f0930a55e 100644
--- a/LUFA/MigrationInformation.txt
+++ b/LUFA/MigrationInformation.txt
@@ -16,6 +16,7 @@
  *    - The ButtLoadTag.h header has been removed, as it was never used for its intended purpose. Projects should either remove all
  *      BUTTLOADTAG elements, or download and extract ButtLoadTag.h header from the ButtLoad project.
  *    - The Drivers/AT90USBXXX directory has been renamed to Drivers/Peripheral.
+ *    - The Serial_Stream driver has been renamed to SerialStream to remain consistent with the rest of the library naming scheme.
  *
  *  <b>Library Demos</b>
  *    - Most demos, bootloaders and applications have had significant changes from previous versions. Applications built off of any
diff --git a/LUFA/makefile b/LUFA/makefile
index 25f7b3787..3e1ce85b7 100644
--- a/LUFA/makefile
+++ b/LUFA/makefile
@@ -24,7 +24,7 @@ LUFA_SRC_FILES =     ./Drivers/USB/LowLevel/LowLevel.c           \
                      ./MemoryAllocator/DynAlloc.c                \
                      ./Drivers/Board/Temperature.c               \
                      ./Drivers/Peripheral/Serial.c               \
-                     ./Drivers/Peripheral/Serial_Stream.c        \
+                     ./Drivers/Peripheral/SerialStream.c         \
 
 all: