diff --git a/heat_dashboard/content/template_generator/templates/template_generator/index.html b/heat_dashboard/content/template_generator/templates/template_generator/index.html
index 356c2d3b..c138e9d6 100644
--- a/heat_dashboard/content/template_generator/templates/template_generator/index.html
+++ b/heat_dashboard/content/template_generator/templates/template_generator/index.html
@@ -4,7 +4,7 @@
 
 {% block page_header %}
     <div class="page-header" ng-cloak>
-        <h1>{$  'Generate Template' | translate $}</h1>
+        <h1>{$  'Template Generator' | translate $}</h1>
         <p>{$  'Please drag and drop resource icons into center canvas to define resource for template.' | translate $}</p>
     </div>
 {% endblock %}
@@ -30,8 +30,8 @@
                     </md-input-container>
                 </div>
                 <div ng-controller="horizon.dashboard.project.heat_dashboard.template_generator.TempModalController" style="display:inline-block">
-                    <md-tooltip style="font-size:12px !important;" md-direction="top">Generate Template</md-tooltip>
-                    <md-button class="md-fab md-mini md-primary" ng-click="open()" aria-label="Generate Template">
+                    <md-tooltip style="font-size:12px !important;" md-direction="top">Template Generator</md-tooltip>
+                    <md-button class="md-fab md-mini md-primary" ng-click="open()" aria-label="Template Generator">
                         <md-icon md-svg-src="{$ basePath $}css/img/icons/file-text-o.svg"></md-icon>
                     </md-button>
                 </div>
diff --git a/heat_dashboard/locale/ja/LC_MESSAGES/django.po b/heat_dashboard/locale/ja/LC_MESSAGES/django.po
index fed0eef8..b1a82c30 100644
--- a/heat_dashboard/locale/ja/LC_MESSAGES/django.po
+++ b/heat_dashboard/locale/ja/LC_MESSAGES/django.po
@@ -15,5 +15,5 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0\n"
 "X-Generator: Zanata 3.7.3\n"
 
-msgid "Generate Template"
+msgid "Template Generator"
 msgstr "テンプレートの生成"