diff --git a/source/FreeplayState.hx b/source/FreeplayState.hx
index deb6099..7d15acf 100644
--- a/source/FreeplayState.hx
+++ b/source/FreeplayState.hx
@@ -203,14 +203,10 @@ class FreeplayState extends MusicBeatState
 		if (accepted)
 		{
 			// pre lowercasing the song name
-			var songLowercase = switch (songs[curSelected].songName)
-			{
-				case 'Dad Battle':
-					StringTools.replace(songs[curSelected].songName," ", "").toLowerCase();
-				case 'Philly Nice':
-					StringTools.replace(songs[curSelected].songName," Nice", "").toLowerCase();
-				default:
-					StringTools.replace(songs[curSelected].songName," ", "-").toLowerCase();
+			var songLowercase = StringTools.replace(PlayState.SONG.song, " ", "-").toLowerCase();
+			switch (songLowercase) {
+				case 'dad-battle': songLowercase = 'dadbattle';
+				case 'philly-nice': songLowercase = 'philly';
 			}
 			
 			trace(songLowercase);
diff --git a/source/Paths.hx b/source/Paths.hx
index 9489d97..3698dd8 100644
--- a/source/Paths.hx
+++ b/source/Paths.hx
@@ -97,28 +97,20 @@ class Paths
 
 	inline static public function voices(song:String)
 	{
-		var songLowercase = switch (song)
-			{
-				case 'Dad Battle':
-					StringTools.replace(song," ", "").toLowerCase();
-				case 'Philly Nice':
-					StringTools.replace(song," Nice", "").toLowerCase();
-				default:
-					StringTools.replace(song," ", "-").toLowerCase();
+		var songLowercase = StringTools.replace(PlayState.SONG.song, " ", "-").toLowerCase();
+			switch (songLowercase) {
+				case 'dad-battle': songLowercase = 'dadbattle';
+				case 'philly-nice': songLowercase = 'philly';
 			}
 		return 'songs:assets/songs/${songLowercase}/Voices.$SOUND_EXT';
 	}
 
 	inline static public function inst(song:String)
 	{
-		var songLowercase = switch (song)
-			{
-				case 'Dad Battle':
-					StringTools.replace(song," ", "").toLowerCase();
-				case 'Philly Nice':
-					StringTools.replace(song," Nice", "").toLowerCase();
-				default:
-					StringTools.replace(song," ", "-").toLowerCase();
+		var songLowercase = StringTools.replace(PlayState.SONG.song, " ", "-").toLowerCase();
+			switch (songLowercase) {
+				case 'dad-battle': songLowercase = 'dadbattle';
+				case 'philly-nice': songLowercase = 'philly';
 			}
 		return 'songs:assets/songs/${songLowercase}/Inst.$SOUND_EXT';
 	}
diff --git a/source/PlayState.hx b/source/PlayState.hx
index 0a71c71..559071c 100644
--- a/source/PlayState.hx
+++ b/source/PlayState.hx
@@ -237,14 +237,10 @@ class PlayState extends MusicBeatState
 		repReleases = 0;
 
 		// pre lowercasing the song name (create)
-		var songLowercase = switch (PlayState.SONG.song)
-			{
-				case 'Dad Battle':
-					StringTools.replace(PlayState.SONG.song," ", "").toLowerCase();
-				case 'Philly Nice':
-					StringTools.replace(PlayState.SONG.song," Nice", "").toLowerCase();
-				default:
-					StringTools.replace(PlayState.SONG.song," ", "-").toLowerCase();
+		var songLowercase = StringTools.replace(PlayState.SONG.song, " ", "-").toLowerCase();
+			switch (songLowercase) {
+				case 'dad-battle': songLowercase = 'dadbattle';
+				case 'philly-nice': songLowercase = 'philly';
 			}
 		
 		#if windows
@@ -1083,14 +1079,10 @@ class PlayState extends MusicBeatState
 		senpaiEvil.screenCenter();
 
 		// pre lowercasing the song name (schoolIntro)
-		var songLowercase = switch (PlayState.SONG.song)
-			{
-				case 'Dad Battle':
-					StringTools.replace(PlayState.SONG.song," ", "").toLowerCase();
-				case 'Philly Nice':
-					StringTools.replace(PlayState.SONG.song," Nice", "").toLowerCase();
-				default:
-					StringTools.replace(PlayState.SONG.song," ", "-").toLowerCase();
+		var songLowercase = StringTools.replace(PlayState.SONG.song, " ", "-").toLowerCase();
+			switch (songLowercase) {
+				case 'dad-battle': songLowercase = 'dadbattle';
+				case 'philly-nice': songLowercase = 'philly';
 			}
 		if (songLowercase == 'roses' || songLowercase == 'thorns')
 		{
@@ -1390,14 +1382,10 @@ class PlayState extends MusicBeatState
 		var playerCounter:Int = 0;
 
 		// pre lowercasing the song name (generateSong)
-		var songLowercase = switch (PlayState.SONG.song)
-			{
-				case 'Dad Battle':
-					StringTools.replace(PlayState.SONG.song," ", "").toLowerCase();
-				case 'Philly Nice':
-					StringTools.replace(PlayState.SONG.song," Nice", "").toLowerCase();
-				default:
-					StringTools.replace(PlayState.SONG.song," ", "-").toLowerCase();
+		var songLowercase = StringTools.replace(PlayState.SONG.song, " ", "-").toLowerCase();
+			switch (songLowercase) {
+				case 'dad-battle': songLowercase = 'dadbattle';
+				case 'philly-nice': songLowercase = 'philly';
 			}
 		// Per song offset check
 		#if windows
@@ -2531,26 +2519,18 @@ class PlayState extends MusicBeatState
 
 					trace('LOADING NEXT SONG');
 					// pre lowercasing the next story song name
-					var nextSongLowercase = switch (PlayState.storyPlaylist[0])
-					{
-						case 'Dad Battle':
-							StringTools.replace(PlayState.storyPlaylist[0]," ", "").toLowerCase();
-						case 'Philly Nice':
-							StringTools.replace(PlayState.storyPlaylist[0]," Nice", "").toLowerCase();
-						default:
-							StringTools.replace(PlayState.storyPlaylist[0]," ", "-").toLowerCase();
-					}
+					var songLowercase = StringTools.replace(PlayState.storyPlaylist[0], " ", "-").toLowerCase();
+						switch (songLowercase) {
+							case 'dad-battle': songLowercase = 'dadbattle';
+							case 'philly-nice': songLowercase = 'philly';
+						}
 					trace(nextSongLowercase + difficulty);
 
 					// pre lowercasing the song name (endSong)
-					var songLowercase = switch (PlayState.SONG.song)
-					{
-						case 'Dad Battle':
-							StringTools.replace(PlayState.SONG.song," ", "").toLowerCase();
-						case 'Philly Nice':
-							StringTools.replace(PlayState.SONG.song," Nice", "").toLowerCase();
-						default:
-							StringTools.replace(PlayState.SONG.song," ", "-").toLowerCase();
+					var songLowercase = StringTools.replace(PlayState.SONG.song, " ", "-").toLowerCase();
+					switch (songLowercase) {
+						case 'dad-battle': songLowercase = 'dadbattle';
+						case 'philly-nice': songLowercase = 'philly';
 					}
 					if (songLowercase == 'eggnog')
 					{
diff --git a/source/Song.hx b/source/Song.hx
index b78ffa8..13205e5 100644
--- a/source/Song.hx
+++ b/source/Song.hx
@@ -48,15 +48,11 @@ class Song
 	{
 		trace(jsonInput);
 		// pre lowercasing the folder name
-		var folderLowercase = switch (folder)
-			{
-				case 'Dad Battle':
-					StringTools.replace(folder," ", "").toLowerCase();
-				case 'Philly Nice':
-					StringTools.replace(folder," Nice", "").toLowerCase();
-				default:
-					StringTools.replace(folder," ", "-").toLowerCase();
-			}
+		var folderLowercase = StringTools.replace(folder, " ", "-").toLowerCase();
+					switch (folderLowercase) {
+						case 'dad-battle': folderLowercase = 'dadbattle';
+						case 'philly-nice': folderLowercase = 'philly';
+					}
 		// pre lowercasing the jsonInput name
 		var jsonInputLowercase = folderLowercase + StringTools.replace(jsonInput,folder.toLowerCase(), "").toLowerCase();