diff --git a/src/android/i_sound.c b/src/android/i_sound.c
index bf54c9ff0..1d16e4df3 100644
--- a/src/android/i_sound.c
+++ b/src/android/i_sound.c
@@ -70,17 +70,17 @@ void I_ShutdownMusic(void){}
 //  MUSIC PROPERTIES
 /// ------------------------
 
-musictype_t I_MusicType(void)
+musictype_t I_SongType(void)
 {
 	return MU_NONE;
 }
 
-boolean I_MusicPlaying(void)
+boolean I_SongPlaying(void)
 {
 	return false;
 }
 
-boolean I_MusicPaused(void)
+boolean I_SongPaused(void)
 {
 	return false;
 }
diff --git a/src/djgppdos/i_sound.c b/src/djgppdos/i_sound.c
index 339b469d3..5403aef17 100644
--- a/src/djgppdos/i_sound.c
+++ b/src/djgppdos/i_sound.c
@@ -408,7 +408,7 @@ void I_ShutdownMusic(void)
 //  MUSIC PROPERTIES
 /// ------------------------
 
-musictype_t I_MusicType(void)
+musictype_t I_SongType(void)
 {
 	if (currsong)
 		return MU_MID;
@@ -416,12 +416,12 @@ musictype_t I_MusicType(void)
 		return MU_NONE;
 }
 
-boolean I_MusicPlaying()
+boolean I_SongPlaying()
 {
 	return (boolean)currsong;
 }
 
-boolean I_MusicPaused()
+boolean I_SongPaused()
 {
 	return songpaused;
 }
diff --git a/src/dummy/i_sound.c b/src/dummy/i_sound.c
index fb325c59e..4bace7a41 100644
--- a/src/dummy/i_sound.c
+++ b/src/dummy/i_sound.c
@@ -69,17 +69,17 @@ void I_ShutdownMusic(void){}
 //  MUSIC PROPERTIES
 /// ------------------------
 
-musictype_t I_MusicType(void)
+musictype_t I_SongType(void)
 {
 	return MU_NONE;
 }
 
-boolean I_MusicPlaying(void)
+boolean I_SongPlaying(void)
 {
 	return false;
 }
 
-boolean I_MusicPaused(void)
+boolean I_SongPaused(void)
 {
 	return false;
 }
diff --git a/src/sdl/mixer_sound.c b/src/sdl/mixer_sound.c
index 521bcd033..9b84a1247 100644
--- a/src/sdl/mixer_sound.c
+++ b/src/sdl/mixer_sound.c
@@ -63,7 +63,7 @@
 UINT8 sound_started = false;
 
 static Mix_Music *music;
-static UINT8 music_volume, midi_volume, sfx_volume;
+static UINT8 music_volume, sfx_volume;
 static float loop_point;
 static boolean songpaused;
 
@@ -91,7 +91,7 @@ void I_StartupSound(void)
 	}
 
 	music = NULL;
-	music_volume = midi_volume = sfx_volume = 0;
+	music_volume = sfx_volume = 0;
 
 #if SDL_MIXER_VERSION_ATLEAST(1,2,11)
 	Mix_Init(MIX_INIT_FLAC|MIX_INIT_MOD|MIX_INIT_MP3|MIX_INIT_OGG);
diff --git a/src/sdl/sdl_sound.c b/src/sdl/sdl_sound.c
index 6a79220c2..887726ebb 100644
--- a/src/sdl/sdl_sound.c
+++ b/src/sdl/sdl_sound.c
@@ -1313,7 +1313,7 @@ void I_StartupSound(void)
 // MUSIC API.
 //
 
-musictype_t I_MusicType(void)
+musictype_t I_SongType(void)
 {
 #ifdef HAVE_MIXER
 #ifdef HAVE_LIBGME
@@ -1336,12 +1336,12 @@ musictype_t I_MusicType(void)
 #endif
 }
 
-boolean I_MusicPlaying(void)
+boolean I_SongPlaying(void)
 {
 	return music_started;
 }
 
-boolean I_MusicPaused(void)
+boolean I_SongPaused(void)
 {
 	return Mix_PausedMusic();
 }
@@ -1591,17 +1591,17 @@ void I_ShutdownMusic(void)
 //  MUSIC PROPERTIES
 /// ------------------------
 
-musictype_t I_MusicType(void)
+musictype_t I_SongType(void)
 {
 	return MU_NONE;
 }
 
-boolean I_MusicPlaying(void)
+boolean I_SongPlaying(void)
 {
 	return false;
 }
 
-boolean I_MusicPaused(void)
+boolean I_SongPaused(void)
 {
 	return false;
 }
diff --git a/src/win32/win_snd.c b/src/win32/win_snd.c
index 3dbe6c572..2960ff7d2 100644
--- a/src/win32/win_snd.c
+++ b/src/win32/win_snd.c
@@ -456,7 +456,7 @@ void I_ShutdownMusic(void)
 //  MUSIC PROPERTIES
 /// ------------------------
 
-musictype_t I_MusicType(void)
+musictype_t I_SongType(void)
 {
 #ifdef HAVE_LIBGME
 	if (gme)
@@ -491,12 +491,12 @@ musictype_t I_MusicType(void)
 		return MU_NONE;
 }
 
-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)
@@ -780,7 +780,7 @@ boolean I_PlaySong(boolean looping)
 #endif
 
 	FMR(FMOD_System_PlaySound(fsys, FMOD_CHANNEL_FREE, music_stream, false, &music_channel));
-	if (I_MusicType() != MU_MID)
+	if (I_SongType() != MU_MID)
 		FMR(FMOD_Channel_SetVolume(music_channel, midi_volume / 31.0));
 	else
 		FMR(FMOD_Channel_SetVolume(music_channel, music_volume / 31.0));
@@ -822,7 +822,7 @@ void I_SetMusicVolume(UINT8 volume)
 		return;
 
 	// volume is 0 to 31.
-	if (I_MusicType() == MU_MID)
+	if (I_SongType() == MU_MID)
 		music_volume = 31; // windows bug hack
 	else
 		music_volume = volume;