diff --git a/kallithea/public/js/base.js b/kallithea/public/js/base.js
--- a/kallithea/public/js/base.js
+++ b/kallithea/public/js/base.js
@@ -914,14 +914,14 @@ var initCodeMirror = function(textarea_i
             $('#editor_container').show();
             $('#upload_file_container').hide();
             $('#filename_container').show();
-            $('#set_mode_header').show();
+            $('#mimetype_header').show();
         });
 
     $('#upload_file_enable').click(function(){
             $('#editor_container').hide();
             $('#upload_file_container').show();
             $('#filename_container').hide();
-            $('#set_mode_header').hide();
+            $('#mimetype_header').hide();
         });
 
     return myCodeMirror
diff --git a/kallithea/templates/files/files_add.html b/kallithea/templates/files/files_add.html
--- a/kallithea/templates/files/files_add.html
+++ b/kallithea/templates/files/files_add.html
@@ -44,14 +44,14 @@ ${self.repo_context_bar('files')}
                   ${_('or')} <div class="btn btn-small" id="upload_file_enable">${_('Upload File')}</div>
               </span>
               <span id="upload_file_container" class="reviewer_ac" style="display:none">
-                  <input type="file"  size="20" name="upload_file" id="upload_file">
+                  <input type="file" size="20" name="upload_file" id="upload_file">
                   ${_('or')} <div class="btn btn-small" id="file_enable">${_('Create New File')}</div>
               </span>
           </h3>
             <div id="body" class="codeblock">
-            <div class="code-header" id="set_mode_header">
-                <label class="commit" for="set_mode">${_('New file mode')}</label>
-                <select id="set_mode" name="set_mode"/>
+            <div class="code-header" id="mimetype_header">
+                <label class="commit" for="mimetype">${_('New file type')}</label>
+                <select id="mimetype" name="mimetype"/>
             </div>
                 <div id="editor_container">
                     <pre id="editor_pre"></pre>
@@ -71,7 +71,7 @@ ${self.repo_context_bar('files')}
                     var myCodeMirror = initCodeMirror('editor', "${request.script_name}", reset_url);
 
                     //inject new modes, based on codeMirrors modeInfo object
-                    $('#set_mode').each(function(){
+                    $('#mimetype').each(function(){
                         var modes_select = this;
                         var index = 1;
                         for(var i=0;i<CodeMirror.modeInfo.length;i++){
@@ -87,7 +87,7 @@ ${self.repo_context_bar('files')}
                             }
                         }
                     });
-                    $('#set_mode').change(function(e){
+                    $('#mimetype').change(function(e){
                         var selected = e.currentTarget;
                         var node = selected.options[selected.selectedIndex];
                         var detected_mode = CodeMirror.findModeByMIME(node.value);
@@ -107,7 +107,7 @@ ${self.repo_context_bar('files')}
                             var detected_mode = CodeMirror.findModeByExtension(file_data['ext']) || CodeMirror.findModeByMIME('text/plain');
                             if (detected_mode){
                                 setCodeMirrorMode(myCodeMirror, detected_mode);
-                                $('#set_mode').val(detected_mode.mime);
+                                $('#mimetype').val(detected_mode.mime);
                             }
                         }
                     });
diff --git a/kallithea/templates/files/files_edit.html b/kallithea/templates/files/files_edit.html
--- a/kallithea/templates/files/files_edit.html
+++ b/kallithea/templates/files/files_edit.html
@@ -55,8 +55,8 @@ ${self.repo_context_bar('files')}
                       % endif
                     </div>
                 </div>
-                <label class="commit" for="set_mode">${_('Editing file')}: ${c.file.unicode_path}</label>
-                <select id="set_mode" name="set_mode"/>
+                <label class="commit" for="mimetype">${_('Editing file')}: ${c.file.unicode_path}</label>
+                <select id="mimetype" name="mimetype"/>
             </div>
                 <pre id="editor_pre"></pre>
                 <textarea id="editor" name="content" style="display:none">${h.escape(c.file.content)|n}</textarea>
@@ -78,7 +78,7 @@ ${self.repo_context_bar('files')}
         var myCodeMirror = initCodeMirror('editor', "${request.script_name}", reset_url);
 
        //inject new modes, based on codeMirrors modeInfo object
-        $('#set_mode').each(function(){
+        $('#mimetype').each(function(){
             var modes_select = this;
             var index = 1;
             for(var i=0;i<CodeMirror.modeInfo.length;i++){
@@ -98,10 +98,10 @@ ${self.repo_context_bar('files')}
         var detected_mode = CodeMirror.findModeByExtension("${c.file.extension}");
         if(detected_mode){
             setCodeMirrorMode(myCodeMirror, detected_mode);
-            $($('#set_mode option[value="'+detected_mode.mime+'"]')[0]).prop('selected', true);
+            $($('#mimetype option[value="'+detected_mode.mime+'"]')[0]).prop('selected', true);
         }
 
-        $('#set_mode').on('change', function(e){
+        $('#mimetype').on('change', function(e){
             var selected = e.currentTarget;
             var node = selected.options[selected.selectedIndex];
             var detected_mode = CodeMirror.findModeByMIME(node.value);