diff --git a/dlls/winmm/lolvldrv.c b/dlls/winmm/lolvldrv.c
index aabbf18fb83..fa37d5b55e6 100644
--- a/dlls/winmm/lolvldrv.c
+++ b/dlls/winmm/lolvldrv.c
@@ -622,7 +622,7 @@ static	BOOL	MMDRV_Install(LPCSTR drvRegName, LPCSTR drvFileName, BOOL bIsMapper)
 	if (d->d.d32.hModule) {
 #define A(_x,_y)	AA(d->d.d32.hModule,_x,_y,32,GetProcAddress)
 	    A(MMDRV_AUX,	auxMessage);
-	    A(MMDRV_MIXER,	mixMessage);
+	    A(MMDRV_MIXER,	mxdMessage);
 	    A(MMDRV_MIDIIN,	midMessage);
 	    A(MMDRV_MIDIOUT, 	modMessage);
 	    A(MMDRV_WAVEIN,	widMessage);
diff --git a/dlls/winmm/message16.c b/dlls/winmm/message16.c
index 675a08b7735..64e97cd92a4 100644
--- a/dlls/winmm/message16.c
+++ b/dlls/winmm/message16.c
@@ -1805,7 +1805,7 @@ unsigned   MMDRV_LoadMMDrvFunc16(LPCSTR drvName, LPWINE_DRIVER d,
 
 #define A(_x,_y)	AA(hMod16,_x,_y,16,GetProcAddress16)
         A(MMDRV_AUX,	auxMessage);
-        A(MMDRV_MIXER,	mixMessage);
+        A(MMDRV_MIXER,	mxdMessage);
         A(MMDRV_MIDIIN,	midMessage);
         A(MMDRV_MIDIOUT,modMessage);
         A(MMDRV_WAVEIN,	widMessage);
diff --git a/dlls/winmm/wineoss/mixer.c b/dlls/winmm/wineoss/mixer.c
index 1e3f32e5fa7..b599f07112e 100644
--- a/dlls/winmm/wineoss/mixer.c
+++ b/dlls/winmm/wineoss/mixer.c
@@ -1048,9 +1048,9 @@ static	DWORD	MIX_GetNumDevs(void)
 #endif /* HAVE_OSS */
 
 /**************************************************************************
- * 				mixMessage (WINEOSS.3)
+ * 				mxdMessage (WINEOSS.3)
  */
-DWORD WINAPI OSS_mixMessage(UINT wDevID, UINT wMsg, DWORD dwUser,
+DWORD WINAPI OSS_mxdMessage(UINT wDevID, UINT wMsg, DWORD dwUser,
 			    DWORD dwParam1, DWORD dwParam2)
 {
 /* TRACE("(%04X, %04X, %08lX, %08lX, %08lX);\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); */
@@ -1090,5 +1090,3 @@ DWORD WINAPI OSS_mixMessage(UINT wDevID, UINT wMsg, DWORD dwUser,
     return MMSYSERR_NOTENABLED;
 #endif
 }
-
-
diff --git a/dlls/winmm/wineoss/wineoss.drv.spec b/dlls/winmm/wineoss/wineoss.drv.spec
index 2478ecc3c26..8a305ff5001 100644
--- a/dlls/winmm/wineoss/wineoss.drv.spec
+++ b/dlls/winmm/wineoss/wineoss.drv.spec
@@ -1,6 +1,6 @@
   1 stdcall DriverProc(long long long long long) OSS_DriverProc
   2 stdcall auxMessage(long long long long long) OSS_auxMessage
-  3 stdcall mixMessage(long long long long long) OSS_mixMessage
+  3 stdcall mxdMessage(long long long long long) OSS_mxdMessage
   4 stdcall midMessage(long long long long long) OSS_midMessage
   5 stdcall modMessage(long long long long long) OSS_modMessage
   6 stdcall widMessage(long long long long long) OSS_widMessage
diff --git a/documentation/multimedia.sgml b/documentation/multimedia.sgml
index 322902713e0..374e58fe94f 100644
--- a/documentation/multimedia.sgml
+++ b/documentation/multimedia.sgml
@@ -224,7 +224,7 @@
 
 	<para>
 	  MMSYSTEM and WINMM call the low level driver functions using the
-	  mixMessage function.
+	  mxdMessage function.
 	</para>
 
 	<sect3>