diff --git a/Demos/Device/ClassDriver/MassStorage/Lib/DataflashManager.h b/Demos/Device/ClassDriver/MassStorage/Lib/DataflashManager.h
index fba76a8b9831ce3319967381116857f7b518cc73..cad3ea160ad2dd0c179336e2eadc89359a84be7c 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 cb8c42d6fc3cd651e8ce59d8961151b0e4890362..ec92ef182a84f890f8bfeacd4a0d76b983119b1d 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 368837598deb80c35f8cdde0f22dd5e35cf07cce..92a0a8add34f7a5d5fb2ea59961a81486dd70014 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 ca5def27eb5bda2c2ff0a7d3746a3fd892d2f422..c7e64a5ebb518e92d4d89d9673dd236ddb6e83e0 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 687671dc5e3647009ab7b3a87df58f2b17204b5c..75311074c16e72e925079dad4686f1376cd21be8 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 bc900a383dd6d9450bcb2bb2d7e2051eafccce27..8afe2464f964427f8d3ee9d014a4531606ea1e7c 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 d3ea0ff50f222677b44819e5cd4e349b81f92d34..9983d20ee647b1a723853e4100908988d49e5592 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 24881556b2013ecb17b54f2fe613d67be11ae99a..57a1393fec949bdc57651aa7f8be72c054760105 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>