diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index f57b7e569..4be1da776 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -4051,7 +4051,7 @@ static void Command_Tunes_f(void)
 	mapmusflags = (track & MUSIC_TRACKMASK);
 	mapmusposition = position;
 
-	S_ChangeMusicAdvanced(mapmusname, mapmusflags, true, mapmusposition, 0, 0);
+	S_ChangeMusicEx(mapmusname, mapmusflags, true, mapmusposition, 0, 0);
 
 	if (argc > 3)
 	{
diff --git a/src/f_finale.c b/src/f_finale.c
index 3b3ae8a91..755a1103a 100644
--- a/src/f_finale.c
+++ b/src/f_finale.c
@@ -1831,7 +1831,7 @@ static void F_AdvanceToNextScene(void)
 	picypos = cutscenes[cutnum]->scene[scenenum].ycoord[picnum];
 
 	if (cutscenes[cutnum]->scene[scenenum].musswitch[0])
-		S_ChangeMusicAdvanced(cutscenes[cutnum]->scene[scenenum].musswitch,
+		S_ChangeMusicEx(cutscenes[cutnum]->scene[scenenum].musswitch,
 			cutscenes[cutnum]->scene[scenenum].musswitchflags,
 			cutscenes[cutnum]->scene[scenenum].musicloop,
 			cutscenes[cutnum]->scene[scenenum].musswitchposition, 0, 0);
@@ -1905,7 +1905,7 @@ void F_StartCustomCutscene(INT32 cutscenenum, boolean precutscene, boolean reset
 	stoptimer = 0;
 
 	if (cutscenes[cutnum]->scene[0].musswitch[0])
-		S_ChangeMusicAdvanced(cutscenes[cutnum]->scene[0].musswitch,
+		S_ChangeMusicEx(cutscenes[cutnum]->scene[0].musswitch,
 			cutscenes[cutnum]->scene[0].musswitchflags,
 			cutscenes[cutnum]->scene[0].musicloop,
 			cutscenes[cutnum]->scene[scenenum].musswitchposition, 0, 0);
diff --git a/src/lua_baselib.c b/src/lua_baselib.c
index 3c0a78f88..08f6e3051 100644
--- a/src/lua_baselib.c
+++ b/src/lua_baselib.c
@@ -2242,7 +2242,7 @@ static int lib_sChangeMusic(lua_State *L)
 
 	if (!player || P_IsLocalPlayer(player))
 	{
-		S_ChangeMusicAdvanced(music_name, music_flags, looping, position, prefadems, fadeinms);
+		S_ChangeMusicEx(music_name, music_flags, looping, position, prefadems, fadeinms);
 		lua_pushboolean(L, true);
 	}
 	else
diff --git a/src/p_user.c b/src/p_user.c
index ae7288858..fd4e5b5d7 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -1277,13 +1277,13 @@ void P_RestoreMusic(player_t *player)
 		if (mapheaderinfo[gamemap-1]->levelflags & LF_SPEEDMUSIC)
 		{
 			S_SpeedMusic(1.4f);
-			S_ChangeMusicAdvanced(mapmusname, mapmusflags, true, mapmusposition, 0, 0);
+			S_ChangeMusicEx(mapmusname, mapmusflags, true, mapmusposition, 0, 0);
 		}
 		else
 			S_ChangeMusicInternal("_shoes", true);
 	}
 	else
-		S_ChangeMusicAdvanced(mapmusname, mapmusflags, true, mapmusposition, 0, 0);
+		S_ChangeMusicEx(mapmusname, mapmusflags, true, mapmusposition, 0, 0);
 }
 
 //
diff --git a/src/s_sound.c b/src/s_sound.c
index e711a16f0..ed929af0b 100644
--- a/src/s_sound.c
+++ b/src/s_sound.c
@@ -1551,11 +1551,11 @@ static void S_ClearQueue(void)
 
 static void S_ChangeMusicToQueue(void)
 {
-	S_ChangeMusicAdvanced(queue_name, queue_flags, queue_looping, queue_position, 0, queue_fadeinms);
+	S_ChangeMusicEx(queue_name, queue_flags, queue_looping, queue_position, 0, queue_fadeinms);
 	S_ClearQueue();
 }
 
-void S_ChangeMusicAdvanced(const char *mmusic, UINT16 mflags, boolean looping, UINT32 position, UINT32 prefadems, UINT32 fadeinms)
+void S_ChangeMusicEx(const char *mmusic, UINT16 mflags, boolean looping, UINT32 position, UINT32 prefadems, UINT32 fadeinms)
 {
 	if (S_MusicDisabled())
 		return;
@@ -1741,5 +1741,5 @@ void S_Start(void)
 
 	if (cv_resetmusic.value)
 		S_StopMusic();
-	S_ChangeMusicAdvanced(mapmusname, mapmusflags, true, mapmusposition, 0, 0);
+	S_ChangeMusicEx(mapmusname, mapmusflags, true, mapmusposition, 0, 0);
 }
diff --git a/src/s_sound.h b/src/s_sound.h
index 3cb05000b..7a962d11a 100644
--- a/src/s_sound.h
+++ b/src/s_sound.h
@@ -176,9 +176,9 @@ UINT32 S_GetMusicPosition(void);
 // note: music flags 12 bits for tracknum (gme, other formats with more than one track)
 //       13-15 aren't used yet
 //       and the last bit we ignore (internal game flag for resetting music on reload)
-void S_ChangeMusicAdvanced(const char *mmusic, UINT16 mflags, boolean looping, UINT32 position, UINT32 prefadems, UINT32 fadeinms);
-#define S_ChangeMusicInternal(a,b) S_ChangeMusicAdvanced(a,0,b,0,0,0)
-#define S_ChangeMusic(a,b,c) S_ChangeMusicAdvanced(a,b,c,0,0,0)
+void S_ChangeMusicEx(const char *mmusic, UINT16 mflags, boolean looping, UINT32 position, UINT32 prefadems, UINT32 fadeinms);
+#define S_ChangeMusicInternal(a,b) S_ChangeMusicEx(a,0,b,0,0,0)
+#define S_ChangeMusic(a,b,c) S_ChangeMusicEx(a,b,c,0,0,0)
 
 // Stops the music.
 void S_StopMusic(void);
@@ -195,7 +195,7 @@ void S_SetInternalMusicVolume(INT32 volume);
 void S_StopFadingMusic(void);
 boolean S_FadeMusicFromVolume(UINT8 target_volume, INT16 source_volume, UINT32 ms);
 #define S_FadeMusic(a, b) S_FadeMusicFromVolume(a, -1, b)
-#define S_FadeInChangeMusic(a,b,c,d) S_ChangeMusicAdvanced(a,b,c,0,0,d)
+#define S_FadeInChangeMusic(a,b,c,d) S_ChangeMusicEx(a,b,c,0,0,d)
 boolean S_FadeOutStopMusic(UINT32 ms);
 
 //