diff --git a/app/assets/javascripts/admin/admin.js.coffee b/app/assets/javascripts/admin/admin.js.coffee
index ba07bb7933..cf88326ba5 100644
--- a/app/assets/javascripts/admin/admin.js.coffee
+++ b/app/assets/javascripts/admin/admin.js.coffee
@@ -1,3 +1,3 @@
-window.Admin = angular.module("ofn.admin", ["ngResource","ofn.dropdown"]).config ($httpProvider) ->
+angular.module("ofn.admin", ["ngResource","ofn.dropdown"]).config ($httpProvider) ->
   $httpProvider.defaults.headers.common["X-CSRF-Token"] = $("meta[name=csrf-token]").attr("content")
   $httpProvider.defaults.headers.common["Accept"] = "application/json, text/javascript, */*"
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/bulk_order_management.js.coffee b/app/assets/javascripts/admin/bulk_order_management.js.coffee
index 7a1edcbca6..9ba34790a8 100644
--- a/app/assets/javascripts/admin/bulk_order_management.js.coffee
+++ b/app/assets/javascripts/admin/bulk_order_management.js.coffee
@@ -1,4 +1,4 @@
-Admin.controller "AdminOrderMgmtCtrl", [
+angular.module("ofn.admin").controller "AdminOrderMgmtCtrl", [
   "$scope", "$http", "dataFetcher", "blankOption", "pendingChanges"
   ($scope, $http, dataFetcher, blankOption, pendingChanges) ->
 
diff --git a/app/assets/javascripts/admin/bulk_product_update.js.coffee b/app/assets/javascripts/admin/bulk_product_update.js.coffee
index 4df57d6689..8d50a3dc1f 100644
--- a/app/assets/javascripts/admin/bulk_product_update.js.coffee
+++ b/app/assets/javascripts/admin/bulk_product_update.js.coffee
@@ -1,4 +1,4 @@
-Admin.controller "AdminProductEditCtrl", [
+angular.module("ofn.admin").controller "AdminProductEditCtrl", [
   "$scope", "$timeout", "$http", "dataFetcher", "DirtyProducts"
   ($scope, $timeout, $http, dataFetcher, DirtyProducts) ->
     $scope.updateStatusMessage =
diff --git a/app/assets/javascripts/admin/controllers/enterprises_dashboard_controller.js.coffee b/app/assets/javascripts/admin/controllers/enterprises_dashboard_controller.js.coffee
index b9584b74cc..ad72ff3529 100644
--- a/app/assets/javascripts/admin/controllers/enterprises_dashboard_controller.js.coffee
+++ b/app/assets/javascripts/admin/controllers/enterprises_dashboard_controller.js.coffee
@@ -1,4 +1,4 @@
-Admin.controller "enterprisesDashboardCtrl", [
+angular.module("ofn.admin").controller "enterprisesDashboardCtrl", [
   "$scope"
   ($scope) ->
     $scope.activeTab = "hubs"
diff --git a/app/assets/javascripts/admin/directives/confirm_link_path.js.coffee b/app/assets/javascripts/admin/directives/confirm_link_path.js.coffee
index e0e0511f0c..2c8dba4baf 100644
--- a/app/assets/javascripts/admin/directives/confirm_link_path.js.coffee
+++ b/app/assets/javascripts/admin/directives/confirm_link_path.js.coffee
@@ -1,4 +1,4 @@
-Admin.directive "ofnConfirmLinkPath", (ofnConfirmHandler) ->
+angular.module("ofn.admin").directive "ofnConfirmLinkPath", (ofnConfirmHandler) ->
   restrict: "A"
   scope:
     path: "@ofnConfirmLinkPath"
diff --git a/app/assets/javascripts/admin/directives/confirm_model_change.js.coffee b/app/assets/javascripts/admin/directives/confirm_model_change.js.coffee
index aba2cd919e..a0b5272981 100644
--- a/app/assets/javascripts/admin/directives/confirm_model_change.js.coffee
+++ b/app/assets/javascripts/admin/directives/confirm_model_change.js.coffee
@@ -1,4 +1,4 @@
-Admin.directive "ofnConfirmModelChange", (ofnConfirmHandler,$timeout) ->
+angular.module("ofn.admin").directive "ofnConfirmModelChange", (ofnConfirmHandler,$timeout) ->
   restrict: "A"
   link: (scope, element, attrs) ->
     handler = ofnConfirmHandler scope, -> scope.fetchOrders()
diff --git a/app/assets/javascripts/admin/directives/date_picker.js.coffee b/app/assets/javascripts/admin/directives/date_picker.js.coffee
index 3a07bfd3f5..6b5cac3e1b 100644
--- a/app/assets/javascripts/admin/directives/date_picker.js.coffee
+++ b/app/assets/javascripts/admin/directives/date_picker.js.coffee
@@ -1,4 +1,4 @@
-Admin.directive "datepicker", ->
+angular.module("ofn.admin").directive "datepicker", ->
   require: "ngModel"
   link: (scope, element, attrs, ngModel) ->
     element.datepicker
diff --git a/app/assets/javascripts/admin/directives/datetime_picker.js.coffee b/app/assets/javascripts/admin/directives/datetime_picker.js.coffee
index 232d958b99..b0d91e538a 100644
--- a/app/assets/javascripts/admin/directives/datetime_picker.js.coffee
+++ b/app/assets/javascripts/admin/directives/datetime_picker.js.coffee
@@ -1,4 +1,4 @@
-Admin.directive "datetimepicker", ->
+angular.module("ofn.admin").directive "datetimepicker", ->
   require: "ngModel"
   link: (scope, element, attrs, ngModel) ->
     element.datetimepicker
diff --git a/app/assets/javascripts/admin/directives/decimal.js.coffee b/app/assets/javascripts/admin/directives/decimal.js.coffee
index 8077f90c06..f4bed8e371 100644
--- a/app/assets/javascripts/admin/directives/decimal.js.coffee
+++ b/app/assets/javascripts/admin/directives/decimal.js.coffee
@@ -1,4 +1,4 @@
-Admin.directive "ofnDecimal", ->
+angular.module("ofn.admin").directive "ofnDecimal", ->
   require: "ngModel"
   link: (scope, element, attrs, ngModel) ->
     numRegExp = /^\d+(\.\d+)?$/
diff --git a/app/assets/javascripts/admin/directives/line_item_upd_attr.js.coffee b/app/assets/javascripts/admin/directives/line_item_upd_attr.js.coffee
index a71aa42997..c83d7fdc0f 100644
--- a/app/assets/javascripts/admin/directives/line_item_upd_attr.js.coffee
+++ b/app/assets/javascripts/admin/directives/line_item_upd_attr.js.coffee
@@ -1,4 +1,4 @@
-Admin.directive "ofnLineItemUpdAttr", [
+angular.module("ofn.admin").directive "ofnLineItemUpdAttr", [
   "switchClass", "pendingChanges"
   (switchClass, pendingChanges) ->
     require: "ngModel"
diff --git a/app/assets/javascripts/admin/directives/select2_min_search.js.coffee b/app/assets/javascripts/admin/directives/select2_min_search.js.coffee
index c33beb710e..1d55d886aa 100644
--- a/app/assets/javascripts/admin/directives/select2_min_search.js.coffee
+++ b/app/assets/javascripts/admin/directives/select2_min_search.js.coffee
@@ -1,4 +1,4 @@
-Admin.directive "ofnSelect2MinSearch", ->
+angular.module("ofn.admin").directive "ofnSelect2MinSearch", ->
   require: 'ngModel'
   link: (scope, element, attrs, ngModel) ->
     element.select2
diff --git a/app/assets/javascripts/admin/directives/taxon_autocomplete.js.coffee b/app/assets/javascripts/admin/directives/taxon_autocomplete.js.coffee
index 0705d04a23..e5713274ef 100644
--- a/app/assets/javascripts/admin/directives/taxon_autocomplete.js.coffee
+++ b/app/assets/javascripts/admin/directives/taxon_autocomplete.js.coffee
@@ -1,4 +1,4 @@
-Admin.directive "ofnTaxonAutocomplete", (Taxons) ->
+angular.module("ofn.admin").directive "ofnTaxonAutocomplete", (Taxons) ->
   # Adapted from Spree's existing taxon autocompletion
   require: "ngModel"
   link: (scope,element,attrs,ngModel) ->
diff --git a/app/assets/javascripts/admin/directives/toggle_column.js.coffee b/app/assets/javascripts/admin/directives/toggle_column.js.coffee
index 2337a0fb58..1b8487eeb1 100644
--- a/app/assets/javascripts/admin/directives/toggle_column.js.coffee
+++ b/app/assets/javascripts/admin/directives/toggle_column.js.coffee
@@ -1,4 +1,4 @@
-Admin.directive "ofnToggleColumn", ->
+angular.module("ofn.admin").directive "ofnToggleColumn", ->
   link: (scope, element, attrs) ->
     element.addClass "selected" if scope.column.visible
     element.click "click", ->
diff --git a/app/assets/javascripts/admin/directives/toggle_variants.js.coffee b/app/assets/javascripts/admin/directives/toggle_variants.js.coffee
index 8c07490359..879942d698 100644
--- a/app/assets/javascripts/admin/directives/toggle_variants.js.coffee
+++ b/app/assets/javascripts/admin/directives/toggle_variants.js.coffee
@@ -1,4 +1,4 @@
-Admin.directive "ofnToggleVariants", ->
+angular.module("ofn.admin").directive "ofnToggleVariants", ->
   link: (scope, element, attrs) ->
     if scope.displayProperties[scope.product.id].showVariants
       element.removeClass "icon-chevron-right"
diff --git a/app/assets/javascripts/admin/directives/track_product.js.coffee b/app/assets/javascripts/admin/directives/track_product.js.coffee
index 3667794712..a4ea3865c0 100644
--- a/app/assets/javascripts/admin/directives/track_product.js.coffee
+++ b/app/assets/javascripts/admin/directives/track_product.js.coffee
@@ -1,4 +1,4 @@
-Admin.directive "ofnTrackProduct", ["DirtyProducts", (DirtyProducts) ->
+angular.module("ofn.admin").directive "ofnTrackProduct", ["DirtyProducts", (DirtyProducts) ->
   require: "ngModel"
   link: (scope, element, attrs, ngModel) ->
     ngModel.$parsers.push (viewValue) ->
diff --git a/app/assets/javascripts/admin/directives/track_variant.js.coffee b/app/assets/javascripts/admin/directives/track_variant.js.coffee
index 189d5043fe..ab17ebcfa5 100644
--- a/app/assets/javascripts/admin/directives/track_variant.js.coffee
+++ b/app/assets/javascripts/admin/directives/track_variant.js.coffee
@@ -1,4 +1,4 @@
-Admin.directive "ofnTrackVariant", ["DirtyProducts", (DirtyProducts) ->
+angular.module("ofn.admin").directive "ofnTrackVariant", ["DirtyProducts", (DirtyProducts) ->
   require: "ngModel"
   link: (scope, element, attrs, ngModel) ->
     ngModel.$parsers.push (viewValue) ->
diff --git a/app/assets/javascripts/admin/filters/range_array.js.coffee b/app/assets/javascripts/admin/filters/range_array.js.coffee
index 5056476f1b..be4a020442 100644
--- a/app/assets/javascripts/admin/filters/range_array.js.coffee
+++ b/app/assets/javascripts/admin/filters/range_array.js.coffee
@@ -1,4 +1,4 @@
-Admin.filter "rangeArray", ->
+angular.module("ofn.admin").filter "rangeArray", ->
   return (input,start,end) ->
     input.push(i) for i in [start..end]
     input
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/filters/select_filter.js.coffee b/app/assets/javascripts/admin/filters/select_filter.js.coffee
index 562be954b2..2b03abd613 100644
--- a/app/assets/javascripts/admin/filters/select_filter.js.coffee
+++ b/app/assets/javascripts/admin/filters/select_filter.js.coffee
@@ -1,4 +1,4 @@
-Admin.filter "selectFilter", (blankOption) ->
+angular.module("ofn.admin").filter "selectFilter", (blankOption) ->
     return (lineItems,selectedSupplier,selectedDistributor,selectedOrderCycle) ->
       filtered = []
       filtered.push lineItem for lineItem in lineItems when (angular.equals(selectedSupplier,"0") || lineItem.supplier.id == selectedSupplier) &&
diff --git a/app/assets/javascripts/admin/filters/variant_filter.js.coffee b/app/assets/javascripts/admin/filters/variant_filter.js.coffee
index 039c4cc46f..ddbc0f2711 100644
--- a/app/assets/javascripts/admin/filters/variant_filter.js.coffee
+++ b/app/assets/javascripts/admin/filters/variant_filter.js.coffee
@@ -1,4 +1,4 @@
-Admin.filter "variantFilter", ->
+angular.module("ofn.admin").filter "variantFilter", ->
     return (lineItems,selectedUnitsProduct,selectedUnitsVariant,sharedResource) ->
       filtered = []
       filtered.push lineItem for lineItem in lineItems when (angular.equals(selectedUnitsProduct,{}) ||
diff --git a/app/assets/javascripts/admin/services/blank_option.js.coffee b/app/assets/javascripts/admin/services/blank_option.js.coffee
index 9913a6511d..42ff69a77b 100644
--- a/app/assets/javascripts/admin/services/blank_option.js.coffee
+++ b/app/assets/javascripts/admin/services/blank_option.js.coffee
@@ -1,2 +1,2 @@
-Admin.value "blankOption", ->
+angular.module("ofn.admin").value "blankOption", ->
   { id: "0", name: "All" }
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/services/confirm_handler.js.coffee b/app/assets/javascripts/admin/services/confirm_handler.js.coffee
index 51b92848dc..88655e34e3 100644
--- a/app/assets/javascripts/admin/services/confirm_handler.js.coffee
+++ b/app/assets/javascripts/admin/services/confirm_handler.js.coffee
@@ -1,4 +1,4 @@
-Admin.factory "ofnConfirmHandler", (pendingChanges, $compile, $q) ->
+angular.module("ofn.admin").factory "ofnConfirmHandler", (pendingChanges, $compile, $q) ->
   return (scope, callback) ->
     template = "<div id='dialog-div' style='padding: 10px'><h6>Unsaved changes currently exist, save now or ignore?</h6></div>"
     dialogDiv = $compile(template)(scope)
diff --git a/app/assets/javascripts/admin/services/data_fetcher.js.coffee b/app/assets/javascripts/admin/services/data_fetcher.js.coffee
index 0227d26fc7..735e4cc6bb 100644
--- a/app/assets/javascripts/admin/services/data_fetcher.js.coffee
+++ b/app/assets/javascripts/admin/services/data_fetcher.js.coffee
@@ -1,4 +1,4 @@
-Admin.factory "dataFetcher", [
+angular.module("ofn.admin").factory "dataFetcher", [
   "$http", "$q"
   ($http, $q) ->
     return (dataLocation) ->
diff --git a/app/assets/javascripts/admin/services/data_submitter.js.coffee b/app/assets/javascripts/admin/services/data_submitter.js.coffee
index 6a08ca2d33..7d121ec645 100644
--- a/app/assets/javascripts/admin/services/data_submitter.js.coffee
+++ b/app/assets/javascripts/admin/services/data_submitter.js.coffee
@@ -1,4 +1,4 @@
-Admin.factory "dataSubmitter", [
+angular.module("ofn.admin").factory "dataSubmitter", [
   "$http", "$q", "switchClass"
   ($http, $q, switchClass) ->
     return (changeObj) ->
diff --git a/app/assets/javascripts/admin/services/dirty_products.js.coffee b/app/assets/javascripts/admin/services/dirty_products.js.coffee
index bb8614205e..16c10e1e34 100644
--- a/app/assets/javascripts/admin/services/dirty_products.js.coffee
+++ b/app/assets/javascripts/admin/services/dirty_products.js.coffee
@@ -1,4 +1,4 @@
-Admin.factory "DirtyProducts", ($parse) ->
+angular.module("ofn.admin").factory "DirtyProducts", ($parse) ->
   # Temporary service to track changes in products on admin bulk product edit
   dirtyProducts = {}
   
diff --git a/app/assets/javascripts/admin/services/pending_changes.js.coffee b/app/assets/javascripts/admin/services/pending_changes.js.coffee
index df66900aa7..d72a4ac7bc 100644
--- a/app/assets/javascripts/admin/services/pending_changes.js.coffee
+++ b/app/assets/javascripts/admin/services/pending_changes.js.coffee
@@ -1,4 +1,4 @@
-Admin.factory "pendingChanges",[
+angular.module("ofn.admin").factory "pendingChanges",[
   "dataSubmitter"
   (dataSubmitter) ->
     pendingChanges: {}
diff --git a/app/assets/javascripts/admin/services/switch_class.js.coffee b/app/assets/javascripts/admin/services/switch_class.js.coffee
index bdd61dac2e..e39c52d1f6 100644
--- a/app/assets/javascripts/admin/services/switch_class.js.coffee
+++ b/app/assets/javascripts/admin/services/switch_class.js.coffee
@@ -1,4 +1,4 @@
-Admin.factory "switchClass", [
+angular.module("ofn.admin").factory "switchClass", [
   "$timeout"
   ($timeout) ->
     return (element,classToAdd,removeClasses,timeout) ->
diff --git a/app/assets/javascripts/admin/services/taxons.js.coffee b/app/assets/javascripts/admin/services/taxons.js.coffee
index 5e17dca657..1779ec3518 100644
--- a/app/assets/javascripts/admin/services/taxons.js.coffee
+++ b/app/assets/javascripts/admin/services/taxons.js.coffee
@@ -1,4 +1,4 @@
-Admin.factory "Taxons", ($resource) ->
+angular.module("ofn.admin").factory "Taxons", ($resource) ->
   resource = $resource "/admin/taxons/search"
 
   return {