diff --git a/src/TED/TED.Program/Options.cs b/src/TED/TED.Program/Options.cs
index 0db5b75..d1787f6 100644
--- a/src/TED/TED.Program/Options.cs
+++ b/src/TED/TED.Program/Options.cs
@@ -37,8 +37,8 @@ namespace TED.Program
                         new List<string>()
                         {
                          Tokenizer.ReplaceTokens("USERNAME: @userName"),
-                         Tokenizer.ReplaceTokens("DEVICE NAME: @machineName"),
-                         Tokenizer.ReplaceTokens("OS: @os"),
+                         Tokenizer.ReplaceTokens("MACHINE NAME: @machineName"),
+                         Tokenizer.ReplaceTokens("OS: @osName"),
                         },
                         -1,
                         StringAlignment.Near,