diff --git a/assets/javascripts/discourse/templates/admin/plugins-discourse-patrons-plans-show.hbs b/assets/javascripts/discourse/templates/admin/plugins-discourse-patrons-plans-show.hbs
index 7c2905f..afe355a 100644
--- a/assets/javascripts/discourse/templates/admin/plugins-discourse-patrons-plans-show.hbs
+++ b/assets/javascripts/discourse/templates/admin/plugins-discourse-patrons-plans-show.hbs
@@ -3,23 +3,23 @@
 
 <form class="form-horizontal">
   <p>
-    <label for="name">{{i18n 'discourse_patrons.admin.plans.show.name'}}</label>
+    <label for="name">{{i18n 'discourse_patrons.admin.plans.plan.name'}}</label>
     {{input type="text" name="name" value=model.plan.name}}
   </p>
   <p>
-    <label for="amount">{{i18n 'discourse_patrons.admin.plans.show.amount'}}</label>
+    <label for="amount">{{i18n 'discourse_patrons.admin.plans.plan.amount'}}</label>
     {{input type="text" name="name" value=model.plan.amount}}
   </p>
   <p>
-    <label for="product">{{i18n 'discourse_patrons.admin.plans.show.product'}}</label>
+    <label for="product">{{i18n 'discourse_patrons.admin.plans.plan.product'}}</label>
     {{combo-box valueAttribute="value" content=model.products value=defaultProduct}}
   </p>
   <p>
-    <label for="interval">{{i18n 'discourse_patrons.admin.plans.show.interval'}}</label>
+    <label for="interval">{{i18n 'discourse_patrons.admin.plans.plan.interval'}}</label>
     {{combo-box valueAttribute="value" content=model.plan.intervals value=model.plan.interval}}
   </p>
 </form>
 
 <div class="buttons">
-  {{d-button label="discourse_patrons.admin.plans.show.create" action="createPlan" icon="plus"}}
+  {{d-button label="discourse_patrons.admin.plans.operations.create" action="createPlan" icon="plus"}}
 </div>
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 05cab60..e0c8cc1 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -74,19 +74,17 @@ en:
             active: Active
         plans:
           title: Plans
-          new: New Plan
-          show:
-            create: Create
-            name: Name
-            amount: Amount
-            interval: Interval
-          plan:
-            plan_id: Plan ID
-            nickname: Nickname
-            interval: Interval
-            amount: Amount
           operations:
+            create: Create New Plan
+            new: New Plan
             destroy:
               confirm: Are you sure you want to destroy this plan?
+          plan:
+            plan_id: Plan ID
+            name: Plan Name
+            nickname: Nickname
+            product: Product
+            interval: Interval
+            amount: Amount
         subscriptions:
           title: Subscriptions