diff --git a/app/assets/javascripts/admin/enterprises/enterprises.js.coffee b/app/assets/javascripts/admin/enterprises/enterprises.js.coffee
index 4537620512..4adb31cf08 100644
--- a/app/assets/javascripts/admin/enterprises/enterprises.js.coffee
+++ b/app/assets/javascripts/admin/enterprises/enterprises.js.coffee
@@ -1 +1 @@
-angular.module("admin.enterprises", [
  "admin.payment_methods",
  "admin.utils",
  "admin.shipping_methods",
  "admin.users",
  "textAngular",
  "admin.side_menu",
  "admin.taxons",
  'admin.indexUtils',
  'admin.dropdown',
  'pasvaz.bindonce',
  'ngSanitize',
  'ngTagsInput']
)
\ No newline at end of file
+angular.module("admin.enterprises", [
  "admin.paymentMethods",
  "admin.utils",
  "admin.shippingMethods",
  "admin.users",
  "textAngular",
  "admin.side_menu",
  "admin.taxons",
  'admin.indexUtils',
  'admin.dropdown',
  'pasvaz.bindonce',
  'ngSanitize',
  'ngTagsInput']
)
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/payment_methods/controllers/payment_method_controller.js.coffee b/app/assets/javascripts/admin/payment_methods/controllers/payment_method_controller.js.coffee
index 092fd5bbd2..c2595faa6d 100644
--- a/app/assets/javascripts/admin/payment_methods/controllers/payment_method_controller.js.coffee
+++ b/app/assets/javascripts/admin/payment_methods/controllers/payment_method_controller.js.coffee
@@ -1,4 +1,4 @@
-angular.module("admin.payment_methods")
+angular.module("admin.paymentMethods")
   .controller "paymentMethodCtrl", ($scope, PaymentMethods) ->
     $scope.findPaymentMethodByID = (id) ->
-      $scope.PaymentMethod = PaymentMethods.findByID(id)
\ No newline at end of file
+      $scope.PaymentMethod = PaymentMethods.findByID(id)
diff --git a/app/assets/javascripts/admin/payment_methods/payment_methods.js.coffee b/app/assets/javascripts/admin/payment_methods/payment_methods.js.coffee
index e75142ae0d..01553647d4 100644
--- a/app/assets/javascripts/admin/payment_methods/payment_methods.js.coffee
+++ b/app/assets/javascripts/admin/payment_methods/payment_methods.js.coffee
@@ -1 +1 @@
-angular.module("admin.payment_methods", [])
\ No newline at end of file
+angular.module("admin.paymentMethods", [])
diff --git a/app/assets/javascripts/admin/payment_methods/services/payment_methods.js.coffee b/app/assets/javascripts/admin/payment_methods/services/payment_methods.js.coffee
index 21e557cac3..c31a20d96f 100644
--- a/app/assets/javascripts/admin/payment_methods/services/payment_methods.js.coffee
+++ b/app/assets/javascripts/admin/payment_methods/services/payment_methods.js.coffee
@@ -1,4 +1,4 @@
-angular.module("admin.payment_methods")
+angular.module("admin.paymentMethods")
   .factory "PaymentMethods", (paymentMethods) ->
     new class PaymentMethods
       paymentMethods: paymentMethods
diff --git a/app/assets/javascripts/admin/shipping_methods/controllers/shipping_methods_controller.js.coffee b/app/assets/javascripts/admin/shipping_methods/controllers/shipping_methods_controller.js.coffee
index aac83f8cc1..91569b2256 100644
--- a/app/assets/javascripts/admin/shipping_methods/controllers/shipping_methods_controller.js.coffee
+++ b/app/assets/javascripts/admin/shipping_methods/controllers/shipping_methods_controller.js.coffee
@@ -1,4 +1,4 @@
-angular.module("admin.shipping_methods")
+angular.module("admin.shippingMethods")
   .controller "shippingMethodsCtrl", ($scope, ShippingMethods) ->
     $scope.findShippingMethodByID = (id) ->
       $scope.ShippingMethod = ShippingMethods.findByID(id)
diff --git a/app/assets/javascripts/admin/shipping_methods/services/shipping_methods.js.coffee b/app/assets/javascripts/admin/shipping_methods/services/shipping_methods.js.coffee
index 556445c869..c691f5dae5 100644
--- a/app/assets/javascripts/admin/shipping_methods/services/shipping_methods.js.coffee
+++ b/app/assets/javascripts/admin/shipping_methods/services/shipping_methods.js.coffee
@@ -1,4 +1,4 @@
-angular.module("admin.shipping_methods")
+angular.module("admin.shippingMethods")
   .factory "ShippingMethods", (shippingMethods) ->
     new class ShippingMethods
       shippingMethods: shippingMethods
diff --git a/app/assets/javascripts/admin/shipping_methods/shipping_methods.js.coffee b/app/assets/javascripts/admin/shipping_methods/shipping_methods.js.coffee
index 99aeb9566d..01e989a104 100644
--- a/app/assets/javascripts/admin/shipping_methods/shipping_methods.js.coffee
+++ b/app/assets/javascripts/admin/shipping_methods/shipping_methods.js.coffee
@@ -1 +1 @@
-angular.module("admin.shipping_methods", [])
\ No newline at end of file
+angular.module("admin.shippingMethods", [])
diff --git a/app/helpers/admin/injection_helper.rb b/app/helpers/admin/injection_helper.rb
index 511eced707..36463800bc 100644
--- a/app/helpers/admin/injection_helper.rb
+++ b/app/helpers/admin/injection_helper.rb
@@ -20,11 +20,11 @@ module Admin
     end
 
     def admin_inject_payment_methods
-      admin_inject_json_ams_array "admin.payment_methods", "paymentMethods", @payment_methods, Api::Admin::IdNameSerializer
+      admin_inject_json_ams_array "admin.paymentMethods", "paymentMethods", @payment_methods, Api::Admin::IdNameSerializer
     end
 
     def admin_inject_shipping_methods
-      admin_inject_json_ams_array "admin.shipping_methods", "shippingMethods", @shipping_methods, Api::Admin::IdNameSerializer
+      admin_inject_json_ams_array "admin.shippingMethods", "shippingMethods", @shipping_methods, Api::Admin::IdNameSerializer
     end
 
     def admin_inject_shops(ngModule='admin.customers')
diff --git a/app/overrides/spree/admin/shipping_methods/_form/replace_form_fields.html.haml.deface b/app/overrides/spree/admin/shipping_methods/_form/replace_form_fields.html.haml.deface
index 190cff1a17..3ec441449e 100644
--- a/app/overrides/spree/admin/shipping_methods/_form/replace_form_fields.html.haml.deface
+++ b/app/overrides/spree/admin/shipping_methods/_form/replace_form_fields.html.haml.deface
@@ -48,4 +48,4 @@
 
   .row
     .alpha.eleven.columns
-      = render :partial => 'spree/admin/shared/calculator_fields', :locals => { :f => f }
\ No newline at end of file
+      = render :partial => 'spree/admin/shared/calculator_fields', :locals => { :f => f }