diff --git a/src/android/i_sound.c b/src/android/i_sound.c
index e9a322472..8866ecd95 100644
--- a/src/android/i_sound.c
+++ b/src/android/i_sound.c
@@ -74,17 +74,17 @@ void I_ResumeSong(INT32 handle)
         (void)handle;
 }
 
-boolean I_MusicPlaying(void)
+boolean I_SongPlaying(void)
 {
 	return false;
 }
 
-boolean I_MusicPaused(void)
+boolean I_SongPaused(void)
 {
 	return false;
 }
 
-musictype_t I_MusicType(void)
+musictype_t I_GetSongType(void)
 {
 	return MU_NONE;
 }
@@ -158,29 +158,29 @@ boolean I_SetSongSpeed(float speed)
         return false;
 }
 
-UINT32 I_GetMusicLength(void)
+UINT32 I_GetSongLength(void)
 {
         return 0;
 }
 
-boolean I_SetMusicLoopPoint(UINT32 looppoint)
+boolean I_SetSongLoopPoint(UINT32 looppoint)
 {
         (void)looppoint;
         return false;
 }
 
-UINT32 I_GetMusicLoopPoint(void)
+UINT32 I_GetSongLoopPoint(void)
 {
 	return 0;
 }
 
-boolean I_SetMusicPosition(UINT32 position)
+boolean I_SetSongPosition(UINT32 position)
 {
         (void)position;
         return false;
 }
 
-UINT32 I_GetMusicPosition(void)
+UINT32 I_GetSongPosition(void)
 {
         return 0;
 }
@@ -190,11 +190,11 @@ void I_SetInternalMusicVolume(UINT8 volume)
 	(void)volume;
 }
 
-void I_StopFadingMusic(void)
+void I_StopFadingSong(void)
 {
 }
 
-boolean I_FadeMusicFromLevel(UINT8 target_volume, UINT8 source_volume, UINT32 ms, boolean stopafterfade)
+boolean I_FadeSongFromLevel(UINT8 target_volume, UINT8 source_volume, UINT32 ms, boolean stopafterfade)
 {
 	(void)target_volume;
 	(void)source_volume;
@@ -202,14 +202,14 @@ boolean I_FadeMusicFromLevel(UINT8 target_volume, UINT8 source_volume, UINT32 ms
         return false;
 }
 
-boolean I_FadeMusic(UINT8 target_volume, UINT32 ms)
+boolean I_FadeSong(UINT8 target_volume, UINT32 ms)
 {
 	(void)target_volume;
 	(void)ms;
 	return false;
 }
 
-boolean I_FadeOutStopMusic(UINT32 ms)
+boolean I_FadeOutStopSong(UINT32 ms)
 {
         (void)ms;
         return false;
diff --git a/src/djgppdos/i_sound.c b/src/djgppdos/i_sound.c
index 5dfcebb99..8c21c39f0 100644
--- a/src/djgppdos/i_sound.c
+++ b/src/djgppdos/i_sound.c
@@ -551,44 +551,44 @@ boolean I_SetSongSpeed(float speed)
 	return false;
 }
 
-UINT32 I_GetMusicLength(void)
+UINT32 I_GetSongLength(void)
 {
 	return 0;
 }
 
-boolean I_SetMusicLoopPoint(UINT32 looppoint)
+boolean I_SetSongLoopPoint(UINT32 looppoint)
 {
         (void)looppoint;
         return false;
 }
 
-UINT32 I_GetMusicLoopPoint(void)
+UINT32 I_GetSongLoopPoint(void)
 {
 	return 0;
 }
 
-boolean I_SetMusicPosition(UINT32 position)
+boolean I_SetSongPosition(UINT32 position)
 {
     (void)position;
     return false;
 }
 
-UINT32 I_GetMusicPosition(void)
+UINT32 I_GetSongPosition(void)
 {
     return 0;
 }
 
-boolean I_MusicPlaying(void)
+boolean I_SongPlaying(void)
 {
 	return (boolean)currsong && music_started;
 }
 
-boolean I_MusicPaused(void)
+boolean I_SongPaused(void)
 {
 	return false;
 }
 
-musictype_t I_MusicType(void)
+musictype_t I_GetSongType(void)
 {
 	return MU_NONE;
 }
@@ -598,11 +598,11 @@ void I_SetInternalMusicVolume(UINT8 volume)
 	(void)volume;
 }
 
-void I_StopFadingMusic(void)
+void I_StopFadingSong(void)
 {
 }
 
-boolean I_FadeMusicFromLevel(UINT8 target_volume, UINT8 source_volume, UINT32 ms, boolean stopafterfade)
+boolean I_FadeSongFromLevel(UINT8 target_volume, UINT8 source_volume, UINT32 ms, boolean stopafterfade)
 {
 	(void)target_volume;
 	(void)source_volume;
@@ -610,14 +610,14 @@ boolean I_FadeMusicFromLevel(UINT8 target_volume, UINT8 source_volume, UINT32 ms
 	return false;
 }
 
-boolean I_FadeMusic(UINT8 target_volume, UINT32 ms)
+boolean I_FadeSong(UINT8 target_volume, UINT32 ms)
 {
 	(void)target_volume;
 	(void)ms;
 	return false;
 }
 
-boolean I_FadeOutStopMusic(UINT32 ms)
+boolean I_FadeOutStopSong(UINT32 ms)
 {
 	(void)ms;
 	return false;
diff --git a/src/dummy/i_sound.c b/src/dummy/i_sound.c
index 20cf97a86..97264e7e1 100644
--- a/src/dummy/i_sound.c
+++ b/src/dummy/i_sound.c
@@ -151,11 +151,11 @@ void I_SetInternalMusicVolume(UINT8 volume)
 	(void)volume;
 }
 
-void I_StopFadingMusic(void)
+void I_StopFadingSong(void)
 {
 }
 
-boolean I_FadeMusicFromLevel(UINT8 target_volume, UINT8 source_volume, UINT32 ms, boolean stopafterfade)
+boolean I_FadeSongFromLevel(UINT8 target_volume, UINT8 source_volume, UINT32 ms, boolean stopafterfade)
 {
 	(void)target_volume;
 	(void)source_volume;
@@ -163,14 +163,14 @@ boolean I_FadeMusicFromLevel(UINT8 target_volume, UINT8 source_volume, UINT32 ms
 	return false;
 }
 
-boolean I_FadeMusic(UINT8 target_volume, UINT32 ms)
+boolean I_FadeSong(UINT8 target_volume, UINT32 ms)
 {
 	(void)target_volume;
 	(void)ms;
 	return false;
 }
 
-boolean I_FadeOutStopMusic(UINT32 ms)
+boolean I_FadeOutStopSong(UINT32 ms)
 {
 	(void)ms;
 	return false;
@@ -184,44 +184,44 @@ boolean I_FadeInStartDigSong(const char *musicname, UINT16 track, boolean loopin
 	return false;
 }
 
-UINT32 I_GetMusicLength(void)
+UINT32 I_GetSongLength(void)
 {
 	return 0;
 }
 
-boolean I_SetMusicLoopPoint(UINT32 looppoint)
+boolean I_SetSongLoopPoint(UINT32 looppoint)
 {
         (void)looppoint;
         return false;
 }
 
-UINT32 I_GetMusicLoopPoint(void)
+UINT32 I_GetSongLoopPoint(void)
 {
 	return 0;
 }
 
-boolean I_SetMusicPosition(UINT32 position)
+boolean I_SetSongPosition(UINT32 position)
 {
     (void)position;
     return false;
 }
 
-UINT32 I_GetMusicPosition(void)
+UINT32 I_GetSongPosition(void)
 {
     return 0;
 }
 
-boolean I_MusicPlaying(void)
+boolean I_SongPlaying(void)
 {
 	return false;
 }
 
-boolean I_MusicPaused(void)
+boolean I_SongPaused(void)
 {
 	return false;
 }
 
-musictype_t I_MusicType(void)
+musictype_t I_GetSongType(void)
 {
 	return MU_NONE;
 }
diff --git a/src/sdl/sdl_sound.c b/src/sdl/sdl_sound.c
index 97d7b9a3c..16e9fc90d 100644
--- a/src/sdl/sdl_sound.c
+++ b/src/sdl/sdl_sound.c
@@ -1649,17 +1649,17 @@ void I_StopSong(INT32 handle)
 #endif
 }
 
-boolean I_MusicPlaying(void)
+boolean I_SongPlaying(void)
 {
 	return musicStarted;
 }
 
-boolean I_MusicPaused(void)
+boolean I_SongPaused(void)
 {
 	return Mix_PausedMusic();
 }
 
-musictype_t I_MusicType(void)
+musictype_t I_GetSongType(void)
 {
 	return MU_NONE;
 }
@@ -1989,29 +1989,29 @@ boolean I_SetSongSpeed(float speed)
 	return false;
 }
 
-UINT32 I_GetMusicLength(void)
+UINT32 I_GetSongLength(void)
 {
 	return 0;
 }
 
-boolean I_SetMusicLoopPoint(UINT32 looppoint)
+boolean I_SetSongLoopPoint(UINT32 looppoint)
 {
         (void)looppoint;
         return false;
 }
 
-UINT32 I_GetMusicLoopPoint(void)
+UINT32 I_GetSongLoopPoint(void)
 {
 	return 0;
 }
 
-boolean I_SetMusicPosition(UINT32 position)
+boolean I_SetSongPosition(UINT32 position)
 {
 	(void)position;
 	return false;
 }
 
-UINT32 I_GetMusicPosition(void)
+UINT32 I_GetSongPosition(void)
 {
 	return 0;
 }
@@ -2027,11 +2027,11 @@ void I_SetInternalMusicVolume(UINT8 volume)
 	(void)volume;
 }
 
-void I_StopFadingMusic(void)
+void I_StopFadingSong(void)
 {
 }
 
-boolean I_FadeMusicFromLevel(UINT8 target_volume, UINT8 source_volume, UINT32 ms, boolean stopafterfade)
+boolean I_FadeSongFromLevel(UINT8 target_volume, UINT8 source_volume, UINT32 ms, boolean stopafterfade)
 {
 	(void)target_volume;
 	(void)source_volume;
@@ -2039,14 +2039,14 @@ boolean I_FadeMusicFromLevel(UINT8 target_volume, UINT8 source_volume, UINT32 ms
 	return false;
 }
 
-boolean I_FadeMusic(UINT8 target_volume, UINT32 ms)
+boolean I_FadeSong(UINT8 target_volume, UINT32 ms)
 {
 	(void)target_volume;
 	(void)ms;
 	return false;
 }
 
-boolean I_FadeOutStopMusic(UINT32 ms)
+boolean I_FadeOutStopSong(UINT32 ms)
 {
 	(void)ms;
 	return false;
diff --git a/src/win32/win_snd.c b/src/win32/win_snd.c
index ebad5ff61..ddf5ca413 100644
--- a/src/win32/win_snd.c
+++ b/src/win32/win_snd.c
@@ -468,12 +468,12 @@ void I_ResumeSong(INT32 handle)
 		FMR_MUSIC(FMOD_Channel_SetPaused(music_channel, false));
 }
 
-boolean I_MusicPlaying(void)
+boolean I_SongPlaying(void)
 {
 	return (boolean)music_stream;
 }
 
-boolean I_MusicPaused(void)
+boolean I_SongPaused(void)
 {
 	boolean fmpaused = false;
 	if (music_stream)
@@ -481,7 +481,7 @@ boolean I_MusicPaused(void)
 	return fmpaused;
 }
 
-musictype_t I_MusicType(void)
+musictype_t I_GetSongType(void)
 {
 	return MU_NONE;
 }
@@ -774,7 +774,7 @@ boolean I_SetSongSpeed(float speed)
 	return true;
 }
 
-UINT32 I_GetMusicLength()
+UINT32 I_GetSongLength()
 {
 	if (midimode)
 		return 0;
@@ -783,18 +783,18 @@ UINT32 I_GetMusicLength()
 	return length;
 }
 
-boolean I_SetMusicLoopPoint(UINT32 looppoint)
+boolean I_SetSongLoopPoint(UINT32 looppoint)
 {
         (void)looppoint;
         return false;
 }
 
-UINT32 I_GetMusicLoopPoint(void)
+UINT32 I_GetSongLoopPoint(void)
 {
 	return 0;
 }
 
-boolean I_SetMusicPosition(UINT32 position)
+boolean I_SetSongPosition(UINT32 position)
 {
 	if(midimode)
 		// Dummy out; this works for some MIDI, but not others.
@@ -814,7 +814,7 @@ boolean I_SetMusicPosition(UINT32 position)
 	}
 }
 
-UINT32 I_GetMusicPosition(void)
+UINT32 I_GetSongPosition(void)
 {
 	if(midimode)
 		// Dummy out because unsupported, even though FMOD does this correctly.
@@ -878,11 +878,11 @@ void I_SetInternalMusicVolume(UINT8 volume)
 	(void)volume;
 }
 
-void I_StopFadingMusic(void)
+void I_StopFadingSong(void)
 {
 }
 
-boolean I_FadeMusicFromLevel(UINT8 target_volume, UINT8 source_volume, UINT32 ms, boolean stopafterfade)
+boolean I_FadeSongFromLevel(UINT8 target_volume, UINT8 source_volume, UINT32 ms, boolean stopafterfade)
 {
 	(void)target_volume;
 	(void)source_volume;
@@ -890,14 +890,14 @@ boolean I_FadeMusicFromLevel(UINT8 target_volume, UINT8 source_volume, UINT32 ms
 	return false;
 }
 
-boolean I_FadeMusic(UINT8 target_volume, UINT32 ms)
+boolean I_FadeSong(UINT8 target_volume, UINT32 ms)
 {
 	(void)target_volume;
 	(void)ms;
 	return false;
 }
 
-boolean I_FadeOutStopMusic(UINT32 ms)
+boolean I_FadeOutStopSong(UINT32 ms)
 {
 	(void)ms;
 	return false;