diff --git a/apps/main.c b/apps/main.c
index a9fec9b786..7a29e90ab0 100644
--- a/apps/main.c
+++ b/apps/main.c
@@ -206,7 +206,7 @@ int main(void)
         int fd = open(ROCKBOX_DIR"/playername.txt", O_CREAT|O_WRONLY|O_TRUNC, 0666);
         if(fd >= 0)
         {
-            fdprintf(fd, "%s!", str(LANG_ROCKBOX_TITLE));
+            fdprintf(fd, "%s", MODEL_NAME);
             close(fd);
         }
     }
diff --git a/manual/advanced_topics/main.tex b/manual/advanced_topics/main.tex
index a6654d4ee9..7d6bb0ae0b 100755
--- a/manual/advanced_topics/main.tex
+++ b/manual/advanced_topics/main.tex
@@ -40,8 +40,8 @@ It is not possible to change this setting via the settings menu.
 
 Some themes show a customizable playername in the Whats Playing Screen.
 Edit the first line of \fname{/.rockbox/playername.txt} to show your own message
-or leave an empty file to disable the feature, deleting the file will generate a new
-playername.txt file containing 'Rockbox!' next boot.
+or leave an empty file to disable the feature. Deleting the file will generate a new
+playername.txt file containing ``\playername'' on the next boot.
 
 \subsection{\label{ref:OpenPlugins}Open Plugin Menu Items}