diff --git a/ecommerce/extensions/refund/__init__.py b/ecommerce/extensions/refund/__init__.py
index 9331f12a300..e69de29bb2d 100644
--- a/ecommerce/extensions/refund/__init__.py
+++ b/ecommerce/extensions/refund/__init__.py
@@ -1 +0,0 @@
-default_app_config = 'ecommerce.extensions.refund.apps.RefundConfig'  # pragma: no cover
diff --git a/ecommerce/settings/_oscar.py b/ecommerce/settings/_oscar.py
index 6439cc1a069..e85fdd0c0f5 100644
--- a/ecommerce/settings/_oscar.py
+++ b/ecommerce/settings/_oscar.py
@@ -14,48 +14,48 @@
 
 # APP CONFIGURATION
 OSCAR_APPS = [
-    'oscar',
-    'oscar.apps.address',
-    'oscar.apps.shipping',
-    'oscar.apps.catalogue.reviews',
-    'oscar.apps.search',
-    'oscar.apps.wishlists',
-
-    'ecommerce.extensions',
-    'ecommerce.extensions.iap',
-    'ecommerce.extensions.api',
+    "oscar.config.Shop",
+    "oscar.apps.address.apps.AddressConfig",
+    'oscar.apps.shipping.apps.ShippingConfig',
+    'oscar.apps.catalogue.reviews.apps.CatalogueReviewsConfig',
+    "oscar.apps.search.apps.SearchConfig",
+    "oscar.apps.wishlists.apps.WishlistsConfig",
+
+    'ecommerce.extensions.config.EdxShop',
+    'ecommerce.extensions.iap.apps.IapConfig',
+    'ecommerce.extensions.api', # isn't an oscar app
     'ecommerce.extensions.communication.apps.CommunicationConfig',
-    'ecommerce.extensions.fulfillment',
-    'ecommerce.extensions.refund',
-    'ecommerce.extensions.analytics',
-    'ecommerce.extensions.basket',
-    'ecommerce.extensions.catalogue',
-    'ecommerce.extensions.checkout',
-    'ecommerce.extensions.customer',
-    'ecommerce.extensions.offer',
-    'ecommerce.extensions.order',
-    'ecommerce.extensions.partner',
-    'ecommerce.extensions.payment',
-    'ecommerce.extensions.voucher',
+    'ecommerce.extensions.fulfillment', # isn't an oscar app
+    'ecommerce.extensions.refund.apps.RefundConfig',
+    'ecommerce.extensions.analytics.apps.AnalyticsConfig',
+    'ecommerce.extensions.basket.apps.BasketConfig',
+    'ecommerce.extensions.catalogue.apps.CatalogueConfig',
+    'ecommerce.extensions.checkout.apps.CheckoutConfig',
+    'ecommerce.extensions.customer.apps.CustomerConfig',
+    'ecommerce.extensions.offer.apps.OfferConfig',
+    'ecommerce.extensions.order.apps.OrderConfig',
+    'ecommerce.extensions.partner.apps.PartnerConfig',
+    'ecommerce.extensions.payment.apps.PaymentConfig',
+    'ecommerce.extensions.voucher.apps.VoucherConfig',
 
     # Dashboard applications depend on models declared in the core applications (basket, catalogue, etc).
     # To prevent issues with Oscar’s dynamic model loading, overrides of dashboard applications should
     # follow overrides of core applications
-    'oscar.apps.dashboard.reports',
-    'oscar.apps.dashboard.partners',
-    'oscar.apps.dashboard.pages',
-    'oscar.apps.dashboard.ranges',
-    'oscar.apps.dashboard.reviews',
-    'oscar.apps.dashboard.vouchers',
-    'oscar.apps.dashboard.communications',
-    'oscar.apps.dashboard.shipping',
-
-    'ecommerce.extensions.dashboard',
-    'ecommerce.extensions.dashboard.catalogue',
-    'ecommerce.extensions.dashboard.offers',
+    "oscar.apps.dashboard.reports.apps.ReportsDashboardConfig",
+    "oscar.apps.dashboard.partners.apps.PartnersDashboardConfig",
+    "oscar.apps.dashboard.pages.apps.PagesDashboardConfig",
+    "oscar.apps.dashboard.ranges.apps.RangesDashboardConfig",
+    'oscar.apps.dashboard.reviews.apps.ReviewsDashboardConfig',
+    "oscar.apps.dashboard.vouchers.apps.VouchersDashboardConfig",
+    "oscar.apps.dashboard.communications.apps.CommunicationsDashboardConfig",
+    'oscar.apps.dashboard.shipping.apps.ShippingDashboardConfig',
+
+    'ecommerce.extensions.dashboard.apps.DashboardConfig',
+    'ecommerce.extensions.dashboard.catalogue.apps.CatalogueDashboardConfig',
+    'ecommerce.extensions.dashboard.offers.apps.OffersDashboardConfig',
     'ecommerce.extensions.dashboard.refunds.apps.RefundsDashboardConfig',  # Providing full path to make the signals work
-    'ecommerce.extensions.dashboard.orders',
-    'ecommerce.extensions.dashboard.users',
+    'ecommerce.extensions.dashboard.orders.apps.OrdersDashboardConfig',
+    'ecommerce.extensions.dashboard.users.apps.UsersDashboardConfig',
 
     # 3rd-party apps that oscar depends on
     'haystack',