diff --git a/assets/javascripts/discourse/controllers/s-index.js.es6 b/assets/javascripts/discourse/controllers/s-index.js.es6
index 9027ae2..0fac1bf 100644
--- a/assets/javascripts/discourse/controllers/s-index.js.es6
+++ b/assets/javascripts/discourse/controllers/s-index.js.es6
@@ -12,7 +12,7 @@ export default Ember.Controller.extend({
     },
 
     paymentSuccessHandler(/* paymentIntentId */) {
-      bootbox.alert(I18n.t("discourse_patrons.transactions.payment.success"));
+      bootbox.alert(I18n.t("discourse_subscriptions.transactions.payment.success"));
       this.transitionToRoute(
         "user.billing",
         Discourse.User.current().username.toLowerCase()
diff --git a/assets/javascripts/discourse/controllers/s-subscribe-show.js.es6 b/assets/javascripts/discourse/controllers/s-subscribe-show.js.es6
index 08d1483..d042d64 100644
--- a/assets/javascripts/discourse/controllers/s-subscribe-show.js.es6
+++ b/assets/javascripts/discourse/controllers/s-subscribe-show.js.es6
@@ -41,7 +41,7 @@ export default Ember.Controller.extend({
               .save()
               .then(() => {
                 bootbox.alert(
-                  I18n.t("discourse_patrons.transactions.payment.success")
+                  I18n.t("discourse_subscriptions.transactions.payment.success")
                 );
                 this.transitionToRoute(
                   "user.subscriptions",
diff --git a/assets/javascripts/discourse/routes/admin-plugins-discourse-subscriptions-products-index.js.es6 b/assets/javascripts/discourse/routes/admin-plugins-discourse-subscriptions-products-index.js.es6
index 8a2d6f1..bd9d389 100644
--- a/assets/javascripts/discourse/routes/admin-plugins-discourse-subscriptions-products-index.js.es6
+++ b/assets/javascripts/discourse/routes/admin-plugins-discourse-subscriptions-products-index.js.es6
@@ -8,7 +8,7 @@ export default Discourse.Route.extend({
   actions: {
     destroyProduct(product) {
       bootbox.confirm(
-        I18n.t("discourse_patrons.admin.products.operations.destroy.confirm"),
+        I18n.t("discourse_subscriptions.admin.products.operations.destroy.confirm"),
         I18n.t("no_value"),
         I18n.t("yes_value"),
         confirmed => {
diff --git a/assets/javascripts/discourse/routes/admin-plugins-discourse-subscriptions-products-show.js.es6 b/assets/javascripts/discourse/routes/admin-plugins-discourse-subscriptions-products-show.js.es6
index a9dbdd6..513cefd 100644
--- a/assets/javascripts/discourse/routes/admin-plugins-discourse-subscriptions-products-show.js.es6
+++ b/assets/javascripts/discourse/routes/admin-plugins-discourse-subscriptions-products-show.js.es6
@@ -20,7 +20,7 @@ export default Discourse.Route.extend({
   actions: {
     destroyPlan(plan) {
       bootbox.confirm(
-        I18n.t("discourse_patrons.admin.plans.operations.destroy.confirm"),
+        I18n.t("discourse_subscriptions.admin.plans.operations.destroy.confirm"),
         I18n.t("no_value"),
         I18n.t("yes_value"),
         confirmed => {
diff --git a/assets/javascripts/discourse/routes/admin-plugins-discourse-subscriptions-subscriptions.js.es6 b/assets/javascripts/discourse/routes/admin-plugins-discourse-subscriptions-subscriptions.js.es6
index 9f834e4..c04ae6b 100644
--- a/assets/javascripts/discourse/routes/admin-plugins-discourse-subscriptions-subscriptions.js.es6
+++ b/assets/javascripts/discourse/routes/admin-plugins-discourse-subscriptions-subscriptions.js.es6
@@ -9,7 +9,7 @@ export default Discourse.Route.extend({
     cancelSubscription(subscription) {
       bootbox.confirm(
         I18n.t(
-          "discourse_patrons.user.subscriptions.operations.destroy.confirm"
+          "discourse_subscriptions.user.subscriptions.operations.destroy.confirm"
         ),
         I18n.t("no_value"),
         I18n.t("yes_value"),
diff --git a/assets/javascripts/discourse/routes/user-subscriptions.js.es6 b/assets/javascripts/discourse/routes/user-subscriptions.js.es6
index 1baf8c3..74dc343 100644
--- a/assets/javascripts/discourse/routes/user-subscriptions.js.es6
+++ b/assets/javascripts/discourse/routes/user-subscriptions.js.es6
@@ -17,7 +17,7 @@ export default Discourse.Route.extend({
     cancelSubscription(subscription) {
       bootbox.confirm(
         I18n.t(
-          "discourse_patrons.user.subscriptions.operations.destroy.confirm"
+          "discourse_subscriptions.user.subscriptions.operations.destroy.confirm"
         ),
         I18n.t("no_value"),
         I18n.t("yes_value"),
diff --git a/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-dashboard.hbs b/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-dashboard.hbs
index 1aa2d58..fa04f74 100644
--- a/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-dashboard.hbs
+++ b/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-dashboard.hbs
@@ -1,16 +1,16 @@
 
-<h3>{{i18n 'discourse_patrons.admin.dashboard.title'}}</h3>
+<h3>{{i18n 'discourse_subscriptions.admin.dashboard.title'}}</h3>
 
 {{#load-more selector=".discourse-patrons-table tr" action=(action "loadMore")}}
   {{#if model}}
     <table class="table discourse-patrons-table">
       <thead>
         <tr>
-          <th>{{i18n 'discourse_patrons.admin.dashboard.table.head.user'}}</th>
-          <th>{{i18n 'discourse_patrons.admin.dashboard.table.head.payment_intent'}}</th>
-          <th>{{i18n 'discourse_patrons.admin.dashboard.table.head.receipt_email'}}</th>
+          <th>{{i18n 'discourse_subscriptions.admin.dashboard.table.head.user'}}</th>
+          <th>{{i18n 'discourse_subscriptions.admin.dashboard.table.head.payment_intent'}}</th>
+          <th>{{i18n 'discourse_subscriptions.admin.dashboard.table.head.receipt_email'}}</th>
           <th onclick={{action "orderPayments" "created_at"}} class="sortable">{{i18n 'created'}}</th>
-          <th class="amount" onclick={{action "orderPayments" "amount"}} class="sortable amount">{{i18n 'discourse_patrons.admin.dashboard.table.head.amount'}}</th>
+          <th class="amount" onclick={{action "orderPayments" "amount"}} class="sortable amount">{{i18n 'discourse_subscriptions.admin.dashboard.table.head.amount'}}</th>
         </tr>
       </thead>
       {{#each model as |payment|}}
diff --git a/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-plans-index.hbs b/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-plans-index.hbs
index 1b37a2e..8f8ab58 100644
--- a/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-plans-index.hbs
+++ b/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-plans-index.hbs
@@ -1,10 +1,10 @@
 
 <table class="table discourse-patrons-table">
   <thead>
-    <th>{{i18n 'discourse_patrons.admin.plans.plan.plan_id'}}</th>
-    <th>{{i18n 'discourse_patrons.admin.plans.plan.nickname.title'}}</th>
-    <th>{{i18n 'discourse_patrons.admin.plans.plan.interval'}}</th>
-    <th>{{i18n 'discourse_patrons.admin.plans.plan.amount'}}</th>
+    <th>{{i18n 'discourse_subscriptions.admin.plans.plan.plan_id'}}</th>
+    <th>{{i18n 'discourse_subscriptions.admin.plans.plan.nickname.title'}}</th>
+    <th>{{i18n 'discourse_subscriptions.admin.plans.plan.interval'}}</th>
+    <th>{{i18n 'discourse_subscriptions.admin.plans.plan.amount'}}</th>
     <th></th>
   </thead>
   {{#each model as |plan|}}
diff --git a/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-products-index.hbs b/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-products-index.hbs
index 605f161..b703734 100644
--- a/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-products-index.hbs
+++ b/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-products-index.hbs
@@ -2,17 +2,17 @@
 <p class="btn-right">
   {{#link-to 'adminPlugins.discourse-subscriptions.products.show' 'new' class="btn btn-primary"}}
     {{d-icon "plus"}}
-    <span>{{i18n 'discourse_patrons.admin.products.operations.new'}}</span>
+    <span>{{i18n 'discourse_subscriptions.admin.products.operations.new'}}</span>
   {{/link-to}}
 </p>
 
 {{#if model}}
   <table class="table discourse-patrons-table">
     <thead>
-      <th>{{i18n 'discourse_patrons.admin.products.product.name'}}</th>
-      <th>{{i18n 'discourse_patrons.admin.products.product.created_at'}}</th>
-      <th>{{i18n 'discourse_patrons.admin.products.product.updated_at'}}</th>
-      <th class="td-right">{{i18n 'discourse_patrons.admin.products.product.active'}}</th>
+      <th>{{i18n 'discourse_subscriptions.admin.products.product.name'}}</th>
+      <th>{{i18n 'discourse_subscriptions.admin.products.product.created_at'}}</th>
+      <th>{{i18n 'discourse_subscriptions.admin.products.product.updated_at'}}</th>
+      <th class="td-right">{{i18n 'discourse_subscriptions.admin.products.product.active'}}</th>
       <th></th>
     </thead>
     {{#each model as |product|}}
@@ -36,6 +36,6 @@
   </table>
 {{else}}
   <p>
-    {{i18n 'discourse_patrons.admin.products.product_help'}}
+    {{i18n 'discourse_subscriptions.admin.products.product_help'}}
   </p>
 {{/if}}
diff --git a/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-products-show-plans-show.hbs b/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-products-show-plans-show.hbs
index 869d670..6f03936 100644
--- a/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-products-show-plans-show.hbs
+++ b/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-products-show-plans-show.hbs
@@ -1,27 +1,27 @@
 
-<h4>{{i18n 'discourse_patrons.admin.plans.title'}}</h4>
+<h4>{{i18n 'discourse_subscriptions.admin.plans.title'}}</h4>
 
 <form class="form-horizontal">
   <p>
-    <label for="product">{{i18n 'discourse_patrons.admin.products.product.name'}}</label>
+    <label for="product">{{i18n 'discourse_subscriptions.admin.products.product.name'}}</label>
     {{input type="text" name="product_name" value=model.product.name disabled=true}}
   </p>
   <p>
-    <label for="name">{{i18n 'discourse_patrons.admin.plans.plan.nickname'}}</label>
+    <label for="name">{{i18n 'discourse_subscriptions.admin.plans.plan.nickname'}}</label>
     {{input type="text" name="name" value=model.plan.nickname}}
     <div class="control-instructions">
-      {{i18n 'discourse_patrons.admin.plans.plan.nickname_help'}}
+      {{i18n 'discourse_subscriptions.admin.plans.plan.nickname_help'}}
     </div>
   </p>
   <p>
-    <label for="interval">{{i18n 'discourse_patrons.admin.plans.plan.group'}}</label>
+    <label for="interval">{{i18n 'discourse_subscriptions.admin.plans.plan.group'}}</label>
     {{combo-box valueAttribute="name" content=model.groups value=model.plan.metadata.group_name}}
     <div class="control-instructions">
-      {{i18n 'discourse_patrons.admin.plans.plan.group_help'}}
+      {{i18n 'discourse_subscriptions.admin.plans.plan.group_help'}}
     </div>
   </p>
   <p>
-    <label for="amount">{{i18n 'discourse_patrons.admin.plans.plan.amount'}}</label>
+    <label for="amount">{{i18n 'discourse_subscriptions.admin.plans.plan.amount'}}</label>
     {{#if planFieldDisabled}}
       {{input class="plan-amount plan-currency" disabled=true value=model.plan.currency}}
     {{else}}
@@ -31,23 +31,23 @@
   </p>
   <p>
     <label for="trial">
-      {{i18n 'discourse_patrons.admin.plans.plan.trial'}}
-      ({{i18n 'discourse_patrons.optional'}})
+      {{i18n 'discourse_subscriptions.admin.plans.plan.trial'}}
+      ({{i18n 'discourse_subscriptions.optional'}})
     </label>
     {{input type="text" name="trial" value=model.plan.trial_period_days}}
     <div class="control-instructions">
-      {{i18n 'discourse_patrons.admin.plans.plan.trial_help'}}
+      {{i18n 'discourse_subscriptions.admin.plans.plan.trial_help'}}
     </div>
   </p>
   <p>
     <label for="interval">
-      {{i18n 'discourse_patrons.admin.plans.plan.interval'}}
+      {{i18n 'discourse_subscriptions.admin.plans.plan.interval'}}
     </label>
     {{combo-box valueAttribute="value" content=model.plan.intervals value=model.plan.interval}}
   </p>
   <p>
     <label for="active">
-      {{i18n 'discourse_patrons.admin.plans.plan.active'}}
+      {{i18n 'discourse_subscriptions.admin.plans.plan.active'}}
     </label>
     {{input type="checkbox" name="active" checked=model.plan.active}}
   </p>
@@ -57,16 +57,16 @@
   <hr>
 
   <p class="control-instructions">
-    {{i18n 'discourse_patrons.admin.plans.operations.create_help'}}
+    {{i18n 'discourse_subscriptions.admin.plans.operations.create_help'}}
   </p>
 
   <div class="pull-right">
     {{d-button label="cancel" action=(action "cancelPlan" model.plan.product) icon="times"}}
 
     {{#if model.plan.isNew}}
-      {{d-button label="discourse_patrons.admin.plans.operations.create" action="createPlan" icon="plus" class="btn btn-primary"}}
+      {{d-button label="discourse_subscriptions.admin.plans.operations.create" action="createPlan" icon="plus" class="btn btn-primary"}}
     {{else}}
-      {{d-button label="discourse_patrons.admin.plans.operations.update" action="updatePlan" icon="check" class="btn btn-primary"}}
+      {{d-button label="discourse_subscriptions.admin.plans.operations.update" action="updatePlan" icon="check" class="btn btn-primary"}}
     {{/if}}
   </div>
 
diff --git a/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-products-show.hbs b/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-products-show.hbs
index 33771aa..48d8fd7 100644
--- a/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-products-show.hbs
+++ b/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-products-show.hbs
@@ -1,49 +1,49 @@
-<h4>{{i18n 'discourse_patrons.admin.products.title'}}</h4>
+<h4>{{i18n 'discourse_subscriptions.admin.products.title'}}</h4>
 
 <form class="form-horizontal">
   <p>
-    <label for="name">{{i18n 'discourse_patrons.admin.products.product.name'}}</label>
+    <label for="name">{{i18n 'discourse_subscriptions.admin.products.product.name'}}</label>
     {{input type="text" name="name" value=model.product.name}}
   </p>
   <p>
     <label for="description">
-      {{i18n 'discourse_patrons.admin.products.product.description'}}
+      {{i18n 'discourse_subscriptions.admin.products.product.description'}}
     </label>
     {{textarea name="description" value=model.product.metadata.description class="discourse-patrons-admin-textarea"}}
     <div class="control-instructions">
-      {{i18n 'discourse_patrons.admin.products.product.description_help'}}
+      {{i18n 'discourse_subscriptions.admin.products.product.description_help'}}
     </div>
   </p>
   <p>
     <label for="statement_descriptor">
-      {{i18n 'discourse_patrons.admin.products.product.statement_descriptor'}}
+      {{i18n 'discourse_subscriptions.admin.products.product.statement_descriptor'}}
     </label>
     {{input type="text" name="statement_descriptor" value=model.product.statement_descriptor}}
     <div class="control-instructions">
-      {{i18n 'discourse_patrons.admin.products.product.statement_descriptor_help'}}
+      {{i18n 'discourse_subscriptions.admin.products.product.statement_descriptor_help'}}
     </div>
   </p>
   <p>
-    <label for="active">{{i18n 'discourse_patrons.admin.products.product.active'}}</label>
+    <label for="active">{{i18n 'discourse_subscriptions.admin.products.product.active'}}</label>
     {{input type="checkbox" name="active" checked=model.product.active}}
   </p>
 </form>
 
 {{#unless model.product.isNew}}
-  <h4>{{i18n 'discourse_patrons.admin.plans.title'}}</h4>
+  <h4>{{i18n 'discourse_subscriptions.admin.plans.title'}}</h4>
 
   <p>
     <table class="table discourse-patrons-table">
       <thead>
-        <th>{{i18n 'discourse_patrons.admin.plans.plan.nickname'}}</th>
-        <th>{{i18n 'discourse_patrons.admin.plans.plan.interval'}}</th>
-        <th>{{i18n 'discourse_patrons.admin.plans.plan.created_at'}}</th>
-        <th>{{i18n 'discourse_patrons.admin.plans.plan.group'}}</th>
-        <th>{{i18n 'discourse_patrons.admin.plans.plan.active'}}</th>
-        <th class="td-right">{{i18n 'discourse_patrons.admin.plans.plan.amount'}}</th>
+        <th>{{i18n 'discourse_subscriptions.admin.plans.plan.nickname'}}</th>
+        <th>{{i18n 'discourse_subscriptions.admin.plans.plan.interval'}}</th>
+        <th>{{i18n 'discourse_subscriptions.admin.plans.plan.created_at'}}</th>
+        <th>{{i18n 'discourse_subscriptions.admin.plans.plan.group'}}</th>
+        <th>{{i18n 'discourse_subscriptions.admin.plans.plan.active'}}</th>
+        <th class="td-right">{{i18n 'discourse_subscriptions.admin.plans.plan.amount'}}</th>
         <th class="td-right">
           {{#link-to "adminPlugins.discourse-subscriptions.products.show.plans.show" model.product.id "new" class="btn"}}
-            {{i18n 'discourse_patrons.admin.plans.operations.add'}}
+            {{i18n 'discourse_subscriptions.admin.plans.operations.add'}}
           {{/link-to}}
         </th>
       </thead>
@@ -72,7 +72,7 @@
         <tr>
           <td colspan="8">
             <hr>
-            {{i18n 'discourse_patrons.admin.products.product.plan_help'}}
+            {{i18n 'discourse_subscriptions.admin.products.product.plan_help'}}
           </td>
         </tr>
       {{/unless}}
@@ -83,9 +83,9 @@
 <div class="pull-right">
   {{d-button label="cancel" action=(action "cancelProduct") icon="times"}}
   {{#if model.product.isNew}}
-    {{d-button label="discourse_patrons.admin.products.operations.create" action="createProduct" icon="plus" class="btn btn-primary"}}
+    {{d-button label="discourse_subscriptions.admin.products.operations.create" action="createProduct" icon="plus" class="btn btn-primary"}}
   {{else}}
-    {{d-button label="discourse_patrons.admin.products.operations.update" action="updateProduct" icon="check" class="btn btn-primary"}}
+    {{d-button label="discourse_subscriptions.admin.products.operations.update" action="updateProduct" icon="check" class="btn btn-primary"}}
   {{/if}}
 </div>
 
diff --git a/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-subscriptions.hbs b/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-subscriptions.hbs
index f19200d..b349abe 100644
--- a/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-subscriptions.hbs
+++ b/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-subscriptions.hbs
@@ -2,13 +2,13 @@
 <table class="table discourse-patrons-table">
   <thead>
     <tr>
-      <th>{{i18n 'discourse_patrons.admin.subscriptions.subscription.user'}}</th>
-      <th>{{i18n 'discourse_patrons.admin.subscriptions.subscription.subscription_id'}}</th>
-      <th>{{i18n 'discourse_patrons.admin.subscriptions.subscription.customer'}}</th>
-      <th>{{i18n 'discourse_patrons.admin.subscriptions.subscription.product'}}</th>
-      <th>{{i18n 'discourse_patrons.admin.subscriptions.subscription.plan'}}</th>
-      <th>{{i18n 'discourse_patrons.admin.subscriptions.subscription.status'}}</th>
-      <th class="td-right">{{i18n 'discourse_patrons.admin.subscriptions.subscription.created_at'}}</th>
+      <th>{{i18n 'discourse_subscriptions.admin.subscriptions.subscription.user'}}</th>
+      <th>{{i18n 'discourse_subscriptions.admin.subscriptions.subscription.subscription_id'}}</th>
+      <th>{{i18n 'discourse_subscriptions.admin.subscriptions.subscription.customer'}}</th>
+      <th>{{i18n 'discourse_subscriptions.admin.subscriptions.subscription.product'}}</th>
+      <th>{{i18n 'discourse_subscriptions.admin.subscriptions.subscription.plan'}}</th>
+      <th>{{i18n 'discourse_subscriptions.admin.subscriptions.subscription.status'}}</th>
+      <th class="td-right">{{i18n 'discourse_subscriptions.admin.subscriptions.subscription.created_at'}}</th>
       <th></th>
     </tr>
   </thead>
diff --git a/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions.hbs b/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions.hbs
index 66b4c30..ecd4775 100644
--- a/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions.hbs
+++ b/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions.hbs
@@ -1,10 +1,10 @@
 
-<h2>{{i18n 'discourse_patrons.title' site_name=siteSettings.title}}</h2>
+<h2>{{i18n 'discourse_subscriptions.title' site_name=siteSettings.title}}</h2>
 
 <ul class="nav nav-pills">
-  {{!-- {{nav-item route='adminPlugins.discourse-subscriptions.dashboard' label='discourse_patrons.admin.dashboard.title'}} --}}
-  {{nav-item route='adminPlugins.discourse-subscriptions.products' label='discourse_patrons.admin.products.title'}}
-  {{nav-item route='adminPlugins.discourse-subscriptions.subscriptions' label='discourse_patrons.admin.subscriptions.title'}}
+  {{!-- {{nav-item route='adminPlugins.discourse-subscriptions.dashboard' label='discourse_subscriptions.admin.dashboard.title'}} --}}
+  {{nav-item route='adminPlugins.discourse-subscriptions.products' label='discourse_subscriptions.admin.products.title'}}
+  {{nav-item route='adminPlugins.discourse-subscriptions.subscriptions' label='discourse_subscriptions.admin.subscriptions.title'}}
 </ul>
 
 <hr>
diff --git a/assets/javascripts/discourse/templates/components/donation-form.hbs b/assets/javascripts/discourse/templates/components/donation-form.hbs
index 313abac..6a060f2 100644
--- a/assets/javascripts/discourse/templates/components/donation-form.hbs
+++ b/assets/javascripts/discourse/templates/components/donation-form.hbs
@@ -1,20 +1,20 @@
 
 {{#if confirmation}}
-  {{#d-modal closeModal=(action "closeModal") modalStyle="inline-modal" title=(i18n "discourse_patrons.one_time.payment.payment_confirmation")}}
+  {{#d-modal closeModal=(action "closeModal") modalStyle="inline-modal" title=(i18n "discourse_subscriptions.one_time.payment.payment_confirmation")}}
     {{#d-modal-body}}
       <div class="discourse-patrons-section-columns">
         <div class="section-column discourse-patrons-confirmation-billing">
           <table class="discourse-patrons-confirmation">
             <tr>
-              <td>{{i18n 'discourse_patrons.billing.name'}}</td>
+              <td>{{i18n 'discourse_subscriptions.billing.name'}}</td>
               <td>{{billing.name}}</td>
             </tr>
             <tr>
-              <td>{{i18n 'discourse_patrons.billing.email'}}</td>
+              <td>{{i18n 'discourse_subscriptions.billing.email'}}</td>
               <td>{{billing.email}}</td>
             </tr>
             <tr>
-              <td>{{i18n 'discourse_patrons.billing.phone'}}</td>
+              <td>{{i18n 'discourse_subscriptions.billing.phone'}}</td>
               <td>{{billing.phone}}</td>
             </tr>
           </table>
@@ -22,11 +22,11 @@
         <div class="section-column">
           <table class="discourse-patrons-confirmation">
             <tr>
-              <td>{{i18n 'discourse_patrons.confirmation.amount'}}</td>
+              <td>{{i18n 'discourse_subscriptions.confirmation.amount'}}</td>
               <td class="discourse-donations-amount">{{format-curency amount}}</td>
             </tr>
             <tr>
-              <td>{{i18n 'discourse_patrons.confirmation.last4'}}</td>
+              <td>{{i18n 'discourse_subscriptions.confirmation.last4'}}</td>
               <td class="discourse-patrons-last4">.... .... .... {{last4}}</td>
             </tr>
           </table>
@@ -36,7 +36,7 @@
 
     <div class='modal-footer'>
       {{#d-button action="confirmStripeCard" class="btn btn-primary btn-payment btn-discourse-patrons"}}
-        {{i18n 'discourse_patrons.buttons.confirm_payment'}} {{format-curency amount}}
+        {{i18n 'discourse_subscriptions.buttons.confirm_payment'}} {{format-curency amount}}
       {{/d-button}}
     </div>
 
@@ -51,47 +51,47 @@
 {{else}}
   <div class="discourse-patrons-section-columns discourse-patrons-payment-details">
     <div class="section-column">
-      <h3>{{i18n 'discourse_patrons.one_time.payment.your_information'}}</h3>
+      <h3>{{i18n 'discourse_subscriptions.one_time.payment.your_information'}}</h3>
 
       <div class="user-controls discourse-patrons-fields discourse-patrons-billing">
         <div class="display-row">
           <div class="field">
-            {{i18n 'discourse_patrons.billing.name'}}
+            {{i18n 'discourse_subscriptions.billing.name'}}
           </div>
           <div class="value">
             {{input value=billing.name}}
-            <div class="desc">{{i18n 'discourse_patrons.one_time.payment.optional'}}</div>
+            <div class="desc">{{i18n 'discourse_subscriptions.one_time.payment.optional'}}</div>
           </div>
         </div>
         <div class="display-row">
           <div class="field">
-            {{i18n 'discourse_patrons.billing.email'}}
+            {{i18n 'discourse_subscriptions.billing.email'}}
           </div>
           <div class="value">
             {{input type="email" value=billing.email}}
-            <div class="desc">{{i18n 'discourse_patrons.one_time.payment.receipt_info'}}</div>
+            <div class="desc">{{i18n 'discourse_subscriptions.one_time.payment.receipt_info'}}</div>
           </div>
         </div>
         <div class="display-row">
           <div class="field">
-            {{i18n 'discourse_patrons.billing.phone'}}
+            {{i18n 'discourse_subscriptions.billing.phone'}}
           </div>
           <div class="value">
             {{input value=billing.phone}}
-            <div class="desc">{{i18n 'discourse_patrons.one_time.payment.optional'}}</div>
+            <div class="desc">{{i18n 'discourse_subscriptions.one_time.payment.optional'}}</div>
           </div>
         </div>
       </div>
 
     </div>
     <div class="section-column">
-      <h3>{{i18n 'discourse_patrons.one_time.payment.payment_information'}}</h3>
+      <h3>{{i18n 'discourse_subscriptions.one_time.payment.payment_information'}}</h3>
 
       <div class="user-controls discourse-patrons-fields">
         <div class="display-row">
           <div class="field">
-            {{i18n 'discourse_patrons.one_time.amount'}}
-            {{siteSettings.discourse_patrons_currency}}
+            {{i18n 'discourse_subscriptions.one_time.amount'}}
+            {{siteSettings.discourse_subscriptions_currency}}
           </div>
           <div class="value">
             {{combo-box valueAttribute="value" content=amounts value=amount}}
diff --git a/assets/javascripts/discourse/templates/components/product-list.hbs b/assets/javascripts/discourse/templates/components/product-list.hbs
index 50f94c6..fbef764 100644
--- a/assets/javascripts/discourse/templates/components/product-list.hbs
+++ b/assets/javascripts/discourse/templates/components/product-list.hbs
@@ -10,7 +10,7 @@
     {{#if currentUser}}
       <div class="pull-right">
         {{#link-to "s.subscribe.show" product.id disabled=product.subscribed class="btn btn-primary"}}
-          {{i18n 'discourse_patrons.subscribe.title'}}
+          {{i18n 'discourse_subscriptions.subscribe.title'}}
         {{/link-to}}
       </div>
     {{/if}}
@@ -19,6 +19,6 @@
 
 {{#unless currentUser}}
   <p>
-    {{i18n 'discourse_patrons.subscribe.unauthenticated'}}
+    {{i18n 'discourse_subscriptions.subscribe.unauthenticated'}}
   </p>
 {{/unless}}
diff --git a/assets/javascripts/discourse/templates/components/stripe-card.hbs b/assets/javascripts/discourse/templates/components/stripe-card.hbs
index 48ff7c4..3a4b520 100644
--- a/assets/javascripts/discourse/templates/components/stripe-card.hbs
+++ b/assets/javascripts/discourse/templates/components/stripe-card.hbs
@@ -3,7 +3,7 @@
   <div id="card-element"></div>
   <div id="card-action">
     {{#d-button action="submitStripeCard" class="btn btn-primary btn-payment btn-discourse-patrons"}}
-      {{i18n 'discourse_patrons.buttons.make_payment'}} {{format-curency amount}}
+      {{i18n 'discourse_subscriptions.buttons.make_payment'}} {{format-curency amount}}
     {{/d-button}}
 
     {{#if cardError}}
diff --git a/assets/javascripts/discourse/templates/connectors/extra-nav-item/subscribe.hbs b/assets/javascripts/discourse/templates/connectors/extra-nav-item/subscribe.hbs
index 2709b64..d3182ec 100644
--- a/assets/javascripts/discourse/templates/connectors/extra-nav-item/subscribe.hbs
+++ b/assets/javascripts/discourse/templates/connectors/extra-nav-item/subscribe.hbs
@@ -1,5 +1,5 @@
 {{#if (show-extra-nav)}}
   {{#link-to 's.subscribe' class='discourse-patrons-subscribe'}}
-    {{i18n 'discourse_patrons.navigation.subscribe'}}
+    {{i18n 'discourse_subscriptions.navigation.subscribe'}}
   {{/link-to}}
 {{/if}}
diff --git a/assets/javascripts/discourse/templates/connectors/user-main-nav/subscriptions.hbs b/assets/javascripts/discourse/templates/connectors/user-main-nav/subscriptions.hbs
index 66370fd..3efebfb 100644
--- a/assets/javascripts/discourse/templates/connectors/user-main-nav/subscriptions.hbs
+++ b/assets/javascripts/discourse/templates/connectors/user-main-nav/subscriptions.hbs
@@ -1,3 +1,3 @@
 {{#if (user-viewing-self model)}}
-  {{#link-to 'user.subscriptions'}}{{d-icon "credit-card"}}{{I18n 'discourse_patrons.navigation.subscriptions'}}{{/link-to}}
+  {{#link-to 'user.subscriptions'}}{{d-icon "credit-card"}}{{I18n 'discourse_subscriptions.navigation.subscriptions'}}{{/link-to}}
 {{/if}}
diff --git a/assets/javascripts/discourse/templates/s/index.hbs b/assets/javascripts/discourse/templates/s/index.hbs
index 969d5b0..58967eb 100644
--- a/assets/javascripts/discourse/templates/s/index.hbs
+++ b/assets/javascripts/discourse/templates/s/index.hbs
@@ -1,8 +1,8 @@
 
-<h3>{{i18n 'discourse_patrons.one_time.heading.payment' site_name=siteSettings.title}}</h3>
+<h3>{{i18n 'discourse_subscriptions.one_time.heading.payment' site_name=siteSettings.title}}</h3>
 
 <p>
-  {{cook-text siteSettings.discourse_patrons_payment_page}}
+  {{cook-text siteSettings.discourse_subscriptions_payment_page}}
 </p>
 
 <div class="donations-page-payment">
diff --git a/assets/javascripts/discourse/templates/s/subscribe.hbs b/assets/javascripts/discourse/templates/s/subscribe.hbs
index 42e43d5..c84bfdc 100644
--- a/assets/javascripts/discourse/templates/s/subscribe.hbs
+++ b/assets/javascripts/discourse/templates/s/subscribe.hbs
@@ -2,7 +2,7 @@
 <div class="container">
   <div class="title-wrapper">
     <h1>
-      {{i18n 'discourse_patrons.subscribe.title'}}
+      {{i18n 'discourse_subscriptions.subscribe.title'}}
     </h1>
   </div>
 
diff --git a/assets/javascripts/discourse/templates/s/subscribe/show.hbs b/assets/javascripts/discourse/templates/s/subscribe/show.hbs
index 521a616..dce5b9d 100644
--- a/assets/javascripts/discourse/templates/s/subscribe/show.hbs
+++ b/assets/javascripts/discourse/templates/s/subscribe/show.hbs
@@ -11,7 +11,7 @@
   <div class="section-column">
     {{#unless model.product.subscribed}}
       <h2>
-        {{i18n 'discourse_patrons.subscribe.card.title'}}
+        {{i18n 'discourse_subscriptions.subscribe.card.title'}}
       </h2>
 
       {{subscribe-card cardElement=cardElement}}
@@ -25,7 +25,7 @@
           disabled=loading
           action="stripePaymentHandler"
           class="btn btn-primary btn-payment btn-discourse-patrons pull-right"}}
-          {{i18n 'discourse_patrons.subscribe.buttons.subscribe'}}
+          {{i18n 'discourse_subscriptions.subscribe.buttons.subscribe'}}
           {{/d-button}}
       {{/if}}
 
diff --git a/assets/javascripts/discourse/templates/user/billing.hbs b/assets/javascripts/discourse/templates/user/billing.hbs
index 575ebfe..fc690e5 100644
--- a/assets/javascripts/discourse/templates/user/billing.hbs
+++ b/assets/javascripts/discourse/templates/user/billing.hbs
@@ -1,12 +1,12 @@
 
-<h3>{{i18n 'discourse_patrons.user.billing.title'}}</h3>
+<h3>{{i18n 'discourse_subscriptions.user.billing.title'}}</h3>
 
 {{#if model}}
   <table class="topic-list">
     <thead>
-      <th>{{i18n 'discourse_patrons.user.billing.invoices.amount'}}</th>
-      <th>{{i18n 'discourse_patrons.user.billing.invoices.number'}}</th>
-      <th>{{i18n 'discourse_patrons.user.billing.invoices.created_at'}}</th>
+      <th>{{i18n 'discourse_subscriptions.user.billing.invoices.amount'}}</th>
+      <th>{{i18n 'discourse_subscriptions.user.billing.invoices.number'}}</th>
+      <th>{{i18n 'discourse_subscriptions.user.billing.invoices.created_at'}}</th>
       <th></th>
     </thead>
     {{#each model as |invoice|}}
@@ -23,5 +23,5 @@
     {{/each}}
   </table>
 {{else}}
-  <p>{{i18n 'discourse_patrons.user.billing_help'}}</p>
+  <p>{{i18n 'discourse_subscriptions.user.billing_help'}}</p>
 {{/if}}
diff --git a/assets/javascripts/discourse/templates/user/invoices.hbs b/assets/javascripts/discourse/templates/user/invoices.hbs
index 575ebfe..fc690e5 100644
--- a/assets/javascripts/discourse/templates/user/invoices.hbs
+++ b/assets/javascripts/discourse/templates/user/invoices.hbs
@@ -1,12 +1,12 @@
 
-<h3>{{i18n 'discourse_patrons.user.billing.title'}}</h3>
+<h3>{{i18n 'discourse_subscriptions.user.billing.title'}}</h3>
 
 {{#if model}}
   <table class="topic-list">
     <thead>
-      <th>{{i18n 'discourse_patrons.user.billing.invoices.amount'}}</th>
-      <th>{{i18n 'discourse_patrons.user.billing.invoices.number'}}</th>
-      <th>{{i18n 'discourse_patrons.user.billing.invoices.created_at'}}</th>
+      <th>{{i18n 'discourse_subscriptions.user.billing.invoices.amount'}}</th>
+      <th>{{i18n 'discourse_subscriptions.user.billing.invoices.number'}}</th>
+      <th>{{i18n 'discourse_subscriptions.user.billing.invoices.created_at'}}</th>
       <th></th>
     </thead>
     {{#each model as |invoice|}}
@@ -23,5 +23,5 @@
     {{/each}}
   </table>
 {{else}}
-  <p>{{i18n 'discourse_patrons.user.billing_help'}}</p>
+  <p>{{i18n 'discourse_subscriptions.user.billing_help'}}</p>
 {{/if}}
diff --git a/assets/javascripts/discourse/templates/user/subscriptions.hbs b/assets/javascripts/discourse/templates/user/subscriptions.hbs
index 8370eae..4f22b63 100644
--- a/assets/javascripts/discourse/templates/user/subscriptions.hbs
+++ b/assets/javascripts/discourse/templates/user/subscriptions.hbs
@@ -1,14 +1,14 @@
 
-{{i18n 'discourse_patrons.user.subscriptions.title'}}
+{{i18n 'discourse_subscriptions.user.subscriptions.title'}}
 
 {{#if model}}
   <table class="table discourse-patrons-user-table">
     <thead>
-      <th>{{i18n 'discourse_patrons.user.subscriptions.id'}}</th>
-      <th>{{i18n 'discourse_patrons.user.plans.product'}}</th>
-      <th>{{i18n 'discourse_patrons.user.plans.rate'}}</th>
-      <th>{{i18n 'discourse_patrons.user.subscriptions.status'}}</th>
-      <th>{{i18n 'discourse_patrons.user.subscriptions.created_at'}}</th>
+      <th>{{i18n 'discourse_subscriptions.user.subscriptions.id'}}</th>
+      <th>{{i18n 'discourse_subscriptions.user.plans.product'}}</th>
+      <th>{{i18n 'discourse_subscriptions.user.plans.rate'}}</th>
+      <th>{{i18n 'discourse_subscriptions.user.subscriptions.status'}}</th>
+      <th>{{i18n 'discourse_subscriptions.user.subscriptions.created_at'}}</th>
       <th></th>
     </thead>
     {{#each model as |subscription|}}
@@ -29,5 +29,5 @@
     {{/each}}
   </table>
 {{else}}
-  <p>{{i18n 'discourse_patrons.user.subscriptions_help'}}</p>
+  <p>{{i18n 'discourse_subscriptions.user.subscriptions_help'}}</p>
 {{/if}}
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 912a46b..19a151b 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -14,7 +14,7 @@ en:
     errors:
       discourse_patrons_amount_must_be_currency: "Currency amounts must be currencies without dollar symbol (eg 1.50)"
   js:
-    discourse_patrons:
+    discourse_subscriptions:
       title: Discourse Subscriptions
       admin_navigation: Subscriptions
       optional: Optional
diff --git a/plugin.rb b/plugin.rb
index b9458b4..0b6f98e 100644
--- a/plugin.rb
+++ b/plugin.rb
@@ -24,7 +24,7 @@ extend_content_security_policy(
   script_src: ['https://js.stripe.com/v3/']
 )
 
-add_admin_route 'discourse_patrons.admin_navigation', 'discourse-subscriptions.products'
+add_admin_route 'discourse_subscriptions.admin_navigation', 'discourse-subscriptions.products'
 
 Discourse::Application.routes.append do
   get '/admin/plugins/discourse-subscriptions' => 'admin/plugins#index'