diff --git a/dlls/atl/registrar.c b/dlls/atl/registrar.c
index 91f127e41a6..163b1caedd9 100644
--- a/dlls/atl/registrar.c
+++ b/dlls/atl/registrar.c
@@ -737,7 +737,7 @@ static const IClassFactoryVtbl IRegistrarCFVtbl = {
 static IClassFactory RegistrarCF = { &IRegistrarCFVtbl };
 
 /**************************************************************
- * DllGetClassObject implementation
+ * DllGetClassObject (ATL.2)
  */
 HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, LPVOID *ppvObject)
 {
diff --git a/dlls/dmband/dmband_main.c b/dlls/dmband/dmband_main.c
index e89d645391c..937e7d3beb3 100644
--- a/dlls/dmband/dmband_main.c
+++ b/dlls/dmband/dmband_main.c
@@ -159,7 +159,7 @@ HRESULT WINAPI DllCanUnloadNow(void)
 
 
 /******************************************************************
- *		DllGetClassObject (DMBAND.2)
+ *		DllGetClassObject (DMBAND.@)
  *
  *
  */
diff --git a/dlls/dmloader/dmloader_main.c b/dlls/dmloader/dmloader_main.c
index 54b1113d688..75db3844d2f 100644
--- a/dlls/dmloader/dmloader_main.c
+++ b/dlls/dmloader/dmloader_main.c
@@ -53,7 +53,7 @@ HRESULT WINAPI DllCanUnloadNow (void)
 
 
 /******************************************************************
- *		DllGetClassObject (DMLOADER.2)
+ *		DllGetClassObject (DMLOADER.@)
  */
 HRESULT WINAPI DllGetClassObject (REFCLSID rclsid, REFIID riid, LPVOID *ppv)
 {
diff --git a/dlls/dmscript/dmscript_main.c b/dlls/dmscript/dmscript_main.c
index 35503e3ab80..ccb4846ab4f 100644
--- a/dlls/dmscript/dmscript_main.c
+++ b/dlls/dmscript/dmscript_main.c
@@ -571,7 +571,7 @@ HRESULT WINAPI DllCanUnloadNow(void)
 
 
 /******************************************************************
- *		DllGetClassObject (DMSCRIPT.2)
+ *		DllGetClassObject (DMSCRIPT.@)
  *
  *
  */
diff --git a/dlls/dmsynth/dmsynth_main.c b/dlls/dmsynth/dmsynth_main.c
index 7a18214d66f..f620e7d69e7 100644
--- a/dlls/dmsynth/dmsynth_main.c
+++ b/dlls/dmsynth/dmsynth_main.c
@@ -156,7 +156,7 @@ HRESULT WINAPI DllCanUnloadNow(void)
 
 
 /******************************************************************
- *		DllGetClassObject (DMSYNTH.2)
+ *		DllGetClassObject (DMSYNTH.@)
  *
  *
  */
diff --git a/dlls/dmusic/dmusic_main.c b/dlls/dmusic/dmusic_main.c
index 85ecf159050..70b8f0524b7 100644
--- a/dlls/dmusic/dmusic_main.c
+++ b/dlls/dmusic/dmusic_main.c
@@ -156,7 +156,7 @@ HRESULT WINAPI DllCanUnloadNow(void)
 
 
 /******************************************************************
- *		DllGetClassObject (DMUSIC.2)
+ *		DllGetClassObject (DMUSIC.@)
  *
  *
  */
diff --git a/dlls/dswave/dswave_main.c b/dlls/dswave/dswave_main.c
index 09b2ff03ee5..3adc989d8d6 100644
--- a/dlls/dswave/dswave_main.c
+++ b/dlls/dswave/dswave_main.c
@@ -108,7 +108,7 @@ HRESULT WINAPI DllCanUnloadNow(void)
 
 
 /******************************************************************
- *		DllGetClassObject (DSWAVE.2)
+ *		DllGetClassObject (DSWAVE.@)
  *
  *
  */
diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c
index 8f20269947f..d7682210e99 100644
--- a/dlls/mlang/mlang.c
+++ b/dlls/mlang/mlang.c
@@ -745,6 +745,9 @@ static const IClassFactoryVtbl MLANGCF_Vtbl =
     MLANGCF_LockServer
 };
 
+/******************************************************************
+ *		DllGetClassObject (MLANG.@)
+ */
 HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv)
 {
     int i;
diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c
index e044fbee1f0..e2fd983ce31 100644
--- a/dlls/mshtml/main.c
+++ b/dlls/mshtml/main.c
@@ -155,6 +155,9 @@ static HRESULT ClassFactory_Create(REFIID riid, void **ppv, CreateInstanceFunc f
     return hres;
 }
 
+/******************************************************************
+ *		DllGetClassObject (MSHTML.@)
+ */
 HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
 {
     if(IsEqualGUID(&CLSID_HTMLDocument, rclsid)) {
diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c
index 0d58d3c95c0..5b92d7d173e 100644
--- a/dlls/msi/msi.c
+++ b/dlls/msi/msi.c
@@ -1340,7 +1340,7 @@ static const IClassFactoryVtbl MsiCF_Vtbl =
 static IClassFactoryImpl Msi_CF = { &MsiCF_Vtbl };
 
 /******************************************************************
- * DllGetClassObject          [MSI.@]
+ * DllGetClassObject          [MSI.2]
  */
 HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
 {
diff --git a/dlls/msxml3/factory.c b/dlls/msxml3/factory.c
index 2485e351c6a..7f4abc02143 100644
--- a/dlls/msxml3/factory.c
+++ b/dlls/msxml3/factory.c
@@ -127,6 +127,9 @@ const struct IClassFactoryVtbl xmlcf_vtbl =
 
 static xmlcf domdoccf = { &xmlcf_vtbl, DOMDocument_create };
 
+/******************************************************************
+ *		DllGetClassObject (MSXML3.@)
+ */
 HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *ppv )
 {
     IClassFactory *cf = NULL;
diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c
index 8754c9a97d6..24d1f4f9cf7 100644
--- a/dlls/ole32/ole2.c
+++ b/dlls/ole32/ole2.c
@@ -2329,7 +2329,7 @@ HRESULT WINAPI OleDoAutoConvert(IStorage *pStg, LPCLSID pClsidNew)
 }
 
 /******************************************************************************
- *              OleDoAutoConvert        [OLE2.@]
+ *              OleDoAutoConvert        [OLE2.79]
  */
 HRESULT WINAPI OleDoAutoConvert16(IStorage *pStg, LPCLSID pClsidNew)
 {
diff --git a/dlls/ole32/ole2.spec b/dlls/ole32/ole2.spec
index f219609b810..1cb59e83827 100644
--- a/dlls/ole32/ole2.spec
+++ b/dlls/ole32/ole2.spec
@@ -77,7 +77,7 @@
 79 pascal OleDoAutoConvert(ptr ptr) OleDoAutoConvert16
 80 stub OLEGETAUTOCONVERT
 81 stub OLESETAUTOCONVERT
-82 pascal GETCONVERTSTG(ptr) GetConvertStg16
+82 pascal GetConvertStg(ptr) GetConvertStg16
 83 stub SETCONVERTSTG
 84 stub CREATESTREAMONHGLOBAL
 85 stub GETHGLOBALFROMSTREAM
diff --git a/dlls/ole32/storage.c b/dlls/ole32/storage.c
index bec94db2f78..9edce10a675 100644
--- a/dlls/ole32/storage.c
+++ b/dlls/ole32/storage.c
@@ -2221,7 +2221,7 @@ HRESULT WINAPI StgOpenStorageOnILockBytes16(
 }
 
 /***********************************************************************
- *    ReadClassStg (OLE2.@)
+ *    ReadClassStg (OLE2.18)
  *
  * This method reads the CLSID previously written to a storage object with the WriteClassStg.
  */
@@ -2266,7 +2266,7 @@ HRESULT WINAPI ReadClassStg16(SEGPTR /*IStorage **/pstg,CLSID *pclsid){
 }
 
 /***********************************************************************
- *              GetConvertStg (OLE2.@)
+ *              GetConvertStg (OLE2.82)
  */
 HRESULT WINAPI GetConvertStg16(IStorage *stg) {
     FIXME("unimplemented stub!\n");