diff --git a/memory/atom.c b/memory/atom.c
index 736b6d3..ad82e22 100644
--- a/memory/atom.c
+++ b/memory/atom.c
@@ -437,7 +437,7 @@
 
 
 /***********************************************************************
- *           GlobalAddAtomA   (USER.268)
+ *           GlobalAddAtom    (USER.268)
  *           GlobalAddAtomA   (KERNEL32.@)
  *
  * Adds a character string to the global atom table and returns a unique
@@ -584,7 +584,7 @@
 
 
 /***********************************************************************
- *           GlobalFindAtomA   (USER.270)
+ *           GlobalFindAtom    (USER.270)
  *           GlobalFindAtomA   (KERNEL32.@)
  *
  * Searches the atom table for the string and returns the atom
@@ -707,7 +707,7 @@
 
 
 /***********************************************************************
- *           GlobalGetAtomNameA   (USER.271)
+ *           GlobalGetAtomName    (USER.271)
  *           GlobalGetAtomNameA   (KERNEL32.@)
  *
  * Retrieves a copy of the string associated with an atom.
diff --git a/memory/codepage.c b/memory/codepage.c
index ce38f34..962ffbc 100644
--- a/memory/codepage.c
+++ b/memory/codepage.c
@@ -131,6 +131,7 @@
 
 /***********************************************************************
  *           IsDBCSLeadByte   (KERNEL32.@)
+ *           IsDBCSLeadByte   (KERNEL.207)
  */
 BOOL WINAPI IsDBCSLeadByte( BYTE testchar )
 {
diff --git a/memory/environ.c b/memory/environ.c
index 82de436..6f47906 100644
--- a/memory/environ.c
+++ b/memory/environ.c
@@ -225,7 +225,7 @@
 
 
 /***********************************************************************
- *           GetEnvironmentStringsA   (KERNEL32.@)
+ *           GetEnvironmentStrings    (KERNEL32.@)
  *           GetEnvironmentStringsA   (KERNEL32.@)
  */
 LPSTR WINAPI GetEnvironmentStringsA(void)
@@ -487,7 +487,8 @@
 
 
 /***********************************************************************
- *           GetDOSEnvironment16   (KERNEL.131)
+ *           GetDOSEnvironment     (KERNEL.131)
+ *           GetDOSEnvironment16   (KERNEL32.@)
  */
 SEGPTR WINAPI GetDOSEnvironment16(void)
 {
diff --git a/memory/global.c b/memory/global.c
index 837a7e2..a861e77 100644
--- a/memory/global.c
+++ b/memory/global.c
@@ -233,7 +233,8 @@
 }
 
 /***********************************************************************
- *           GlobalAlloc16   (KERNEL.15)
+ *           GlobalAlloc     (KERNEL.15)
+ *           GlobalAlloc16   (KERNEL32.24)
  * RETURNS
  *	Handle: Success
  *	NULL: Failure
@@ -251,7 +252,8 @@
 
 
 /***********************************************************************
- *           GlobalReAlloc16   (KERNEL.16)
+ *           GlobalReAlloc     (KERNEL.16)
+ *           GlobalReAlloc16   (KERNEL32.@)
  * RETURNS
  *	Handle: Success
  *	NULL: Failure
@@ -365,7 +367,8 @@
 
 
 /***********************************************************************
- *           GlobalFree16   (KERNEL.17)
+ *           GlobalFree     (KERNEL.17)
+ *           GlobalFree16   (KERNEL32.31)
  * RETURNS
  *	NULL: Success
  *	Handle: Failure
@@ -418,7 +421,6 @@
 
 
 /**********************************************************************
- *           K32WOWGlobalLock16         (WOW32.11)
  *           K32WOWGlobalLock16         (KERNEL32.60)
  */
 SEGPTR WINAPI K32WOWGlobalLock16( HGLOBAL16 hMem )
@@ -428,7 +430,7 @@
 
 
 /***********************************************************************
- *           GlobalLock16   (KERNEL.18)
+ *           GlobalLock16   (KERNEL32.25)
  *
  * This is the GlobalLock16() function used by 32-bit code.
  * 
@@ -448,7 +450,8 @@
 
 
 /***********************************************************************
- *           GlobalUnlock16   (KERNEL.19)
+ *           GlobalUnlock     (KERNEL.19)
+ *           GlobalUnlock16   (KERNEL32.26)
  * NOTES
  *	Should the return values be cast to booleans?
  *
@@ -488,7 +491,8 @@
 }
 
 /***********************************************************************
- *           GlobalSize16   (KERNEL.20)
+ *           GlobalSize     (KERNEL.20)
+ *           GlobalSize16   (KERNEL32.32)
  * RETURNS
  *	Size in bytes of object
  *	0: Failure
@@ -539,7 +543,8 @@
 
 
 /***********************************************************************
- *           GlobalFlags16   (KERNEL.22)
+ *           GlobalFlags     (KERNEL.22)
+ *           GlobalFlags16   (KERNEL32.@)
  * NOTES
  *	Should this return GMEM_INVALID_HANDLE instead of 0 on invalid
  *	handle?
@@ -624,7 +629,8 @@
 
 
 /***********************************************************************
- *           GlobalWire16   (KERNEL.111)
+ *           GlobalWire     (KERNEL.111)
+ *           GlobalWire16   (KERNEL32.29)
  */
 SEGPTR WINAPI GlobalWire16( HGLOBAL16 handle )
 {
@@ -633,7 +639,8 @@
 
 
 /***********************************************************************
- *           GlobalUnWire16   (KERNEL.112)
+ *           GlobalUnWire     (KERNEL.112)
+ *           GlobalUnWire16   (KERNEL32.30)
  */
 BOOL16 WINAPI GlobalUnWire16( HGLOBAL16 handle )
 {
@@ -733,6 +740,7 @@
 
 /***********************************************************************
  *           GlobalPageLock   (KERNEL.191)
+ *           GlobalSmartPageLock(KERNEL.230)
  */
 WORD WINAPI GlobalPageLock16( HGLOBAL16 handle )
 {
@@ -747,6 +755,7 @@
 
 /***********************************************************************
  *           GlobalPageUnlock   (KERNEL.192)
+ *           GlobalSmartPageUnlock(KERNEL.231)
  */
 WORD WINAPI GlobalPageUnlock16( HGLOBAL16 handle )
 {
@@ -760,7 +769,8 @@
 
 
 /***********************************************************************
- *           GlobalFix16   (KERNEL.197)
+ *           GlobalFix     (KERNEL.197)
+ *           GlobalFix16   (KERNEL32.27)
  */
 WORD WINAPI GlobalFix16( HGLOBAL16 handle )
 {
@@ -776,7 +786,8 @@
 
 
 /***********************************************************************
- *           GlobalUnfix16   (KERNEL.198)
+ *           GlobalUnfix     (KERNEL.198)
+ *           GlobalUnfix16   (KERNEL32.28)
  */
 void WINAPI GlobalUnfix16( HGLOBAL16 handle )
 {
@@ -1548,6 +1559,7 @@
 
 /***********************************************************************
  *           A20Proc   (KERNEL.165)
+ *           A20_Proc  (SYSTEM.20)
  */
 void WINAPI A20Proc16( WORD unused )
 {
diff --git a/memory/heap.c b/memory/heap.c
index 2623b35..8e0015a 100644
--- a/memory/heap.c
+++ b/memory/heap.c
@@ -897,6 +897,7 @@
 
 /***********************************************************************
  *           MapLS   (KERNEL32.@)
+ *           MapLS   (KERNEL.358)
  *
  * Maps linear pointer to segmented.
  */
@@ -925,6 +926,7 @@
 
 /***********************************************************************
  *           UnMapLS   (KERNEL32.@)
+ *           UnMapLS   (KERNEL.359)
  *
  * Free mapped selector.
  */
diff --git a/memory/selector.c b/memory/selector.c
index 40d4c7f..144fc14 100644
--- a/memory/selector.c
+++ b/memory/selector.c
@@ -234,6 +234,7 @@
 
 /***********************************************************************
  *           AllocCStoDSAlias   (KERNEL.170)
+ *           AllocAlias         (KERNEL.172)
  */
 WORD WINAPI AllocCStoDSAlias16( WORD sel )
 {
@@ -518,6 +519,7 @@
 
 /***********************************************************************
  *           MapSL   (KERNEL32.@)
+ *           MapSL   (KERNEL.357)
  *
  * Maps fixed segmented pointer to linear.
  */
diff --git a/memory/string.c b/memory/string.c
index af3b614..7f98057 100644
--- a/memory/string.c
+++ b/memory/string.c
@@ -49,6 +49,7 @@
 
 
 /***********************************************************************
+ *           lstrcat    (KERNEL32.@)
  *           lstrcatA   (KERNEL32.@)
  */
 LPSTR WINAPI lstrcatA( LPSTR dst, LPCSTR src )
@@ -102,7 +103,8 @@
 
 
 /***********************************************************************
- *           lstrcmpA   (KERNEL.602)
+ *           lstrcmp    (KERNEL32.@)
+ *           lstrcmpA   (KERNEL32.@)
  */
 INT WINAPI lstrcmpA( LPCSTR str1, LPCSTR str2 )
 {
@@ -111,7 +113,7 @@
 
 
 /***********************************************************************
- *           lstrcmpW   (KERNEL.603)
+ *           lstrcmpW   (KERNEL32.@)
  * FIXME : should call CompareStringW, when it is implemented.
  *    This implementation is not "word sort", as it should.
  */
@@ -162,6 +164,7 @@
 
 
 /***********************************************************************
+ *           lstrcpy    (KERNEL32.@)
  *           lstrcpyA   (KERNEL32.@)
  */
 LPSTR WINAPI lstrcpyA( LPSTR dst, LPCSTR src )
@@ -267,6 +270,7 @@
 
 
 /***********************************************************************
+ *           lstrlen    (KERNEL32.@)
  *           lstrlenA   (KERNEL32.@)
  */
 INT WINAPI lstrlenA( LPCSTR str )