diff --git a/application/controllers/admin/templates.php b/application/controllers/admin/templates.php
index addf3e5d0eb..e0677bc72b7 100644
--- a/application/controllers/admin/templates.php
+++ b/application/controllers/admin/templates.php
@@ -30,7 +30,7 @@ public function runWithParams($params)
             parent::runWithParams($params);
         }else{
             Yii::app()->setFlashMessage(gT("We are sorry but you don't have permissions to do this."),'error');
-            $this->getController()->redirect(array("admin/templateoptions"));
+            $this->getController()->redirect(array("admin/themeoptions"));
         }
     }
 
@@ -70,7 +70,7 @@ public function templatezip($templatename)
             }
         }else{
             Yii::app()->setFlashMessage(gT("We are sorry but you don't have permissions to do this."),'error');
-            $this->getController()->redirect(array("admin/templateoptions"));
+            $this->getController()->redirect(array("admin/themeoptions"));
         }
     }
 
@@ -241,7 +241,7 @@ public function upload()
             $this->_renderWrappedTemplate('templates', $aViewUrls, $aData);
         }else{
             Yii::app()->setFlashMessage(gT("We are sorry but you don't have permissions to do this."),'error');
-            $this->getController()->redirect(array("admin/templateoptions"));
+            $this->getController()->redirect(array("admin/themeoptions"));
         }
 
 
@@ -468,7 +468,7 @@ public function templaterename()
                         Yii::app()->user->setFlash('error',sprintf(gT("Template '%s' could not be found."), $sOldName));
                     }
 
-                    $this->getController()->redirect(array('admin/templateoptions'));
+                    $this->getController()->redirect(array('admin/themeoptions'));
                 }
             }
         }else{
@@ -571,7 +571,7 @@ public function delete($templatename)
             Yii::app()->setFlashMessage(gT("We are sorry but you don't have permissions to do this."),'error');
         }
         // Redirect with default templatename, editfile and screenname
-        $this->getController()->redirect(array("admin/templateoptions"));
+        $this->getController()->redirect(array("admin/themeoptions"));
     }
 
     /**
diff --git a/application/helpers/admin/template_helper.php b/application/helpers/admin/template_helper.php
index 5cee685255a..4e1f7c7ca58 100644
--- a/application/helpers/admin/template_helper.php
+++ b/application/helpers/admin/template_helper.php
@@ -65,7 +65,7 @@ function mkdir_p($target){
     }
 }
 
-function templateoptions($optionarray, $selectedvalue) {
+function themeoptions($optionarray, $selectedvalue) {
     $return='';
     foreach ($optionarray as $arkey=>$arvalue) {
         $return .= "<option value='".HTMLEscape($arkey)."'";
diff --git a/application/models/TemplateConfiguration.php b/application/models/TemplateConfiguration.php
index cb5ddbff725..dcf82bfd0e6 100644
--- a/application/models/TemplateConfiguration.php
+++ b/application/models/TemplateConfiguration.php
@@ -660,7 +660,7 @@ protected function getTemplateForPath($oRTemplate, $sPath )
                 //throw new Exception("can't find a template for template '{$oRTemplate->template_name}' for path '$sPath'.");
                 TemplateConfiguration::uninstall($this->template_name);
                 Yii::app()->setFlashMessage(sprintf(gT("Templates '%s' has been uninstalled because it's not compatible with this LimeSurvey version."), $this->template_name), 'error');
-                Yii::app()->getController()->redirect(array("admin/templateoptions"));
+                Yii::app()->getController()->redirect(array("admin/themeoptions"));
                 break;
             }
             $oRTemplate = $oMotherTemplate;
diff --git a/application/models/TemplateManifest.php b/application/models/TemplateManifest.php
index 7e3490c8838..7c77aed314d 100644
--- a/application/models/TemplateManifest.php
+++ b/application/models/TemplateManifest.php
@@ -271,7 +271,7 @@ public static function importManifest($sTemplateName, $aDatas=array()  )
 
         if ($bExtends && !Template::model()->findByPk($bExtends)){
             Yii::app()->setFlashMessage(sprintf(gT("You can't import template '%s' because '%s'  is not installed."), $sTemplateName, $bExtends ), 'error');
-            Yii::app()->getController()->redirect(array("admin/templateoptions"));
+            Yii::app()->getController()->redirect(array("admin/themeoptions"));
         }
 
         // Metadas is never inherited
diff --git a/application/views/admin/super/_configuration_menu.php b/application/views/admin/super/_configuration_menu.php
index 96ba9e85dfb..4195bd1afa7 100644
--- a/application/views/admin/super/_configuration_menu.php
+++ b/application/views/admin/super/_configuration_menu.php
@@ -134,7 +134,7 @@
                 <?php if(Permission::model()->hasGlobalPermission('templates','read')): ?>
                     <!-- Template Editor -->
                     <li class="dropdown-item">
-                        <a href="<?php echo $this->createUrl("admin/templateoptions"); ?>">
+                        <a href="<?php echo $this->createUrl("admin/themeoptions"); ?>">
                             <?php eT("Template list");?>
                         </a>
                     </li>
diff --git a/application/views/admin/survey/surveySummary_view.php b/application/views/admin/survey/surveySummary_view.php
index a8a85649e27..9ac0bb4997e 100644
--- a/application/views/admin/survey/surveySummary_view.php
+++ b/application/views/admin/survey/surveySummary_view.php
@@ -526,7 +526,7 @@
                             <?php $templatename = $oSurvey->template;
                             if (Permission::model()->hasGlobalPermission('templates','read'))
                             {
-                                $sTemplateOptionsUrl = $this->createUrl("admin/templateoptions/sa/updatesurvey",array('surveyid'=>$oSurvey->sid, "gsid"=>$oSurvey->gsid)); 
+                                $sTemplateOptionsUrl = $this->createUrl("admin/themeoptions/sa/updatesurvey",array('surveyid'=>$oSurvey->sid, "gsid"=>$oSurvey->gsid)); 
                                 $sTemplateEditorUrl = $this->createUrl("admin/templates/sa/view",array('templatename' => $oSurvey->template)); 
                                 //$sTemplateEditorUrl = $this->createUrl("admin/templates/sa/view",array('editfile'=>'layout_first_page.twig', "screenname"=>'welcome', 'template' => $oSurvey->template)); 
                                 ?>
diff --git a/application/views/admin/surveysgroups/update.php b/application/views/admin/surveysgroups/update.php
index 25b4836b108..26da2dea3bc 100644
--- a/application/views/admin/surveysgroups/update.php
+++ b/application/views/admin/surveysgroups/update.php
@@ -42,8 +42,8 @@
             <div id="templateSettingsFortThisGroup" class="tab-pane">
                 <?php
                     if (is_a($templateOptionsModel, 'TemplateConfiguration')){
-                    //    $this->renderPartial('./templateoptions/update', array('model'=>$templateOptionsModel, 'templateOptionPage'=>$templateOptionPage));
-                        $this->renderPartial('./templateoptions/index', array('model'=>$templateOptionsModel, 'bFromSurveyGroup'=>true));
+                    //    $this->renderPartial('./themeoptions/update', array('model'=>$templateOptionsModel, 'templateOptionPage'=>$templateOptionPage));
+                        $this->renderPartial('./themeoptions/index', array('model'=>$templateOptionsModel, 'bFromSurveyGroup'=>true));
                     }
                 ?>
             </div>
diff --git a/application/views/admin/templates/templateeditorbar_view.php b/application/views/admin/templates/templateeditorbar_view.php
index 0177c15f01a..3ea366d289b 100644
--- a/application/views/admin/templates/templateeditorbar_view.php
+++ b/application/views/admin/templates/templateeditorbar_view.php
@@ -200,7 +200,7 @@ function copyprompt(text, defvalue, copydirectory, action)
                 <select class="listboxtemplates form-control" id='templatedir' name='templatedir' onchange="javascript: var uri = new Uri('<?php
                     // Don't put 'sa' into the URL dirctly because YIi will then try to use filenames directly in the path because of the route
                     echo $this->createUrl("admin/templates",array('sa'=>'view','editfile'=>$relativePathEditfile,'screenname'=>$screenname)); ?>'); uri.addQueryParam('templatename',this.value); window.open(uri.toString(), '_top')">
-                    <?php echo templateoptions($templates, $templatename); ?>
+                    <?php echo themeoptions($templates, $templatename); ?>
                 </select>
             </div>
 
@@ -229,7 +229,7 @@ function copyprompt(text, defvalue, copydirectory, action)
                 <?php endif;?>
 
             <?php if(isset($fullpagebar['returnbutton'])):?>
-                <a class="btn btn-default" href="<?php echo $this->createUrl("admin/templateoptions"); ?>" role="button">
+                <a class="btn btn-default" href="<?php echo $this->createUrl("admin/themeoptions"); ?>" role="button">
                     <span class="fa fa-backward" ></span>
                     &nbsp;&nbsp;
                     <?php eT("Return to template list"); ?>
diff --git a/application/views/admin/themeoptions/index.php b/application/views/admin/themeoptions/index.php
index 211d41cd6b3..4a26147fd56 100644
--- a/application/views/admin/themeoptions/index.php
+++ b/application/views/admin/themeoptions/index.php
@@ -2,7 +2,7 @@
 /* @var $this AdminController */
 /* @var $dataProvider CActiveDataProvider */
 
-// TODO: rename to template_list.php
+// TODO: rename to template_list.php and move to template controller
 
 // DO NOT REMOVE This is for automated testing to validate we see that page
 echo viewHelper::getViewTestTag('templateOptions');
@@ -26,7 +26,7 @@
                     ),
                 )
             ));
-            echo '<h3>'.gT('Installed templates:').'</h3>';
+            echo '<h3>'.gT('Installed survey themes:').'</h3>';
         }
 
 
@@ -91,7 +91,7 @@
     </div>
 
     <?php if (count($model->templatesWithNoDb) > 0 && !$bFromSurveyGroup):?>
-        <h3><?php eT('Available templates:'); ?></h3>
+        <h3><?php eT('Available survey themes:'); ?></h3>
         <div class="row">
             <div class="col-sm-12 content-right">
 
@@ -110,7 +110,7 @@
                                     <td class="col-md-1"><?php echo $oTemplate->preview; ?></td>
                                     <td class="col-md-2"><?php echo $oTemplate->sTemplateName; ?></td>
                                     <td class="col-md-3"><?php echo $oTemplate->config->metadatas->description; ?></td>
-                                    <td class="col-md-2"><?php eT('XML template');?></td>
+                                    <td class="col-md-2"><?php eT('XML themes');?></td>
                                     <td class="col-md-2"><?php echo $oTemplate->config->metadatas->extends; ?></td>
                                     <td class="col-md-1"><?php echo $oTemplate->buttons; ?></td>
                                 </tr>
diff --git a/application/views/admin/themeoptions/update.php b/application/views/admin/themeoptions/update.php
index 1f60fef535d..ee247f01950 100644
--- a/application/views/admin/themeoptions/update.php
+++ b/application/views/admin/themeoptions/update.php
@@ -7,7 +7,7 @@
 
 ?>
 
-<div class="row h1"><?php echo sprintf(gT('Update template options for %s'),'<em>' . $model->template_name . '</em>'); ?></div>
+<div class="row h1"><?php echo sprintf(gT('Update survey theme options for %s'),'<em>' . $model->template_name . '</em>'); ?></div>
 <!-- Using bootstrap tabs to differ between just hte options and advanced direct settings -->
 <div class="row">
     <!-- Nav tabs -->
@@ -34,7 +34,7 @@
                  if($jsonError !== JSON_ERROR_NONE && $model->options !== 'inherit')
                  {
                      //return
-                    echo "<div class='ls-flex-column fill'><h4>".gT('There are no simple options in this template.')."</h4></div>";
+                    echo "<div class='ls-flex-column fill'><h4>".gT('There are no simple options in this survey theme.')."</h4></div>";
                  }
                  //if however there is no error in the parsing of the json string go forth and render the form
                  else
diff --git a/themes/survey/default/options/options.twig b/themes/survey/default/options/options.twig
index e54b4d7d559..1bbcdd6d560 100644
--- a/themes/survey/default/options/options.twig
+++ b/themes/survey/default/options/options.twig
@@ -9,9 +9,9 @@
     other free or open source software licenses.
     See COPYRIGHT.php for copyright notices and details.
 
-    (¯`·._.·(¯`·._.· Default survey template options ._.·´¯)·._.·´¯)
+    (¯`·._.·(¯`·._.· Default survey Theme options ._.·´¯)·._.·´¯)
 
-    This is the form for the option parameters of the basic default template.
+    This is the form for the option parameters of the basic default theme.
 
 #}