diff --git a/Output/BackgroundMusic/background track license.txt b/Output/BackgroundMusic/DJad - Walking Alone - License.txt
similarity index 100%
rename from Output/BackgroundMusic/background track license.txt
rename to Output/BackgroundMusic/DJad - Walking Alone - License.txt
diff --git a/Output/BackgroundMusic/background track.mp3 b/Output/BackgroundMusic/DJad - Walking Alone.mp3
similarity index 100%
rename from Output/BackgroundMusic/background track.mp3
rename to Output/BackgroundMusic/DJad - Walking Alone.mp3
diff --git a/Vocaluxe/Base/CBackgroundMusic.cs b/Vocaluxe/Base/CBackgroundMusic.cs
index 17657e6a..44b39f27 100644
--- a/Vocaluxe/Base/CBackgroundMusic.cs
+++ b/Vocaluxe/Base/CBackgroundMusic.cs
@@ -120,7 +120,10 @@ namespace Vocaluxe.Base
         {
             get
             {
-                return _CurrentPlaylistElement.Artist + " - " + _CurrentPlaylistElement.Title;
+                if (_CurrentPlaylistElement.Artist != "" && _CurrentPlaylistElement.Title != "")
+                    return _CurrentPlaylistElement.Artist + " - " + _CurrentPlaylistElement.Title;
+                else
+                    return Path.GetFileNameWithoutExtension(_CurrentPlaylistElement.MusicFilePath);
             }
         }
 
@@ -519,7 +522,7 @@ class PlaylistElement
             if (_Song != null)
                 return _Song.Title;
                 
-            return "Unknown";
+            return "";
         }
     }
 
@@ -530,7 +533,7 @@ class PlaylistElement
             if (_Song != null)
                 return _Song.Artist;
                 
-            return "Unknown";
+            return "";
         }
     }