diff --git a/win32ss/user/consrv/coninput.c b/win32ss/user/consrv/coninput.c
index 4cf052b8e7f..ef13030056d 100644
--- a/win32ss/user/consrv/coninput.c
+++ b/win32ss/user/consrv/coninput.c
@@ -3,7 +3,8 @@
  * PROJECT:         ReactOS Console Server DLL
  * FILE:            win32ss/user/consrv/coninput.c
  * PURPOSE:         Console Input functions
- * PROGRAMMERS:     Hermes Belusca-Maito (hermes.belusca@sfr.fr)
+ * PROGRAMMERS:     Jeffrey Morlan
+ *                  Hermes Belusca-Maito (hermes.belusca@sfr.fr)
  */
 
 /* INCLUDES *******************************************************************/
diff --git a/win32ss/user/consrv/coninput.h b/win32ss/user/consrv/coninput.h
index effbcd3edc8..4f3efbac369 100644
--- a/win32ss/user/consrv/coninput.h
+++ b/win32ss/user/consrv/coninput.h
@@ -3,7 +3,8 @@
  * PROJECT:         ReactOS Console Server DLL
  * FILE:            win32ss/user/consrv/coninput.h
  * PURPOSE:         Console Input functions
- * PROGRAMMERS:     Hermes Belusca-Maito (hermes.belusca@sfr.fr)
+ * PROGRAMMERS:     Jeffrey Morlan
+ *                  Hermes Belusca-Maito (hermes.belusca@sfr.fr)
  */
 
 #pragma once
diff --git a/win32ss/user/consrv/conio.h b/win32ss/user/consrv/conio.h
index 421bf4941d9..ecef65c0741 100644
--- a/win32ss/user/consrv/conio.h
+++ b/win32ss/user/consrv/conio.h
@@ -9,6 +9,7 @@
 #pragma once
 
 /* Macros used to call functions in the FRONTEND_VTBL virtual table */
+
 #define ConioDrawRegion(Console, Region) (Console)->TermIFace.Vtbl->DrawRegion((Console), (Region))
 #define ConioWriteStream(Console, Block, CurStartX, CurStartY, ScrolledLines, Buffer, Length) \
           (Console)->TermIFace.Vtbl->WriteStream((Console), (Block), (CurStartX), (CurStartY), \
diff --git a/win32ss/user/consrv/conoutput.c b/win32ss/user/consrv/conoutput.c
index 6bd00ca7097..088d9af6c36 100644
--- a/win32ss/user/consrv/conoutput.c
+++ b/win32ss/user/consrv/conoutput.c
@@ -3,7 +3,8 @@
  * PROJECT:         ReactOS Console Server DLL
  * FILE:            win32ss/user/consrv/conoutput.c
  * PURPOSE:         Console Output functions
- * PROGRAMMERS:     Hermes Belusca-Maito (hermes.belusca@sfr.fr)
+ * PROGRAMMERS:     Jeffrey Morlan
+ *                  Hermes Belusca-Maito (hermes.belusca@sfr.fr)
  */
 
 /* INCLUDES *******************************************************************/
diff --git a/win32ss/user/consrv/conoutput.h b/win32ss/user/consrv/conoutput.h
index c117d2c2755..6a903d5fa65 100644
--- a/win32ss/user/consrv/conoutput.h
+++ b/win32ss/user/consrv/conoutput.h
@@ -3,7 +3,8 @@
  * PROJECT:         ReactOS Console Server DLL
  * FILE:            win32ss/user/consrv/conoutput.h
  * PURPOSE:         Console Output functions
- * PROGRAMMERS:     Hermes Belusca-Maito (hermes.belusca@sfr.fr)
+ * PROGRAMMERS:     Jeffrey Morlan
+ *                  Hermes Belusca-Maito (hermes.belusca@sfr.fr)
  */
 
 #pragma once
diff --git a/win32ss/user/consrv/console.c b/win32ss/user/consrv/console.c
index 881b430413f..33f3a1dcf8d 100644
--- a/win32ss/user/consrv/console.c
+++ b/win32ss/user/consrv/console.c
@@ -3,7 +3,9 @@
  * PROJECT:         ReactOS Console Server DLL
  * FILE:            win32ss/user/consrv/console.c
  * PURPOSE:         Console Management Functions
- * PROGRAMMERS:     Hermes Belusca-Maito (hermes.belusca@sfr.fr)
+ * PROGRAMMERS:     Gé van Geldorp
+ *                  Jeffrey Morlan
+ *                  Hermes Belusca-Maito (hermes.belusca@sfr.fr)
  */
 
 /* INCLUDES *******************************************************************/
diff --git a/win32ss/user/consrv/frontends/gui/guisettings.c b/win32ss/user/consrv/frontends/gui/guisettings.c
index 449eadaa6d3..0a4cf44c728 100644
--- a/win32ss/user/consrv/frontends/gui/guisettings.c
+++ b/win32ss/user/consrv/frontends/gui/guisettings.c
@@ -3,7 +3,8 @@
  * PROJECT:         ReactOS Console Server DLL
  * FILE:            win32ss/user/consrv/frontends/gui/guisettings.c
  * PURPOSE:         GUI Terminal Front-End Settings Management
- * PROGRAMMERS:     Hermes Belusca-Maito (hermes.belusca@sfr.fr)
+ * PROGRAMMERS:     Johannes Anderwald
+ *                  Hermes Belusca-Maito (hermes.belusca@sfr.fr)
  */
 
 /* INCLUDES *******************************************************************/
diff --git a/win32ss/user/consrv/frontends/gui/guisettings.h b/win32ss/user/consrv/frontends/gui/guisettings.h
index db890abda26..1ec60bae819 100644
--- a/win32ss/user/consrv/frontends/gui/guisettings.h
+++ b/win32ss/user/consrv/frontends/gui/guisettings.h
@@ -3,7 +3,8 @@
  * PROJECT:         ReactOS Console Server DLL
  * FILE:            win32ss/user/consrv/guisettings.h
  * PURPOSE:         GUI front-end settings management
- * PROGRAMMERS:     Hermes Belusca-Maito (hermes.belusca@sfr.fr)
+ * PROGRAMMERS:     Johannes Anderwald
+ *                  Hermes Belusca-Maito (hermes.belusca@sfr.fr)
  *
  * NOTE: Also used by console.dll
  */
diff --git a/win32ss/user/consrv/frontends/gui/guiterm.c b/win32ss/user/consrv/frontends/gui/guiterm.c
index 98ae18cb7da..f1eea6372a3 100644
--- a/win32ss/user/consrv/frontends/gui/guiterm.c
+++ b/win32ss/user/consrv/frontends/gui/guiterm.c
@@ -3,7 +3,10 @@
  * PROJECT:         ReactOS Console Server DLL
  * FILE:            win32ss/user/consrv/frontends/gui/guiterm.c
  * PURPOSE:         GUI Terminal Front-End
- * PROGRAMMERS:     Hermes Belusca-Maito (hermes.belusca@sfr.fr)
+ * PROGRAMMERS:     Gé van Geldorp
+ *                  Johannes Anderwald
+ *                  Jeffrey Morlan
+ *                  Hermes Belusca-Maito (hermes.belusca@sfr.fr)
  */
 
 /* INCLUDES *******************************************************************/
diff --git a/win32ss/user/consrv/frontends/gui/guiterm.h b/win32ss/user/consrv/frontends/gui/guiterm.h
index 14530f1c72d..585f241797a 100644
--- a/win32ss/user/consrv/frontends/gui/guiterm.h
+++ b/win32ss/user/consrv/frontends/gui/guiterm.h
@@ -3,7 +3,10 @@
  * PROJECT:         ReactOS Console Server DLL
  * FILE:            win32ss/user/consrv/frontends/gui/guiterm.h
  * PURPOSE:         GUI Terminal Front-End
- * PROGRAMMERS:     Hermes Belusca-Maito (hermes.belusca@sfr.fr)
+ * PROGRAMMERS:     Gé van Geldorp
+ *                  Johannes Anderwald
+ *                  Jeffrey Morlan
+ *                  Hermes Belusca-Maito (hermes.belusca@sfr.fr)
  */
 
 #pragma once
diff --git a/win32ss/user/consrv/frontends/tui/tuiterm.c b/win32ss/user/consrv/frontends/tui/tuiterm.c
index eb944a41fd1..c1d870ccc6d 100644
--- a/win32ss/user/consrv/frontends/tui/tuiterm.c
+++ b/win32ss/user/consrv/frontends/tui/tuiterm.c
@@ -3,7 +3,10 @@
  * PROJECT:         ReactOS Console Server DLL
  * FILE:            win32ss/user/consrv/frontends/tui/tuiterm.c
  * PURPOSE:         TUI Terminal Front-End
- * PROGRAMMERS:     Hermes Belusca-Maito (hermes.belusca@sfr.fr)
+ * PROGRAMMERS:     David Welch
+ *                  Gé van Geldorp
+ *                  Jeffrey Morlan
+ *                  Hermes Belusca-Maito (hermes.belusca@sfr.fr)
  */
 
 #ifdef TUI_CONSOLE
diff --git a/win32ss/user/consrv/frontends/tui/tuiterm.h b/win32ss/user/consrv/frontends/tui/tuiterm.h
index 592e36cce74..8a4efa91b8a 100644
--- a/win32ss/user/consrv/frontends/tui/tuiterm.h
+++ b/win32ss/user/consrv/frontends/tui/tuiterm.h
@@ -3,7 +3,10 @@
  * PROJECT:         ReactOS Console Server DLL
  * FILE:            win32ss/user/consrv/frontends/tui/tuiterm.h
  * PURPOSE:         TUI Terminal Front-End
- * PROGRAMMERS:     Hermes Belusca-Maito (hermes.belusca@sfr.fr)
+ * PROGRAMMERS:     David Welch
+ *                  Gé van Geldorp
+ *                  Jeffrey Morlan
+ *                  Hermes Belusca-Maito (hermes.belusca@sfr.fr)
  */
 
 #include "conio.h"
diff --git a/win32ss/user/consrv/handle.c b/win32ss/user/consrv/handle.c
index e949633d6f7..f71560a6498 100644
--- a/win32ss/user/consrv/handle.c
+++ b/win32ss/user/consrv/handle.c
@@ -3,7 +3,9 @@
  * PROJECT:         ReactOS Console Server DLL
  * FILE:            win32ss/user/consrv/handle.c
  * PURPOSE:         Console I/O Handles functions
- * PROGRAMMERS:     Hermes Belusca-Maito (hermes.belusca@sfr.fr)
+ * PROGRAMMERS:     David Welch
+ *                  Jeffrey Morlan
+ *                  Hermes Belusca-Maito (hermes.belusca@sfr.fr)
  */
 
 /* INCLUDES *******************************************************************/
diff --git a/win32ss/user/consrv/handle.h b/win32ss/user/consrv/handle.h
index 85167cadedf..ced96486883 100644
--- a/win32ss/user/consrv/handle.h
+++ b/win32ss/user/consrv/handle.h
@@ -3,7 +3,9 @@
  * PROJECT:         ReactOS Console Server DLL
  * FILE:            win32ss/user/consrv/handle.h
  * PURPOSE:         Console I/O Handles functions
- * PROGRAMMERS:     Hermes Belusca-Maito (hermes.belusca@sfr.fr)
+ * PROGRAMMERS:     David Welch
+ *                  Jeffrey Morlan
+ *                  Hermes Belusca-Maito (hermes.belusca@sfr.fr)
  */
 
 #pragma once
diff --git a/win32ss/user/consrv/include/conio.h b/win32ss/user/consrv/include/conio.h
index 415bc5506d4..fc41d94002e 100644
--- a/win32ss/user/consrv/include/conio.h
+++ b/win32ss/user/consrv/include/conio.h
@@ -3,7 +3,9 @@
  * PROJECT:         ReactOS Console Server DLL
  * FILE:            win32ss/user/consrv/include/conio.h
  * PURPOSE:         Public Console I/O Interface
- * PROGRAMMERS:     Hermes Belusca-Maito (hermes.belusca@sfr.fr)
+ * PROGRAMMERS:     Gé van Geldorp
+ *                  Jeffrey Morlan
+ *                  Hermes Belusca-Maito (hermes.belusca@sfr.fr)
  */
 
 #pragma once
diff --git a/win32ss/user/consrv/include/settings.h b/win32ss/user/consrv/include/settings.h
index 909b828f9eb..fa324a2eb74 100644
--- a/win32ss/user/consrv/include/settings.h
+++ b/win32ss/user/consrv/include/settings.h
@@ -3,9 +3,8 @@
  * PROJECT:         ReactOS Console Server DLL
  * FILE:            win32ss/user/consrv/include/settings.h
  * PURPOSE:         Public Console Settings Management Interface
- * PROGRAMMERS:     Hermes Belusca-Maito (hermes.belusca@sfr.fr)
- *
- * NOTE: Adapted from existing code.
+ * PROGRAMMERS:     Johannes Anderwald
+ *                  Hermes Belusca-Maito (hermes.belusca@sfr.fr)
  */
 
 #pragma once
diff --git a/win32ss/user/consrv/settings.c b/win32ss/user/consrv/settings.c
index fa98cbc012b..4dea69bf1a7 100644
--- a/win32ss/user/consrv/settings.c
+++ b/win32ss/user/consrv/settings.c
@@ -3,9 +3,8 @@
  * PROJECT:         ReactOS Console Server DLL
  * FILE:            win32ss/user/consrv/settings.c
  * PURPOSE:         Console settings management
- * PROGRAMMERS:     Hermes Belusca-Maito (hermes.belusca@sfr.fr)
- *
- * NOTE: Adapted from existing code.
+ * PROGRAMMERS:     Johannes Anderwald
+ *                  Hermes Belusca-Maito (hermes.belusca@sfr.fr)
  */
 
 /* INCLUDES *******************************************************************/