diff --git a/app/assets/javascripts/admin/standing_orders/controllers/address_controller.js.coffee b/app/assets/javascripts/admin/subscriptions/controllers/address_controller.js.coffee similarity index 100% rename from app/assets/javascripts/admin/standing_orders/controllers/address_controller.js.coffee rename to app/assets/javascripts/admin/subscriptions/controllers/address_controller.js.coffee diff --git a/app/assets/javascripts/admin/standing_orders/controllers/details_controller.js.coffee b/app/assets/javascripts/admin/subscriptions/controllers/details_controller.js.coffee similarity index 100% rename from app/assets/javascripts/admin/standing_orders/controllers/details_controller.js.coffee rename to app/assets/javascripts/admin/subscriptions/controllers/details_controller.js.coffee diff --git a/app/assets/javascripts/admin/standing_orders/controllers/order_update_issues_controller.js.coffee b/app/assets/javascripts/admin/subscriptions/controllers/order_update_issues_controller.js.coffee similarity index 100% rename from app/assets/javascripts/admin/standing_orders/controllers/order_update_issues_controller.js.coffee rename to app/assets/javascripts/admin/subscriptions/controllers/order_update_issues_controller.js.coffee diff --git a/app/assets/javascripts/admin/standing_orders/controllers/orders_panel_controller.js.coffee b/app/assets/javascripts/admin/subscriptions/controllers/orders_panel_controller.js.coffee similarity index 100% rename from app/assets/javascripts/admin/standing_orders/controllers/orders_panel_controller.js.coffee rename to app/assets/javascripts/admin/subscriptions/controllers/orders_panel_controller.js.coffee diff --git a/app/assets/javascripts/admin/standing_orders/controllers/products_controller.js.coffee b/app/assets/javascripts/admin/subscriptions/controllers/products_controller.js.coffee similarity index 100% rename from app/assets/javascripts/admin/standing_orders/controllers/products_controller.js.coffee rename to app/assets/javascripts/admin/subscriptions/controllers/products_controller.js.coffee diff --git a/app/assets/javascripts/admin/standing_orders/controllers/products_panel_controller.js.coffee b/app/assets/javascripts/admin/subscriptions/controllers/products_panel_controller.js.coffee similarity index 100% rename from app/assets/javascripts/admin/standing_orders/controllers/products_panel_controller.js.coffee rename to app/assets/javascripts/admin/subscriptions/controllers/products_panel_controller.js.coffee diff --git a/app/assets/javascripts/admin/standing_orders/controllers/standing_line_items_controller.js.coffee b/app/assets/javascripts/admin/subscriptions/controllers/standing_line_items_controller.js.coffee similarity index 100% rename from app/assets/javascripts/admin/standing_orders/controllers/standing_line_items_controller.js.coffee rename to app/assets/javascripts/admin/subscriptions/controllers/standing_line_items_controller.js.coffee diff --git a/app/assets/javascripts/admin/standing_orders/controllers/standing_order_controller.js.coffee b/app/assets/javascripts/admin/subscriptions/controllers/subscription_controller.js.coffee similarity index 100% rename from app/assets/javascripts/admin/standing_orders/controllers/standing_order_controller.js.coffee rename to app/assets/javascripts/admin/subscriptions/controllers/subscription_controller.js.coffee diff --git a/app/assets/javascripts/admin/standing_orders/controllers/standing_orders_controller.js.coffee b/app/assets/javascripts/admin/subscriptions/controllers/subscriptions_controller.js.coffee similarity index 100% rename from app/assets/javascripts/admin/standing_orders/controllers/standing_orders_controller.js.coffee rename to app/assets/javascripts/admin/subscriptions/controllers/subscriptions_controller.js.coffee diff --git a/app/assets/javascripts/admin/standing_orders/directives/confirm_order_edit.js.coffee b/app/assets/javascripts/admin/subscriptions/directives/confirm_order_edit.js.coffee similarity index 100% rename from app/assets/javascripts/admin/standing_orders/directives/confirm_order_edit.js.coffee rename to app/assets/javascripts/admin/subscriptions/directives/confirm_order_edit.js.coffee diff --git a/app/assets/javascripts/admin/standing_orders/directives/new_standing_order_dialog.js.coffee b/app/assets/javascripts/admin/subscriptions/directives/new_subscription_dialog.js.coffee similarity index 100% rename from app/assets/javascripts/admin/standing_orders/directives/new_standing_order_dialog.js.coffee rename to app/assets/javascripts/admin/subscriptions/directives/new_subscription_dialog.js.coffee diff --git a/app/assets/javascripts/admin/standing_orders/services/credit_card_resource.js.coffee b/app/assets/javascripts/admin/subscriptions/services/credit_card_resource.js.coffee similarity index 100% rename from app/assets/javascripts/admin/standing_orders/services/credit_card_resource.js.coffee rename to app/assets/javascripts/admin/subscriptions/services/credit_card_resource.js.coffee diff --git a/app/assets/javascripts/admin/standing_orders/services/standing_order.js.coffee b/app/assets/javascripts/admin/subscriptions/services/subscription.js.coffee similarity index 100% rename from app/assets/javascripts/admin/standing_orders/services/standing_order.js.coffee rename to app/assets/javascripts/admin/subscriptions/services/subscription.js.coffee diff --git a/app/assets/javascripts/admin/standing_orders/services/standing_order_form.js.coffee b/app/assets/javascripts/admin/subscriptions/services/subscription_form.js.coffee similarity index 100% rename from app/assets/javascripts/admin/standing_orders/services/standing_order_form.js.coffee rename to app/assets/javascripts/admin/subscriptions/services/subscription_form.js.coffee diff --git a/app/assets/javascripts/admin/standing_orders/services/standing_order_prototype.js.coffee b/app/assets/javascripts/admin/subscriptions/services/subscription_prototype.js.coffee similarity index 100% rename from app/assets/javascripts/admin/standing_orders/services/standing_order_prototype.js.coffee rename to app/assets/javascripts/admin/subscriptions/services/subscription_prototype.js.coffee diff --git a/app/assets/javascripts/admin/standing_orders/services/standing_order_resource.js.coffee b/app/assets/javascripts/admin/subscriptions/services/subscription_resource.js.coffee similarity index 100% rename from app/assets/javascripts/admin/standing_orders/services/standing_order_resource.js.coffee rename to app/assets/javascripts/admin/subscriptions/services/subscription_resource.js.coffee diff --git a/app/assets/javascripts/admin/standing_orders/services/standing_orders.js.coffee b/app/assets/javascripts/admin/subscriptions/services/subscriptions.js.coffee similarity index 100% rename from app/assets/javascripts/admin/standing_orders/services/standing_orders.js.coffee rename to app/assets/javascripts/admin/subscriptions/services/subscriptions.js.coffee diff --git a/app/assets/javascripts/admin/standing_orders/standing_orders.js.coffee b/app/assets/javascripts/admin/subscriptions/subscriptions.js.coffee similarity index 100% rename from app/assets/javascripts/admin/standing_orders/standing_orders.js.coffee rename to app/assets/javascripts/admin/subscriptions/subscriptions.js.coffee diff --git a/app/assets/javascripts/templates/admin/new_standing_order_dialog.html.haml b/app/assets/javascripts/templates/admin/new_subscription_dialog.html.haml similarity index 100% rename from app/assets/javascripts/templates/admin/new_standing_order_dialog.html.haml rename to app/assets/javascripts/templates/admin/new_subscription_dialog.html.haml diff --git a/app/controllers/admin/standing_orders_controller.rb b/app/controllers/admin/subscriptions_controller.rb similarity index 100% rename from app/controllers/admin/standing_orders_controller.rb rename to app/controllers/admin/subscriptions_controller.rb diff --git a/app/helpers/admin/standing_orders_helper.rb b/app/helpers/admin/subscriptions_helper.rb similarity index 100% rename from app/helpers/admin/standing_orders_helper.rb rename to app/helpers/admin/subscriptions_helper.rb diff --git a/app/jobs/standing_order_confirm_job.rb b/app/jobs/subscription_confirm_job.rb similarity index 100% rename from app/jobs/standing_order_confirm_job.rb rename to app/jobs/subscription_confirm_job.rb diff --git a/app/jobs/standing_order_placement_job.rb b/app/jobs/subscription_placement_job.rb similarity index 100% rename from app/jobs/standing_order_placement_job.rb rename to app/jobs/subscription_placement_job.rb diff --git a/app/mailers/standing_order_mailer.rb b/app/mailers/subscription_mailer.rb similarity index 100% rename from app/mailers/standing_order_mailer.rb rename to app/mailers/subscription_mailer.rb diff --git a/app/models/standing_order.rb b/app/models/subscription.rb similarity index 100% rename from app/models/standing_order.rb rename to app/models/subscription.rb diff --git a/app/serializers/api/admin/standing_order_serializer.rb b/app/serializers/api/admin/subscription_serializer.rb similarity index 100% rename from app/serializers/api/admin/standing_order_serializer.rb rename to app/serializers/api/admin/subscription_serializer.rb diff --git a/app/services/standing_order_form.rb b/app/services/subscription_form.rb similarity index 100% rename from app/services/standing_order_form.rb rename to app/services/subscription_form.rb diff --git a/app/services/standing_order_validator.rb b/app/services/subscription_validator.rb similarity index 100% rename from app/services/standing_order_validator.rb rename to app/services/subscription_validator.rb diff --git a/app/views/admin/standing_orders/_address.html.haml b/app/views/admin/subscriptions/_address.html.haml similarity index 100% rename from app/views/admin/standing_orders/_address.html.haml rename to app/views/admin/subscriptions/_address.html.haml diff --git a/app/views/admin/standing_orders/_autocomplete.html.haml b/app/views/admin/subscriptions/_autocomplete.html.haml similarity index 100% rename from app/views/admin/standing_orders/_autocomplete.html.haml rename to app/views/admin/subscriptions/_autocomplete.html.haml diff --git a/app/views/admin/standing_orders/_controls.html.haml b/app/views/admin/subscriptions/_controls.html.haml similarity index 100% rename from app/views/admin/standing_orders/_controls.html.haml rename to app/views/admin/subscriptions/_controls.html.haml diff --git a/app/views/admin/standing_orders/_data.html.haml b/app/views/admin/subscriptions/_data.html.haml similarity index 100% rename from app/views/admin/standing_orders/_data.html.haml rename to app/views/admin/subscriptions/_data.html.haml diff --git a/app/views/admin/standing_orders/_details.html.haml b/app/views/admin/subscriptions/_details.html.haml similarity index 100% rename from app/views/admin/standing_orders/_details.html.haml rename to app/views/admin/subscriptions/_details.html.haml diff --git a/app/views/admin/standing_orders/_filters.html.haml b/app/views/admin/subscriptions/_filters.html.haml similarity index 100% rename from app/views/admin/standing_orders/_filters.html.haml rename to app/views/admin/subscriptions/_filters.html.haml diff --git a/app/views/admin/standing_orders/_form.html.haml b/app/views/admin/subscriptions/_form.html.haml similarity index 100% rename from app/views/admin/standing_orders/_form.html.haml rename to app/views/admin/subscriptions/_form.html.haml diff --git a/app/views/admin/standing_orders/_loading_flash.html.haml b/app/views/admin/subscriptions/_loading_flash.html.haml similarity index 100% rename from app/views/admin/standing_orders/_loading_flash.html.haml rename to app/views/admin/subscriptions/_loading_flash.html.haml diff --git a/app/views/admin/standing_orders/_no_results.html.haml b/app/views/admin/subscriptions/_no_results.html.haml similarity index 100% rename from app/views/admin/standing_orders/_no_results.html.haml rename to app/views/admin/subscriptions/_no_results.html.haml diff --git a/app/views/admin/standing_orders/_order_update_issues_dialog.html.haml b/app/views/admin/subscriptions/_order_update_issues_dialog.html.haml similarity index 100% rename from app/views/admin/standing_orders/_order_update_issues_dialog.html.haml rename to app/views/admin/subscriptions/_order_update_issues_dialog.html.haml diff --git a/app/views/admin/standing_orders/_orders_panel.html.haml b/app/views/admin/subscriptions/_orders_panel.html.haml similarity index 100% rename from app/views/admin/standing_orders/_orders_panel.html.haml rename to app/views/admin/subscriptions/_orders_panel.html.haml diff --git a/app/views/admin/standing_orders/_products.html.haml b/app/views/admin/subscriptions/_products.html.haml similarity index 100% rename from app/views/admin/standing_orders/_products.html.haml rename to app/views/admin/subscriptions/_products.html.haml diff --git a/app/views/admin/standing_orders/_products_panel.html.haml b/app/views/admin/subscriptions/_products_panel.html.haml similarity index 100% rename from app/views/admin/standing_orders/_products_panel.html.haml rename to app/views/admin/subscriptions/_products_panel.html.haml diff --git a/app/views/admin/standing_orders/_standing_line_items.html.haml b/app/views/admin/subscriptions/_standing_line_items.html.haml similarity index 100% rename from app/views/admin/standing_orders/_standing_line_items.html.haml rename to app/views/admin/subscriptions/_standing_line_items.html.haml diff --git a/app/views/admin/standing_orders/_table.html.haml b/app/views/admin/subscriptions/_table.html.haml similarity index 100% rename from app/views/admin/standing_orders/_table.html.haml rename to app/views/admin/subscriptions/_table.html.haml diff --git a/app/views/admin/standing_orders/_wizard_progress.html.haml b/app/views/admin/subscriptions/_wizard_progress.html.haml similarity index 100% rename from app/views/admin/standing_orders/_wizard_progress.html.haml rename to app/views/admin/subscriptions/_wizard_progress.html.haml diff --git a/app/views/admin/standing_orders/edit.html.haml b/app/views/admin/subscriptions/edit.html.haml similarity index 100% rename from app/views/admin/standing_orders/edit.html.haml rename to app/views/admin/subscriptions/edit.html.haml diff --git a/app/views/admin/standing_orders/index.html.haml b/app/views/admin/subscriptions/index.html.haml similarity index 100% rename from app/views/admin/standing_orders/index.html.haml rename to app/views/admin/subscriptions/index.html.haml diff --git a/app/views/admin/standing_orders/new.html.haml b/app/views/admin/subscriptions/new.html.haml similarity index 100% rename from app/views/admin/standing_orders/new.html.haml rename to app/views/admin/subscriptions/new.html.haml diff --git a/app/views/admin/standing_orders/setup_explanation.html.haml b/app/views/admin/subscriptions/setup_explanation.html.haml similarity index 100% rename from app/views/admin/standing_orders/setup_explanation.html.haml rename to app/views/admin/subscriptions/setup_explanation.html.haml diff --git a/app/views/standing_order_mailer/_header.html.haml b/app/views/subscription_mailer/_header.html.haml similarity index 100% rename from app/views/standing_order_mailer/_header.html.haml rename to app/views/subscription_mailer/_header.html.haml diff --git a/app/views/standing_order_mailer/_summary_detail.html.haml b/app/views/subscription_mailer/_summary_detail.html.haml similarity index 100% rename from app/views/standing_order_mailer/_summary_detail.html.haml rename to app/views/subscription_mailer/_summary_detail.html.haml diff --git a/app/views/standing_order_mailer/_summary_overview.html.haml b/app/views/subscription_mailer/_summary_overview.html.haml similarity index 100% rename from app/views/standing_order_mailer/_summary_overview.html.haml rename to app/views/subscription_mailer/_summary_overview.html.haml diff --git a/app/views/standing_order_mailer/confirmation_email.html.haml b/app/views/subscription_mailer/confirmation_email.html.haml similarity index 100% rename from app/views/standing_order_mailer/confirmation_email.html.haml rename to app/views/subscription_mailer/confirmation_email.html.haml diff --git a/app/views/standing_order_mailer/confirmation_summary_email.html.haml b/app/views/subscription_mailer/confirmation_summary_email.html.haml similarity index 100% rename from app/views/standing_order_mailer/confirmation_summary_email.html.haml rename to app/views/subscription_mailer/confirmation_summary_email.html.haml diff --git a/app/views/standing_order_mailer/empty_email.html.haml b/app/views/subscription_mailer/empty_email.html.haml similarity index 100% rename from app/views/standing_order_mailer/empty_email.html.haml rename to app/views/subscription_mailer/empty_email.html.haml diff --git a/app/views/standing_order_mailer/failed_payment_email.html.haml b/app/views/subscription_mailer/failed_payment_email.html.haml similarity index 100% rename from app/views/standing_order_mailer/failed_payment_email.html.haml rename to app/views/subscription_mailer/failed_payment_email.html.haml diff --git a/app/views/standing_order_mailer/placement_email.html.haml b/app/views/subscription_mailer/placement_email.html.haml similarity index 100% rename from app/views/standing_order_mailer/placement_email.html.haml rename to app/views/subscription_mailer/placement_email.html.haml diff --git a/app/views/standing_order_mailer/placement_summary_email.html.haml b/app/views/subscription_mailer/placement_summary_email.html.haml similarity index 100% rename from app/views/standing_order_mailer/placement_summary_email.html.haml rename to app/views/subscription_mailer/placement_summary_email.html.haml