diff --git a/MediaBrowser.Model/Entities/MediaStream.cs b/MediaBrowser.Model/Entities/MediaStream.cs
index 868f6b64f..af7a034fe 100644
--- a/MediaBrowser.Model/Entities/MediaStream.cs
+++ b/MediaBrowser.Model/Entities/MediaStream.cs
@@ -75,15 +75,12 @@ namespace MediaBrowser.Model.Entities
                     {
                         attributes.Add(StringHelper.ToStringCultureInvariant(Channels.Value) + " ch");
                     }
-
-                    string name = string.Join(" ", attributes.ToArray());
-
                     if (IsDefault)
                     {
-                        name += " (D)";
+                        attributes.Add("Default");
                     }
 
-                    return name;
+                    return string.Join(" ", attributes.ToArray());
                 }
 
                 if (Type == MediaStreamType.Subtitle)
@@ -94,27 +91,17 @@ namespace MediaBrowser.Model.Entities
                     {
                         attributes.Add(StringHelper.FirstToUpper(Language));
                     }
-                    if (!string.IsNullOrEmpty(Codec))
-                    {
-                        attributes.Add(Codec);
-                    }
-
-                    string name = string.Join(" ", attributes.ToArray());
-
                     if (IsDefault)
                     {
-                        name += " (D)";
+                        attributes.Add("Default");
                     }
 
                     if (IsForced)
                     {
-                        name += " (F)";
+                        attributes.Add("Forced");
                     }
 
-                    if (IsExternal)
-                    {
-                        name += " (EXT)";
-                    }
+                    string name = string.Join(" ", attributes.ToArray());
 
                     return name;
                 }