Documentation name fixes.

diff --git a/objects/bitmap.c b/objects/bitmap.c
index f6734f2..6d341f3 100644
--- a/objects/bitmap.c
+++ b/objects/bitmap.c
@@ -55,7 +55,7 @@
 }
 
 /***********************************************************************
- *           CreateUserBitmap16    (GDI.407)
+ *           CreateUserBitmap    (GDI.407)
  */
 HBITMAP16 WINAPI CreateUserBitmap16( INT16 width, INT16 height, UINT16 planes,
                                      UINT16 bpp, LPCVOID bits )
@@ -64,7 +64,7 @@
 }
 
 /***********************************************************************
- *           CreateUserDiscardableBitmap16    (GDI.409)
+ *           CreateUserDiscardableBitmap    (GDI.409)
  */
 HBITMAP16 WINAPI CreateUserDiscardableBitmap16( WORD dummy, 
                                                 INT16 width, INT16 height )
@@ -77,7 +77,7 @@
 
 
 /***********************************************************************
- *           CreateBitmap16    (GDI.48)
+ *           CreateBitmap    (GDI.48)
  *           CreateBitmap16    (DISPLAY.48)
  */
 HBITMAP16 WINAPI CreateBitmap16( INT16 width, INT16 height, UINT16 planes,
@@ -149,7 +149,7 @@
 
 
 /***********************************************************************
- *           CreateCompatibleBitmap16    (GDI.51)
+ *           CreateCompatibleBitmap    (GDI.51)
  */
 HBITMAP16 WINAPI CreateCompatibleBitmap16(HDC16 hdc, INT16 width, INT16 height)
 {
@@ -195,7 +195,7 @@
 
 
 /***********************************************************************
- *           CreateBitmapIndirect16    (GDI.49)
+ *           CreateBitmapIndirect    (GDI.49)
  */
 HBITMAP16 WINAPI CreateBitmapIndirect16( const BITMAP16 * bmp )
 {
@@ -220,7 +220,7 @@
 
 
 /***********************************************************************
- *           GetBitmapBits16    (GDI.74)
+ *           GetBitmapBits    (GDI.74)
  */
 LONG WINAPI GetBitmapBits16( HBITMAP16 hbitmap, LONG count, LPVOID buffer )
 {
@@ -301,7 +301,7 @@
 
 
 /***********************************************************************
- *           SetBitmapBits16    (GDI.106)
+ *           SetBitmapBits    (GDI.106)
  */
 LONG WINAPI SetBitmapBits16( HBITMAP16 hbitmap, LONG count, LPCVOID buffer )
 {
@@ -486,7 +486,7 @@
     
 
 /***********************************************************************
- *           CreateDiscardableBitmap16    (GDI.156)
+ *           CreateDiscardableBitmap    (GDI.156)
  */
 HBITMAP16 WINAPI CreateDiscardableBitmap16( HDC16 hdc, INT16 width,
                                             INT16 height )
@@ -512,7 +512,7 @@
 
 
 /***********************************************************************
- *           GetBitmapDimensionEx16    (GDI.468)
+ *           GetBitmapDimensionEx    (GDI.468)
  *
  * NOTES
  *    Can this call GetBitmapDimensionEx?
@@ -559,7 +559,7 @@
 
 
 /***********************************************************************
- *           SetBitmapDimensionEx16    (GDI.478)
+ *           SetBitmapDimensionEx    (GDI.478)
  */
 BOOL16 WINAPI SetBitmapDimensionEx16( HBITMAP16 hbitmap, INT16 x, INT16 y,
                                       LPSIZE16 prevSize )
diff --git a/objects/brush.c b/objects/brush.c
index fef82fb..bc36fd6 100644
--- a/objects/brush.c
+++ b/objects/brush.c
@@ -99,7 +99,7 @@
 
 
 /***********************************************************************
- *           CreateBrushIndirect16    (GDI.50)
+ *           CreateBrushIndirect    (GDI.50)
  */
 HBRUSH16 WINAPI CreateBrushIndirect16( const LOGBRUSH16 * brush )
 {
@@ -154,7 +154,7 @@
 
 
 /***********************************************************************
- *           CreateHatchBrush16    (GDI.58)
+ *           CreateHatchBrush    (GDI.58)
  */
 HBRUSH16 WINAPI CreateHatchBrush16( INT16 style, COLORREF color )
 {
@@ -180,7 +180,7 @@
 
 
 /***********************************************************************
- *           CreatePatternBrush16    (GDI.60)
+ *           CreatePatternBrush    (GDI.60)
  */
 HBRUSH16 WINAPI CreatePatternBrush16( HBITMAP16 hbitmap )
 {
@@ -202,7 +202,7 @@
 
 
 /***********************************************************************
- *           CreateDIBPatternBrush16    (GDI.445)
+ *           CreateDIBPatternBrush    (GDI.445)
  */
 HBRUSH16 WINAPI CreateDIBPatternBrush16( HGLOBAL16 hbitmap, UINT16 coloruse )
 {
@@ -398,7 +398,7 @@
 
 
 /***********************************************************************
- *           SetSolidBrush16   (GDI.604)
+ *           SetSolidBrush   (GDI.604)
  *
  *  If hBrush is a solid brush, change its color to newColor.
  *
diff --git a/objects/clipping.c b/objects/clipping.c
index 4bd60dd..95c1187 100644
--- a/objects/clipping.c
+++ b/objects/clipping.c
@@ -41,7 +41,7 @@
 
 
 /***********************************************************************
- *           SelectClipRgn16    (GDI.44)
+ *           SelectClipRgn    (GDI.44)
  */
 INT16 WINAPI SelectClipRgn16( HDC16 hdc, HRGN16 hrgn )
 {
@@ -58,7 +58,7 @@
 }
 
 /******************************************************************************
- *		ExtSelectClipRgn16	[GDI.508]
+ *		ExtSelectClipRgn	[GDI.508]
  */
 INT16 WINAPI ExtSelectClipRgn16( HDC16 hdc, HRGN16 hrgn, INT16 fnMode )
 {
@@ -136,7 +136,7 @@
 
 
 /***********************************************************************
- *           OffsetClipRgn16    (GDI.32)
+ *           OffsetClipRgn    (GDI.32)
  */
 INT16 WINAPI OffsetClipRgn16( HDC16 hdc, INT16 x, INT16 y )
 {
@@ -231,7 +231,7 @@
 
 
 /***********************************************************************
- *           ExcludeClipRect16    (GDI.21)
+ *           ExcludeClipRect    (GDI.21)
  */
 INT16 WINAPI ExcludeClipRect16( HDC16 hdc, INT16 left, INT16 top,
                                 INT16 right, INT16 bottom )
@@ -268,7 +268,7 @@
 
 
 /***********************************************************************
- *           IntersectClipRect16    (GDI.22)
+ *           IntersectClipRect    (GDI.22)
  */
 INT16 WINAPI IntersectClipRect16( HDC16 hdc, INT16 left, INT16 top,
                                   INT16 right, INT16 bottom )
@@ -402,7 +402,7 @@
 
 
 /***********************************************************************
- *           PtVisible16    (GDI.103)
+ *           PtVisible    (GDI.103)
  */
 BOOL16 WINAPI PtVisible16( HDC16 hdc, INT16 x, INT16 y )
 {
@@ -431,7 +431,7 @@
 
 
 /***********************************************************************
- *           RectVisible16    (GDI.465)
+ *           RectVisible    (GDI.465)
  */
 BOOL16 WINAPI RectVisible16( HDC16 hdc, const RECT16* rect )
 {
@@ -469,7 +469,7 @@
 
 
 /***********************************************************************
- *           GetClipBox16    (GDI.77)
+ *           GetClipBox    (GDI.77)
  */
 INT16 WINAPI GetClipBox16( HDC16 hdc, LPRECT16 rect )
 {
diff --git a/objects/dc.c b/objects/dc.c
index 22f5084..3bc7259 100644
--- a/objects/dc.c
+++ b/objects/dc.c
@@ -410,7 +410,7 @@
 
 
 /***********************************************************************
- *           SaveDC16    (GDI.30)
+ *           SaveDC    (GDI.30)
  */
 INT16 WINAPI SaveDC16( HDC16 hdc )
 {
@@ -469,7 +469,7 @@
 
 
 /***********************************************************************
- *           RestoreDC16    (GDI.39)
+ *           RestoreDC    (GDI.39)
  */
 BOOL16 WINAPI RestoreDC16( HDC16 hdc, INT16 level )
 {
@@ -535,7 +535,7 @@
 
 
 /***********************************************************************
- *           CreateDC16    (GDI.53)
+ *           CreateDC    (GDI.53)
  */
 HDC16 WINAPI CreateDC16( LPCSTR driver, LPCSTR device, LPCSTR output,
                          const DEVMODEA *initData )
@@ -598,7 +598,7 @@
 
 
 /***********************************************************************
- *           CreateIC16    (GDI.153)
+ *           CreateIC    (GDI.153)
  */
 HDC16 WINAPI CreateIC16( LPCSTR driver, LPCSTR device, LPCSTR output,
                          const DEVMODEA* initData )
@@ -631,7 +631,7 @@
 
 
 /***********************************************************************
- *           CreateCompatibleDC16    (GDI.52)
+ *           CreateCompatibleDC    (GDI.52)
  */
 HDC16 WINAPI CreateCompatibleDC16( HDC16 hdc )
 {
@@ -686,7 +686,7 @@
 
 
 /***********************************************************************
- *           DeleteDC16    (GDI.68)
+ *           DeleteDC    (GDI.68)
  */
 BOOL16 WINAPI DeleteDC16( HDC16 hdc )
 {
@@ -748,7 +748,7 @@
 
 
 /***********************************************************************
- *           ResetDC16    (GDI.376)
+ *           ResetDC    (GDI.376)
  */
 HDC16 WINAPI ResetDC16( HDC16 hdc, const DEVMODEA *devmode )
 {
@@ -778,7 +778,7 @@
 
 
 /***********************************************************************
- *           GetDeviceCaps16    (GDI.80)
+ *           GetDeviceCaps    (GDI.80)
  */
 INT16 WINAPI GetDeviceCaps16( HDC16 hdc, INT16 cap )
 {
@@ -856,7 +856,7 @@
 
 
 /***********************************************************************
- *           SetBkColor16    (GDI.1)
+ *           SetBkColor    (GDI.1)
  */
 COLORREF WINAPI SetBkColor16( HDC16 hdc, COLORREF color )
 {
@@ -885,7 +885,7 @@
 
 
 /***********************************************************************
- *           SetTextColor16    (GDI.9)
+ *           SetTextColor    (GDI.9)
  */
 COLORREF WINAPI SetTextColor16( HDC16 hdc, COLORREF color )
 {
@@ -913,7 +913,7 @@
 }
 
 /***********************************************************************
- *           SetTextAlign16    (GDI.346)
+ *           SetTextAlign    (GDI.346)
  */
 UINT16 WINAPI SetTextAlign16( HDC16 hdc, UINT16 align )
 {
@@ -1011,7 +1011,7 @@
 
 
 /***********************************************************************
- *           SetArcDirection16    (GDI.525)
+ *           SetArcDirection    (GDI.525)
  */
 INT16 WINAPI SetArcDirection16( HDC16 hdc, INT16 nDirection )
 {
@@ -1366,7 +1366,7 @@
 }
 
 /***********************************************************************
- *           GetBoundsRect16    (GDI.194)
+ *           GetBoundsRect    (GDI.194)
  */
 UINT16 WINAPI GetBoundsRect16(HDC16 hdc, LPRECT16 rect, UINT16 flags)
 {
@@ -1383,7 +1383,7 @@
 }
  
 /***********************************************************************
- *           SetBoundsRect16    (GDI.193)
+ *           SetBoundsRect    (GDI.193)
  */
 UINT16 WINAPI SetBoundsRect16(HDC16 hdc, const RECT16* rect, UINT16 flags)
 {
diff --git a/objects/dcvalues.c b/objects/dcvalues.c
index 76aba4a..1eed41f 100644
--- a/objects/dcvalues.c
+++ b/objects/dcvalues.c
@@ -142,7 +142,7 @@
 DC_GET_VAL( INT, GetBkMode, backgroundMode )
 
 /***********************************************************************
- *		GetCurrentPosition16	(GDI.78)
+ *		GetCurrentPosition	(GDI.78)
  */
 DC_GET_X_Y( DWORD, GetCurrentPosition16, CursPosX, CursPosY )
 
@@ -162,7 +162,7 @@
 DC_GET_VAL( INT, GetROP2, ROPmode )
 
 /***********************************************************************
- *		GetRelAbs16		(GDI.86)
+ *		GetRelAbs		(GDI.86)
  */
 DC_GET_VAL_16( INT16, GetRelAbs16, relAbsMode )
 
@@ -177,37 +177,37 @@
 DC_GET_VAL( COLORREF, GetTextColor, textColor )
 
 /***********************************************************************
- *		GetViewportExt16	(GDI.94)
+ *		GetViewportExt	(GDI.94)
  */
 DC_GET_X_Y( DWORD, GetViewportExt16, vportExtX, vportExtY )
 
 /***********************************************************************
- *		GetViewportOrg16	(GDI.95)
+ *		GetViewportOrg	(GDI.95)
  */
 DC_GET_X_Y( DWORD, GetViewportOrg16, vportOrgX, vportOrgY )
 
 /***********************************************************************
- *		GetWindowExt16		(GDI.96)
+ *		GetWindowExt		(GDI.96)
  */
 DC_GET_X_Y( DWORD, GetWindowExt16, wndExtX, wndExtY )
 
 /***********************************************************************
- *		GetWindowOrg16	(GDI.97)
+ *		GetWindowOrg	(GDI.97)
  */
 DC_GET_X_Y( DWORD, GetWindowOrg16, wndOrgX, wndOrgY )
 
 /***********************************************************************
- *		InquireVisRgn16	(GDI.131)
+ *		InquireVisRgn	(GDI.131)
  */
 DC_GET_VAL_16( HRGN16, InquireVisRgn16, hVisRgn )
 
 /***********************************************************************
- *		GetClipRgn16	(GDI.173)
+ *		GetClipRgn	(GDI.173)
  */
 DC_GET_VAL_16( HRGN16, GetClipRgn16, hClipRgn )
 
 /***********************************************************************
- *		GetBrushOrg16	(GDI.149)
+ *		GetBrushOrg	(GDI.149)
  */
 DC_GET_X_Y( DWORD, GetBrushOrg16, brushOrgX, brushOrgY )
 
@@ -217,7 +217,7 @@
 DC_GET_VAL( UINT, GetTextAlign, textAlign )
 
 /***********************************************************************
- *		GetCurLogFont16	(GDI.411)
+ *		GetCurLogFont	(GDI.411)
  */
 DC_GET_VAL_16( HFONT16, GetCurLogFont16, hFont )
 
@@ -242,7 +242,7 @@
 DC_GET_VAL_EX( GetCurrentPositionEx, CursPosX, CursPosY, POINT )
 
 /***********************************************************************
- *		GetViewportExtEx	(GDI.472 GDI32.@)
+ *		GetViewportExtEx	(GDI.472) (GDI32.@)
  */
 DC_GET_VAL_EX( GetViewportExtEx, vportExtX, vportExtY, SIZE )
 
diff --git a/objects/dib.c b/objects/dib.c
index 6aaa51b..679ec1c 100644
--- a/objects/dib.c
+++ b/objects/dib.c
@@ -115,7 +115,7 @@
 
 
 /***********************************************************************
- *           StretchDIBits16   (GDI.439)
+ *           StretchDIBits   (GDI.439)
  */
 INT16 WINAPI StretchDIBits16(HDC16 hdc, INT16 xDst, INT16 yDst, INT16 widthDst,
                        INT16 heightDst, INT16 xSrc, INT16 ySrc, INT16 widthSrc,
@@ -198,7 +198,7 @@
 
 
 /***********************************************************************
- *           SetDIBits16    (GDI.440)
+ *           SetDIBits    (GDI.440)
  */
 INT16 WINAPI SetDIBits16( HDC16 hdc, HBITMAP16 hbitmap, UINT16 startscan,
                           UINT16 lines, LPCVOID bits, const BITMAPINFO *info,
@@ -253,7 +253,7 @@
 
 
 /***********************************************************************
- *           SetDIBitsToDevice16    (GDI.443)
+ *           SetDIBitsToDevice    (GDI.443)
  */
 INT16 WINAPI SetDIBitsToDevice16(HDC16 hdc, INT16 xDest, INT16 yDest, INT16 cx,
                            INT16 cy, INT16 xSrc, INT16 ySrc, UINT16 startscan,
@@ -292,7 +292,7 @@
 }
 
 /***********************************************************************
- *           SetDIBColorTable16    (GDI.602)
+ *           SetDIBColorTable    (GDI.602)
  */
 UINT16 WINAPI SetDIBColorTable16( HDC16 hdc, UINT16 startpos, UINT16 entries,
 				  RGBQUAD *colors )
@@ -326,7 +326,7 @@
 }
 
 /***********************************************************************
- *           GetDIBColorTable16    (GDI.603)
+ *           GetDIBColorTable    (GDI.603)
  */
 UINT16 WINAPI GetDIBColorTable16( HDC16 hdc, UINT16 startpos, UINT16 entries,
 				  RGBQUAD *colors )
@@ -411,7 +411,7 @@
 };
 
 /***********************************************************************
- *           GetDIBits16    (GDI.441)
+ *           GetDIBits    (GDI.441)
  */
 INT16 WINAPI GetDIBits16( HDC16 hdc, HBITMAP16 hbitmap, UINT16 startscan,
                           UINT16 lines, LPVOID bits, BITMAPINFO * info,
@@ -757,7 +757,7 @@
 
 
 /***********************************************************************
- *           CreateDIBitmap16    (GDI.442)
+ *           CreateDIBitmap    (GDI.442)
  *           CreateDIBitmap16    (DISPLAY.442)
  */
 HBITMAP16 WINAPI CreateDIBitmap16( HDC16 hdc, const BITMAPINFOHEADER * header,
@@ -851,7 +851,7 @@
 }
 
 /***********************************************************************
- *           CreateDIBSection16    (GDI.489)
+ *           CreateDIBSection    (GDI.489)
  */
 HBITMAP16 WINAPI CreateDIBSection16 (HDC16 hdc, BITMAPINFO *bmi, UINT16 usage,
 				     SEGPTR *bits, HANDLE section,
diff --git a/objects/font.c b/objects/font.c
index 7f81e13..8211e91 100644
--- a/objects/font.c
+++ b/objects/font.c
@@ -409,7 +409,7 @@
 
 
 /***********************************************************************
- *           CreateFontIndirect16   (GDI.57)
+ *           CreateFontIndirect   (GDI.57)
  */
 HFONT16 WINAPI CreateFontIndirect16( const LOGFONT16 *plf16 )
 {
@@ -476,7 +476,7 @@
 }
 
 /***********************************************************************
- *           CreateFont16    (GDI.56)
+ *           CreateFont    (GDI.56)
  */
 HFONT16 WINAPI CreateFont16(INT16 height, INT16 width, INT16 esc, INT16 orient,
                             INT16 weight, BYTE italic, BYTE underline,
@@ -845,7 +845,7 @@
 
 
 /***********************************************************************
- *           GetTextCharacterExtra16    (GDI.89)
+ *           GetTextCharacterExtra    (GDI.89)
  */
 INT16 WINAPI GetTextCharacterExtra16( HDC16 hdc )
 {
@@ -869,7 +869,7 @@
 
 
 /***********************************************************************
- *           SetTextCharacterExtra16    (GDI.8)
+ *           SetTextCharacterExtra    (GDI.8)
  */
 INT16 WINAPI SetTextCharacterExtra16( HDC16 hdc, INT16 extra )
 {
@@ -899,7 +899,7 @@
 
 
 /***********************************************************************
- *           SetTextJustification16    (GDI.10)
+ *           SetTextJustification    (GDI.10)
  */
 INT16 WINAPI SetTextJustification16( HDC16 hdc, INT16 extra, INT16 breaks )
 {
@@ -940,7 +940,7 @@
 
 
 /***********************************************************************
- *           GetTextFace16    (GDI.92)
+ *           GetTextFace    (GDI.92)
  */
 INT16 WINAPI GetTextFace16( HDC16 hdc, INT16 count, LPSTR name )
 {
@@ -992,7 +992,7 @@
 
 
 /***********************************************************************
- *           GetTextExtent16    (GDI.91)
+ *           GetTextExtent    (GDI.91)
  */
 DWORD WINAPI GetTextExtent16( HDC16 hdc, LPCSTR str, INT16 count )
 {
@@ -1003,7 +1003,7 @@
 
 
 /***********************************************************************
- *           GetTextExtentPoint16    (GDI.471)
+ *           GetTextExtentPoint    (GDI.471)
  *
  * FIXME: Should this have a bug for compatibility?
  * Original Windows versions of GetTextExtentPoint{A,W} have documented
@@ -1166,7 +1166,7 @@
 }
 
 /***********************************************************************
- *           GetTextMetrics16    (GDI.93)
+ *           GetTextMetrics    (GDI.93)
  */
 BOOL16 WINAPI GetTextMetrics16( HDC16 hdc, TEXTMETRIC16 *metrics )
 {
@@ -1248,7 +1248,7 @@
 
 
 /***********************************************************************
- * GetOutlineTextMetrics16 [GDI.308]  Gets metrics for TrueType fonts.
+ * GetOutlineTextMetrics [GDI.308]  Gets metrics for TrueType fonts.
  *
  * NOTES
  *    lpOTM should be LPOUTLINETEXTMETRIC
@@ -1352,7 +1352,7 @@
 }
 
 /***********************************************************************
- *           GetCharWidth16    (GDI.350)
+ *           GetCharWidth    (GDI.350)
  *           GetCharWidth16    (DISPLAY.350)
  */
 BOOL16 WINAPI GetCharWidth16( HDC16 hdc, UINT16 firstChar, UINT16 lastChar,
@@ -1389,6 +1389,7 @@
 
 
 /***********************************************************************
+ *           GetCharWidthA      (GDI32.@)
  *           GetCharWidth32A    (GDI32.@)
  */
 BOOL WINAPI GetCharWidth32A( HDC hdc, UINT firstChar, UINT lastChar,
@@ -1414,6 +1415,7 @@
 
 
 /***********************************************************************
+ *           GetCharWidthW      (GDI32.@)
  *           GetCharWidth32W    (GDI32.@)
  */
 BOOL WINAPI GetCharWidth32W( HDC hdc, UINT firstChar, UINT lastChar,
@@ -1427,7 +1429,7 @@
  
 
 /***********************************************************************
- *           SetMapperFlags16    (GDI.349)
+ *           SetMapperFlags    (GDI.349)
  */
 DWORD WINAPI SetMapperFlags16( HDC16 hDC, DWORD dwFlag )
 {
@@ -1452,7 +1454,7 @@
 }
 
 /***********************************************************************
- *          GetAspectRatioFilterEx16  (GDI.486)
+ *          GetAspectRatioFilterEx  (GDI.486)
  */
 BOOL16 WINAPI GetAspectRatioFilterEx16( HDC16 hdc, LPSIZE16 pAspectRatio )
 {
@@ -1470,7 +1472,7 @@
 }
 
 /***********************************************************************
- *           GetCharABCWidths16   (GDI.307)
+ *           GetCharABCWidths   (GDI.307)
  */
 BOOL16 WINAPI GetCharABCWidths16( HDC16 hdc, UINT16 firstChar, UINT16 lastChar,
                                   LPABC16 abc )
@@ -1540,7 +1542,7 @@
 
 
 /***********************************************************************
- *           GetGlyphOutline16    (GDI.309)
+ *           GetGlyphOutline    (GDI.309)
  */
 DWORD WINAPI GetGlyphOutline16( HDC16 hdc, UINT16 uChar, UINT16 fuFormat,
                                 LPGLYPHMETRICS16 lpgm, DWORD cbBuffer,
@@ -1577,7 +1579,7 @@
 }
 
 /***********************************************************************
- *           CreateScalableFontResource16   (GDI.310)
+ *           CreateScalableFontResource   (GDI.310)
  */
 BOOL16 WINAPI CreateScalableFontResource16( UINT16 fHidden,
                                             LPCSTR lpszResourceFile,
@@ -1619,7 +1621,7 @@
 
 
 /*************************************************************************
- *             GetRasterizerCaps16   (GDI.313)
+ *             GetRasterizerCaps   (GDI.313)
  */
 BOOL16 WINAPI GetRasterizerCaps16( LPRASTERIZER_STATUS lprs, UINT16 cbNumBytes)
 {
@@ -1640,7 +1642,7 @@
 
 
 /*************************************************************************
- *             GetKerningPairs16   (GDI.332)
+ *             GetKerningPairs   (GDI.332)
  */
 INT16 WINAPI GetKerningPairs16( HDC16 hDC, INT16 cPairs,
                                 LPKERNINGPAIR16 lpKerningPairs )
@@ -1764,7 +1766,7 @@
 }
 
 /*************************************************************************
- * GetFontData16 [GDI.311]
+ * GetFontData [GDI.311]
  *
  */
 DWORD WINAPI GetFontData16(HDC16 hdc, DWORD dwTable, DWORD dwOffset,
@@ -1883,7 +1885,7 @@
  *								       *
  ***********************************************************************/
 /***********************************************************************
- *           AddFontResource16    (GDI.119)
+ *           AddFontResource    (GDI.119)
  *
  *  Can be either .FON, or .FNT, or .TTF, or .FOT font file.
  *
@@ -1922,7 +1924,7 @@
 }
 
 /***********************************************************************
- *           RemoveFontResource16    (GDI.136)
+ *           RemoveFontResource    (GDI.136)
  */
 BOOL16 WINAPI RemoveFontResource16( LPCSTR str )
 {
diff --git a/objects/gdiobj.c b/objects/gdiobj.c
index bfeceba..c8aa1fe 100644
--- a/objects/gdiobj.c
+++ b/objects/gdiobj.c
@@ -576,7 +576,7 @@
 
 
 /***********************************************************************
- *           DeleteObject16    (GDI.605)
+ *           DeleteObject    (GDI.605)
  */
 BOOL16 WINAPI DeleteObject16( HGDIOBJ16 obj )
 {
@@ -635,7 +635,7 @@
 }
 
 /***********************************************************************
- *           GetStockObject16    (GDI.87)
+ *           GetStockObject    (GDI.87)
  */
 HGDIOBJ16 WINAPI GetStockObject16( INT16 obj )
 {
@@ -658,7 +658,7 @@
 
 
 /***********************************************************************
- *           GetObject16    (GDI.82)
+ *           GetObject    (GDI.82)
  */
 INT16 WINAPI GetObject16( HANDLE16 handle, INT16 count, LPVOID buffer )
 {
@@ -884,7 +884,7 @@
 
 
 /***********************************************************************
- *           SelectObject16    (GDI.45)
+ *           SelectObject    (GDI.45)
  */
 HGDIOBJ16 WINAPI SelectObject16( HDC16 hdc, HGDIOBJ16 handle )
 {
@@ -909,7 +909,7 @@
 
 
 /***********************************************************************
- *           UnrealizeObject16    (GDI.150)
+ *           UnrealizeObject    (GDI.150)
  */
 BOOL16 WINAPI UnrealizeObject16( HGDIOBJ16 obj )
 {
@@ -1122,7 +1122,7 @@
 
 
 /***********************************************************************
- *           SetObjectOwner16    (GDI.461)
+ *           SetObjectOwner    (GDI.461)
  */
 void WINAPI SetObjectOwner16( HGDIOBJ16 handle, HANDLE16 owner )
 {
@@ -1221,7 +1221,7 @@
 }
 
 /***********************************************************************
- *           FinalGdiInit16     (GDI.405)
+ *           FinalGdiInit     (GDI.405)
  */
 void WINAPI FinalGdiInit16( HANDLE16 unknown )
 {
@@ -1237,7 +1237,7 @@
 }
 
 /***********************************************************************
- *           MulDiv16   (GDI.128)
+ *           MulDiv   (GDI.128)
  */
 INT16 WINAPI MulDiv16(
 	     INT16 nMultiplicand, 
diff --git a/objects/metafile.c b/objects/metafile.c
index cd80d3e..8691df8 100644
--- a/objects/metafile.c
+++ b/objects/metafile.c
@@ -151,7 +151,7 @@
 
 
 /******************************************************************
- *	     DeleteMetaFile16   (GDI.127)
+ *	     DeleteMetaFile   (GDI.127)
  */
 BOOL16 WINAPI DeleteMetaFile16(  HMETAFILE16 hmf )
 {
@@ -211,7 +211,7 @@
 }
 
 /******************************************************************
- *         GetMetaFile16   (GDI.124)
+ *         GetMetaFile   (GDI.124)
  */
 HMETAFILE16 WINAPI GetMetaFile16( LPCSTR lpFilename )
 {
@@ -332,7 +332,7 @@
 }
 
 /******************************************************************
- *         CopyMetaFile16   (GDI.151)
+ *         CopyMetaFile   (GDI.151)
  */
 HMETAFILE16 WINAPI CopyMetaFile16( HMETAFILE16 hSrcMetaFile, LPCSTR lpFilename)
 {
@@ -528,7 +528,7 @@
 }
 
 /******************************************************************
- *         PlayMetaFile16   (GDI.123)
+ *         PlayMetaFile   (GDI.123)
  *
  */
 BOOL16 WINAPI PlayMetaFile16( HDC16 hdc, HMETAFILE16 hmf )
@@ -743,7 +743,7 @@
 static BOOL MF_Play_MetaCreateRegion( METARECORD *mr, HRGN hrgn );
 static BOOL MF_Play_MetaExtTextOut(HDC16 hdc, METARECORD *mr);
 /******************************************************************
- *             PlayMetaFileRecord16   (GDI.176)
+ *             PlayMetaFileRecord   (GDI.176)
  *
  *   Render a single metafile record specified by *mr in the DC hdc, while
  *   using the handle table *ht, of length nHandles, 
diff --git a/objects/palette.c b/objects/palette.c
index 1281945..0d2f143 100644
--- a/objects/palette.c
+++ b/objects/palette.c
@@ -89,7 +89,7 @@
 
 
 /***********************************************************************
- *           CreatePalette16    (GDI.360)
+ *           CreatePalette    (GDI.360)
  */
 HPALETTE16 WINAPI CreatePalette16( const LOGPALETTE* palette )
 {
@@ -130,7 +130,7 @@
 
 
 /***********************************************************************
- * CreateHalftonePalette16 [GDI.529]  Creates a halftone palette
+ * CreateHalftonePalette [GDI.529]  Creates a halftone palette
  *
  * RETURNS
  *    Success: Handle to logical halftone palette
@@ -189,7 +189,7 @@
 
 
 /***********************************************************************
- *           GetPaletteEntries16    (GDI.363)
+ *           GetPaletteEntries    (GDI.363)
  */
 UINT16 WINAPI GetPaletteEntries16( HPALETTE16 hpalette, UINT16 start,
                                    UINT16 count, LPPALETTEENTRY entries )
@@ -241,7 +241,7 @@
 
 
 /***********************************************************************
- *           SetPaletteEntries16    (GDI.364)
+ *           SetPaletteEntries    (GDI.364)
  */
 UINT16 WINAPI SetPaletteEntries16( HPALETTE16 hpalette, UINT16 start,
                                    UINT16 count, LPPALETTEENTRY entries )
@@ -290,7 +290,7 @@
 
 
 /***********************************************************************
- *           ResizePalette16   (GDI.368)
+ *           ResizePalette   (GDI.368)
  */
 BOOL16 WINAPI ResizePalette16( HPALETTE16 hPal, UINT16 cEntries )
 {
@@ -356,7 +356,7 @@
 
 
 /***********************************************************************
- *           AnimatePalette16   (GDI.367)
+ *           AnimatePalette   (GDI.367)
  */
 void WINAPI AnimatePalette16( HPALETTE16 hPal, UINT16 StartIndex,
                               UINT16 NumEntries, const PALETTEENTRY* PaletteColors)
@@ -406,7 +406,7 @@
 
 
 /***********************************************************************
- *           SetSystemPaletteUse16   (GDI.373)
+ *           SetSystemPaletteUse   (GDI.373)
  */
 UINT16 WINAPI SetSystemPaletteUse16( HDC16 hdc, UINT16 use )
 {
@@ -433,7 +433,7 @@
 
 
 /***********************************************************************
- *           GetSystemPaletteUse16   (GDI.374)
+ *           GetSystemPaletteUse   (GDI.374)
  */
 UINT16 WINAPI GetSystemPaletteUse16( HDC16 hdc )
 {
@@ -455,7 +455,7 @@
 
 
 /***********************************************************************
- *           GetSystemPaletteEntries16   (GDI.375)
+ *           GetSystemPaletteEntries   (GDI.375)
  */
 UINT16 WINAPI GetSystemPaletteEntries16( HDC16 hdc, UINT16 start, UINT16 count,
                                          LPPALETTEENTRY entries )
@@ -512,7 +512,7 @@
 
 
 /***********************************************************************
- *           GetNearestPaletteIndex16   (GDI.370)
+ *           GetNearestPaletteIndex   (GDI.370)
  */
 UINT16 WINAPI GetNearestPaletteIndex16( HPALETTE16 hpalette, COLORREF color )
 {
@@ -551,7 +551,7 @@
 
 
 /***********************************************************************
- *           GetNearestColor16   (GDI.154)
+ *           GetNearestColor   (GDI.154)
  */
 COLORREF WINAPI GetNearestColor16( HDC16 hdc, COLORREF color )
 {
@@ -778,7 +778,7 @@
 typedef BOOL WINAPI (*RedrawWindow_funcptr)( HWND, const RECT *, HRGN, UINT );
 
 /**********************************************************************
- *            UpdateColors16   (DISPLAY.366)
+ *            UpdateColors   (DISPLAY.366)
  *            UpdateColors16   (GDI.366)
  */
 INT16 WINAPI UpdateColors16( HDC16 hDC )
@@ -829,7 +829,7 @@
 
 
 /*********************************************************************
- *           SetMagicColors16   (GDI.606)
+ *           SetMagicColors   (GDI.606)
  */
 VOID WINAPI SetMagicColors16(HDC16 hDC, COLORREF color, UINT16 index)
 {
diff --git a/objects/pen.c b/objects/pen.c
index 8baad51..e64bc68 100644
--- a/objects/pen.c
+++ b/objects/pen.c
@@ -13,7 +13,7 @@
 
 
 /***********************************************************************
- *           CreatePen16    (GDI.61)
+ *           CreatePen    (GDI.61)
  */
 HPEN16 WINAPI CreatePen16( INT16 style, INT16 width, COLORREF color )
 {
@@ -49,7 +49,7 @@
 
 
 /***********************************************************************
- *           CreatePenIndirect16    (GDI.62)
+ *           CreatePenIndirect    (GDI.62)
  */
 HPEN16 WINAPI CreatePenIndirect16( const LOGPEN16 * pen )
 {
diff --git a/objects/region.c b/objects/region.c
index 33a328c..961b0a5 100644
--- a/objects/region.c
+++ b/objects/region.c
@@ -492,7 +492,7 @@
 }
 
 /***********************************************************************
- *           OffsetRgn16    (GDI.101)
+ *           OffsetRgn    (GDI.101)
  */
 INT16 WINAPI OffsetRgn16( HRGN16 hrgn, INT16 x, INT16 y )
 {
@@ -537,7 +537,7 @@
 
 
 /***********************************************************************
- *           GetRgnBox16    (GDI.134)
+ *           GetRgnBox    (GDI.134)
  */
 INT16 WINAPI GetRgnBox16( HRGN16 hrgn, LPRECT16 rect )
 {
@@ -570,7 +570,7 @@
 
 
 /***********************************************************************
- *           CreateRectRgn16    (GDI.64)
+ *           CreateRectRgn    (GDI.64)
  *
  * NOTE: Doesn't call CreateRectRgn because of differences in SetRectRgn16/32
  */
@@ -603,7 +603,7 @@
 }
 
 /***********************************************************************
- *           CreateRectRgnIndirect16    (GDI.65)
+ *           CreateRectRgnIndirect    (GDI.65)
  */
 HRGN16 WINAPI CreateRectRgnIndirect16( const RECT16* rect )
 {
@@ -621,7 +621,7 @@
 
 
 /***********************************************************************
- *           SetRectRgn16    (GDI.172)
+ *           SetRectRgn    (GDI.172)
  *
  * NOTE: Win 3.1 sets region to empty if left > right
  */
@@ -671,7 +671,7 @@
 
 
 /***********************************************************************
- *           CreateRoundRectRgn16    (GDI.444)
+ *           CreateRoundRectRgn    (GDI.444)
  *
  * If either ellipse dimension is zero we call CreateRectRgn16 for its
  * `special' behaviour. -ve ellipse dimensions can result in GPFs under win3.1
@@ -799,7 +799,7 @@
 
 
 /***********************************************************************
- *           CreateEllipticRgn16    (GDI.54)
+ *           CreateEllipticRgn    (GDI.54)
  */
 HRGN16 WINAPI CreateEllipticRgn16( INT16 left, INT16 top,
 				   INT16 right, INT16 bottom )
@@ -821,7 +821,7 @@
 
 
 /***********************************************************************
- *           CreateEllipticRgnIndirect16    (GDI.55)
+ *           CreateEllipticRgnIndirect    (GDI.55)
  */
 HRGN16 WINAPI CreateEllipticRgnIndirect16( const RECT16 *rect )
 {
@@ -889,7 +889,7 @@
 }
 
 /***********************************************************************
- *           GetRegionData16   (GDI.607)
+ *           GetRegionData   (GDI.607)
  * FIXME: is LPRGNDATA the same in Win16 and Win32 ?
  */
 DWORD WINAPI GetRegionData16(HRGN16 hrgn, DWORD count, LPRGNDATA rgndata)
@@ -941,7 +941,7 @@
 }
 
 /***********************************************************************
- *           PtInRegion16    (GDI.161)
+ *           PtInRegion    (GDI.161)
  */
 BOOL16 WINAPI PtInRegion16( HRGN16 hrgn, INT16 x, INT16 y )
 {
@@ -975,7 +975,7 @@
 
 
 /***********************************************************************
- *           RectInRegion16    (GDI.466)
+ *           RectInRegion    (GDI.466)
  */
 BOOL16 WINAPI RectInRegion16( HRGN16 hrgn, const RECT16 *rect )
 {
@@ -1030,7 +1030,7 @@
 }
 
 /***********************************************************************
- *           EqualRgn16    (GDI.72)
+ *           EqualRgn    (GDI.72)
  */
 BOOL16 WINAPI EqualRgn16( HRGN16 rgn1, HRGN16 rgn2 )
 {
@@ -1211,7 +1211,7 @@
 }
     
 /***********************************************************************
- *           CombineRgn16    (GDI.47)
+ *           CombineRgn    (GDI.47)
  */
 INT16 WINAPI CombineRgn16(HRGN16 hDest, HRGN16 hSrc1, HRGN16 hSrc2, INT16 mode)
 {
@@ -2879,7 +2879,7 @@
 
 
 /***********************************************************************
- *           CreatePolygonRgn16    (GDI.63)
+ *           CreatePolygonRgn    (GDI.63)
  */
 HRGN16 WINAPI CreatePolygonRgn16( const POINT16 * points, INT16 count,
                                   INT16 mode )
@@ -2888,7 +2888,7 @@
 }
 
 /***********************************************************************
- *           CreatePolyPolygonRgn16    (GDI.451)
+ *           CreatePolyPolygonRgn    (GDI.451)
  */
 HRGN16 WINAPI CreatePolyPolygonRgn16( const POINT16 *points,
                 const INT16 *count, INT16 nbpolygons, INT16 mode )
diff --git a/objects/text.c b/objects/text.c
index 12bc71b..cbeebb9 100644
--- a/objects/text.c
+++ b/objects/text.c
@@ -21,7 +21,7 @@
 
 
 /***********************************************************************
- *           ExtTextOut16    (DISPLAY.351)
+ *           ExtTextOut    (DISPLAY.351)
  *           ExtTextOut16    (GDI.351)
  */
 BOOL16 WINAPI ExtTextOut16( HDC16 hdc, INT16 x, INT16 y, UINT16 flags,
@@ -115,7 +115,7 @@
 
 
 /***********************************************************************
- *           TextOut16    (GDI.33)
+ *           TextOut    (GDI.33)
  */
 BOOL16 WINAPI TextOut16( HDC16 hdc, INT16 x, INT16 y, LPCSTR str, INT16 count )
 {
@@ -160,7 +160,7 @@
 }
 
 /***********************************************************************
- * GetTextCharset16 [GDI.612]
+ * GetTextCharset [GDI.612]
  */
 UINT16 WINAPI GetTextCharset16(HDC16 hdc)
 {