diff --git a/dashboard-ui/advanced.html b/dashboard-ui/advanced.html
index c31c64108..3340ec3d9 100644
--- a/dashboard-ui/advanced.html
+++ b/dashboard-ui/advanced.html
@@ -11,7 +11,7 @@
 
                 <div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
                     <a href="#" data-role="button" class="ui-btn-active">General</a>
-                    <a href="encodingsettings.html" data-role="button">Encoding</a>
+                    <a href="encodingsettings.html" data-role="button">Transcoding</a>
                 </div>
                 <form id="advancedConfigurationForm">
 
diff --git a/dashboard-ui/encodingsettings.html b/dashboard-ui/encodingsettings.html
index 490b00fa8..fe94f9289 100644
--- a/dashboard-ui/encodingsettings.html
+++ b/dashboard-ui/encodingsettings.html
@@ -11,7 +11,7 @@
 
                 <div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
                     <a href="advanced.html" data-role="button">General</a>
-                    <a href="#" data-role="button" class="ui-btn-active">Encoding</a>
+                    <a href="#" data-role="button" class="ui-btn-active">Transcoding</a>
                 </div>
 
                 <form class="encodingSettingsForm">
@@ -19,7 +19,7 @@
                     <fieldset data-role="controlgroup">
                         <legend>Transcoder Quality:</legend>
                         <input type="radio" name="radioEncodingQuality" class="radioEncodingQuality" id="radioAuto" value="Auto">
-                        <label for="radioAuto">Auto<br /><span style="font-weight:normal;">The transcoder will decide quality itself.</span></label>
+                        <label for="radioAuto">Auto<br /><span style="font-weight:normal;">The transcoder will decide quality</span></label>
                         <input type="radio" name="radioEncodingQuality" class="radioEncodingQuality" id="radioHighSpeed" value="HighSpeed">
                         <label for="radioHighSpeed">Perfer higher speed encoding<br /><span style="font-weight:normal;">Lower quality, but faster transcodes</span></label>
                         <input type="radio" name="radioEncodingQuality" class="radioEncodingQuality" id="radioHighQuality" value="HighQuality">
@@ -32,7 +32,7 @@
                     <ul data-role="listview" class="ulForm">
                         <li>
                             <input type="checkbox" id="chkEnableDebugEncodingLogging" name="chkEnableDebugEncodingLogging" data-mini="true" />
-                            <label for="chkEnableDebugEncodingLogging">Enable debug encoding logging</label>
+                            <label for="chkEnableDebugEncodingLogging">Enable debug transcoding logging</label>
                             <div class="fieldDescription">This will create very large log files and is only recommended as needed for troubleshooting purposes.</div>
                         </li>
                         <li>