diff --git a/Demos/Device/ClassDriver/MassStorage/Lib/DataflashManager.h b/Demos/Device/ClassDriver/MassStorage/Lib/DataflashManager.h
index fba76a8b98..cad3ea160a 100644
--- a/Demos/Device/ClassDriver/MassStorage/Lib/DataflashManager.h
+++ b/Demos/Device/ClassDriver/MassStorage/Lib/DataflashManager.h
@@ -33,8 +33,8 @@
  *  Header file for DataflashManager.c.
  */
  
-#ifndef _DATAFLASH_MANAGER_H
-#define _DATAFLASH_MANAGER_H
+#ifndef _DATAFLASH_MANAGER_H_
+#define _DATAFLASH_MANAGER_H_
 
 	/* Includes: */
 		#include <avr/io.h>
diff --git a/Demos/Device/ClassDriver/MassStorageKeyboard/Lib/DataflashManager.h b/Demos/Device/ClassDriver/MassStorageKeyboard/Lib/DataflashManager.h
index cb8c42d6fc..ec92ef182a 100644
--- a/Demos/Device/ClassDriver/MassStorageKeyboard/Lib/DataflashManager.h
+++ b/Demos/Device/ClassDriver/MassStorageKeyboard/Lib/DataflashManager.h
@@ -33,8 +33,8 @@
  *  Header file for DataflashManager.c.
  */
  
-#ifndef _DATAFLASH_MANAGER_H
-#define _DATAFLASH_MANAGER_H
+#ifndef _DATAFLASH_MANAGER_H_
+#define _DATAFLASH_MANAGER_H_
 
 	/* Includes: */
 		#include <avr/io.h>
diff --git a/Demos/Device/LowLevel/MassStorage/Lib/DataflashManager.h b/Demos/Device/LowLevel/MassStorage/Lib/DataflashManager.h
index 368837598d..92a0a8add3 100644
--- a/Demos/Device/LowLevel/MassStorage/Lib/DataflashManager.h
+++ b/Demos/Device/LowLevel/MassStorage/Lib/DataflashManager.h
@@ -33,8 +33,8 @@
  *  Header file for DataflashManager.c.
  */
  
-#ifndef _DATAFLASH_MANAGER_H
-#define _DATAFLASH_MANAGER_H
+#ifndef _DATAFLASH_MANAGER_H_
+#define _DATAFLASH_MANAGER_H_
 
 	/* Includes: */
 		#include <avr/io.h>
diff --git a/Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.c b/Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.c
index ca5def27eb..c7e64a5ebb 100644
--- a/Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.c
+++ b/Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.c
@@ -143,9 +143,9 @@ bool TINYNVM_ReadMemory(const uint16_t ReadAddress, uint8_t* ReadBuffer, uint16_
 
 /** Writes word addressed memory to the target's memory spaces.
  *
- *  \param[in]  WriteAddress  Start address to write to within the target's address space
- *  \param[in]  WriteBuffer   Buffer to source data from
- *  \param[in]  WriteLength   Total number of bytes to write to the device (must be an integer multiple of 2)
+ *  \param[in] WriteAddress  Start address to write to within the target's address space
+ *  \param[in] WriteBuffer   Buffer to source data from
+ *  \param[in] WriteLength   Total number of bytes to write to the device (must be an integer multiple of 2)
  *
  *  \return Boolean true if the command sequence complete successfully
  */
@@ -189,7 +189,8 @@ bool TINYNVM_WriteMemory(const uint16_t WriteAddress, uint8_t* WriteBuffer, uint
 
 /** Erases the target's memory space.
  *
- *  \param[in] Address  Address inside the memory space to erase
+ *  \param[in] EraseCommand  NVM erase command to send to the device
+ *  \param[in] Address       Address inside the memory space to erase
  *
  *  \return Boolean true if the command sequence complete successfully
  */
diff --git a/Projects/Incomplete/StandaloneProgrammer/Lib/DataflashManager.h b/Projects/Incomplete/StandaloneProgrammer/Lib/DataflashManager.h
index 687671dc5e..75311074c1 100644
--- a/Projects/Incomplete/StandaloneProgrammer/Lib/DataflashManager.h
+++ b/Projects/Incomplete/StandaloneProgrammer/Lib/DataflashManager.h
@@ -33,8 +33,8 @@
  *  Header file for DataflashManager.c.
  */
  
-#ifndef _DATAFLASH_MANAGER_H
-#define _DATAFLASH_MANAGER_H
+#ifndef _DATAFLASH_MANAGER_H_
+#define _DATAFLASH_MANAGER_H_
 
 	/* Includes: */
 		#include <avr/io.h>
diff --git a/Projects/TemperatureDataLogger/Lib/DataflashManager.h b/Projects/TemperatureDataLogger/Lib/DataflashManager.h
index bc900a383d..8afe2464f9 100644
--- a/Projects/TemperatureDataLogger/Lib/DataflashManager.h
+++ b/Projects/TemperatureDataLogger/Lib/DataflashManager.h
@@ -33,8 +33,8 @@
  *  Header file for DataflashManager.c.
  */
  
-#ifndef _DATAFLASH_MANAGER_H
-#define _DATAFLASH_MANAGER_H
+#ifndef _DATAFLASH_MANAGER_H_
+#define _DATAFLASH_MANAGER_H_
 
 	/* Includes: */
 		#include <avr/io.h>
diff --git a/Projects/Webserver/Lib/DataflashManager.h b/Projects/Webserver/Lib/DataflashManager.h
index d3ea0ff50f..9983d20ee6 100644
--- a/Projects/Webserver/Lib/DataflashManager.h
+++ b/Projects/Webserver/Lib/DataflashManager.h
@@ -33,8 +33,8 @@
  *  Header file for DataflashManager.c.
  */
  
-#ifndef _DATAFLASH_MANAGER_H
-#define _DATAFLASH_MANAGER_H
+#ifndef _DATAFLASH_MANAGER_H_
+#define _DATAFLASH_MANAGER_H_
 
 	/* Includes: */
 		#include <avr/io.h>
diff --git a/Projects/Webserver/Lib/uIPManagement.h b/Projects/Webserver/Lib/uIPManagement.h
index 24881556b2..57a1393fec 100644
--- a/Projects/Webserver/Lib/uIPManagement.h
+++ b/Projects/Webserver/Lib/uIPManagement.h
@@ -33,8 +33,8 @@
  *  Header file for uIPManagement.c.
  */
 
-#ifndef _UIPMANAGEMENT_H_
-#define _UIPMANAGEMENT_H_
+#ifndef _UIP_MANAGEMENT_H_
+#define _UIP_MANAGEMENT_H_
 
 	/* Includes: */
 		#include <LUFA/Drivers/USB/Class/RNDIS.h>