diff --git a/payment/uc_2checkout/uc_2checkout.module b/payment/uc_2checkout/uc_2checkout.module
index 7a855d4..b5ed8ac 100644
--- a/payment/uc_2checkout/uc_2checkout.module
+++ b/payment/uc_2checkout/uc_2checkout.module
@@ -13,7 +13,7 @@ use Drupal\Core\Routing\RouteMatchInterface;
  */
 function uc_2checkout_help($path, RouteMatchInterface $route_match) {
   switch ($path) {
-    case 'admin/store/settings/payment/method/%':
+    case 'admin/store/config/payment/method/%':
       if ($arg[5] == '2checkout') {
         return '<p>' . t('To accept PayPal payments in 2Checkout, please ensure that demo mode is disabled and your store currency is one of USD, AUD, CAD, EUR or GBP.') . '</p>';
       }
diff --git a/payment/uc_credit/src/Tests/CreditCardTest.php b/payment/uc_credit/src/Tests/CreditCardTest.php
index 169788f..8ad250f 100644
--- a/payment/uc_credit/src/Tests/CreditCardTest.php
+++ b/payment/uc_credit/src/Tests/CreditCardTest.php
@@ -71,7 +71,7 @@ class CreditCardTest extends UbercartTestBase {
    */
   protected function configureCreditCard() {
     $this->drupalPostForm(
-      'admin/store/settings/payment',
+      'admin/store/config/payment',
       array('methods[credit][status]' => TRUE),
       t('Save configuration')
     );
@@ -88,7 +88,7 @@ class CreditCardTest extends UbercartTestBase {
     \Drupal::service('file_system')->mkdir('sites/default/files/simpletest.keys', 0755);
 
     $this->drupalPostForm(
-      'admin/store/settings/payment/method/credit',
+      'admin/store/config/payment/method/credit',
       array(
         'uc_credit_encryption_path' => 'sites/default/files/simpletest.keys',
       ),
@@ -114,7 +114,7 @@ class CreditCardTest extends UbercartTestBase {
    */
   protected function configureGateway() {
     $this->drupalPostForm(
-      'admin/store/settings/payment/method/credit',
+      'admin/store/config/payment/method/credit',
       array(
         'uc_payment_credit_gateway' => 'test_gateway',
         'uc_pg_test_gateway_enabled' => TRUE,
@@ -155,11 +155,11 @@ class CreditCardTest extends UbercartTestBase {
     $temp_variable = $config->get('encryption_path');
     $config->set('encryption_path', '')->save();
 
-    $this->drupalGet('admin/store/settings/payment/method/credit');
+    $this->drupalGet('admin/store/config/payment/method/credit');
     $this->assertText(t('Credit card security settings must be configured in the security settings tab.'));
 
     $this->drupalPostForm(
-      'admin/store/settings/payment/method/credit',
+      'admin/store/config/payment/method/credit',
       array(),
       t('Save configuration')
     );
@@ -173,7 +173,7 @@ class CreditCardTest extends UbercartTestBase {
 
     // Try to submit settings form with an empty key file path.
     $this->drupalPostForm(
-      'admin/store/settings/payment/method/credit',
+      'admin/store/config/payment/method/credit',
       array('uc_credit_encryption_path' => ''),
       t('Save configuration')
     );
@@ -181,7 +181,7 @@ class CreditCardTest extends UbercartTestBase {
 
     // Specify non-existent directory
     $this->drupalPostForm(
-      'admin/store/settings/payment/method/credit',
+      'admin/store/config/payment/method/credit',
       array('uc_credit_encryption_path' => 'sites/default/ljkh/asdfasfaaaaa'),
       t('Save configuration')
     );
@@ -190,7 +190,7 @@ class CreditCardTest extends UbercartTestBase {
     // Next, specify existing directory that's write protected.
     // Use /dev, as that should never be accessible.
     $this->drupalPostForm(
-      'admin/store/settings/payment/method/credit',
+      'admin/store/config/payment/method/credit',
       array('uc_credit_encryption_path' => '/dev'),
       t('Save configuration')
     );
@@ -199,7 +199,7 @@ class CreditCardTest extends UbercartTestBase {
     // Next, specify writeable directory, but with excess whitespace
     // and trailing /
     $this->drupalPostForm(
-      'admin/store/settings/payment/method/credit',
+      'admin/store/config/payment/method/credit',
       array('uc_credit_encryption_path' => '  sites/default/files/testkey/ '),
       t('Save configuration')
     );
@@ -219,7 +219,7 @@ class CreditCardTest extends UbercartTestBase {
 
     // Finally, specify good directory
     $this->drupalPostForm(
-      'admin/store/settings/payment/method/credit',
+      'admin/store/config/payment/method/credit',
       array('uc_credit_encryption_path' => 'sites/default/files/testkey'),
       t('Save configuration')
     );
diff --git a/payment/uc_payment/src/Form/PaymentMethodsForm.php b/payment/uc_payment/src/Form/PaymentMethodsForm.php
index 83ab370..3c93233 100644
--- a/payment/uc_payment/src/Form/PaymentMethodsForm.php
+++ b/payment/uc_payment/src/Form/PaymentMethodsForm.php
@@ -126,7 +126,7 @@ class PaymentMethodsForm extends ConfigFormBase {
 
       // $links['conditions'] = array(
       //   'title' => t('Conditions'),
-      //   'url' => Url::fromRoute('admin/store/settings/payment/manage/uc_payment_method_', ['method' => $id]),
+      //   'url' => Url::fromRoute('admin/store/config/payment/manage/uc_payment_method_', ['method' => $id]),
       // );
 
       $form['methods'][$id]['settings'] = array(
diff --git a/payment/uc_payment/src/Tests/PaymentPaneTest.php b/payment/uc_payment/src/Tests/PaymentPaneTest.php
index f9f8f3b..c49898d 100644
--- a/payment/uc_payment/src/Tests/PaymentPaneTest.php
+++ b/payment/uc_payment/src/Tests/PaymentPaneTest.php
@@ -30,20 +30,20 @@ class PaymentPaneTest extends UbercartTestBase {
   public function testPaymentMethodOptions() {
     // No payment methods.
     $edit = array('methods[check][status]' => FALSE);
-    $this->drupalPostForm('admin/store/settings/payment', $edit, 'Save configuration');
+    $this->drupalPostForm('admin/store/config/payment', $edit, 'Save configuration');
     $this->drupalGet('cart/checkout');
     $this->assertText('Checkout cannot be completed without any payment methods enabled. Please contact an administrator to resolve the issue.');
 
     // Single payment method.
     $edit = array('methods[check][status]' => TRUE);
-    $this->drupalPostForm('admin/store/settings/payment', $edit, 'Save configuration');
+    $this->drupalPostForm('admin/store/config/payment', $edit, 'Save configuration');
     $this->drupalGet('cart/checkout');
     $this->assertNoText('Select a payment method from the following options.');
     $this->assertFieldByXPath("//input[@name='panes[payment][payment_method]' and @disabled='disabled']");
 
     // Multiple payment methods.
     $edit = array('methods[other][status]' => TRUE);
-    $this->drupalPostForm('admin/store/settings/payment', $edit, 'Save configuration');
+    $this->drupalPostForm('admin/store/config/payment', $edit, 'Save configuration');
     $this->drupalGet('cart/checkout');
     $this->assertText('Select a payment method from the following options.');
     $this->assertNoFieldByXPath("//input[@name='panes[payment][payment_method]' and @disabled='disabled']");
@@ -56,14 +56,14 @@ class PaymentPaneTest extends UbercartTestBase {
     $edit = array(
       'panes[payment][settings][show_preview]' => TRUE,
     );
-    $this->drupalPostForm('admin/store/settings/checkout', $edit, 'Save configuration');
+    $this->drupalPostForm('admin/store/config/checkout', $edit, 'Save configuration');
     $this->drupalGet('cart/checkout');
     $this->assertText('Order total:');
 
     $edit = array(
       'panes[payment][settings][show_preview]' => FALSE,
     );
-    $this->drupalPostForm('admin/store/settings/checkout', $edit, 'Save configuration');
+    $this->drupalPostForm('admin/store/config/checkout', $edit, 'Save configuration');
     $this->drupalGet('cart/checkout');
     $this->assertNoText('Order total:');
   }
@@ -74,7 +74,7 @@ class PaymentPaneTest extends UbercartTestBase {
   public function testFreeOrders() {
     $free_product = $this->createProduct(array('price' => 0));
     $edit = array('methods[check][status]' => TRUE);
-    $this->drupalPostForm('admin/store/settings/payment', $edit, 'Save configuration');
+    $this->drupalPostForm('admin/store/config/payment', $edit, 'Save configuration');
 
     // Check that paid products cannot be purchased for free.
     $this->drupalGet('cart/checkout');
diff --git a/payment/uc_payment/uc_payment.links.menu.yml b/payment/uc_payment/uc_payment.links.menu.yml
index 94011f3..e14f416 100644
--- a/payment/uc_payment/uc_payment.links.menu.yml
+++ b/payment/uc_payment/uc_payment.links.menu.yml
@@ -1,5 +1,5 @@
-uc_payment.admin.store.settings.payment:
+uc_payment.admin.store.config.payment:
   title: 'Payment methods'
   description: 'Choose and configure available payment methods.'
   route_name: uc_payment.methods
-  parent: uc_store.admin.store.settings
+  parent: uc_store.admin.store.config
diff --git a/payment/uc_payment/uc_payment.routing.yml b/payment/uc_payment/uc_payment.routing.yml
index 4ea94e6..22260c1 100644
--- a/payment/uc_payment/uc_payment.routing.yml
+++ b/payment/uc_payment/uc_payment.routing.yml
@@ -1,5 +1,5 @@
 uc_payment.methods:
-  path: '/admin/store/settings/payment'
+  path: '/admin/store/config/payment'
   defaults:
     _form: '\Drupal\uc_payment\Form\PaymentMethodsForm'
     _title: 'Payment methods'
@@ -7,7 +7,7 @@ uc_payment.methods:
     _permission: 'administer store'
 
 uc_payment.method_settings:
-  path: '/admin/store/settings/payment/method/{method}'
+  path: '/admin/store/config/payment/method/{method}'
   defaults:
     _form: '\Drupal\uc_payment\Form\PaymentMethodSettingsForm'
   requirements:
diff --git a/payment/uc_payment_pack/src/Tests/PaymentPackTest.php b/payment/uc_payment_pack/src/Tests/PaymentPackTest.php
index fca7397..6b6a5da 100644
--- a/payment/uc_payment_pack/src/Tests/PaymentPackTest.php
+++ b/payment/uc_payment_pack/src/Tests/PaymentPackTest.php
@@ -31,18 +31,18 @@ class PaymentPackTest extends UbercartTestBase {
       'panes[delivery][status]' => FALSE,
       'panes[billing][status]' => FALSE,
     );
-    $this->drupalPostForm('admin/store/settings/checkout', $edit, t('Save configuration'));
+    $this->drupalPostForm('admin/store/config/checkout', $edit, t('Save configuration'));
   }
 
   /**
    * Tests for Check payment method.
    */
   public function testCheck() {
-    $this->drupalGet('admin/store/settings/payment');
+    $this->drupalGet('admin/store/config/payment');
     $this->assertText('Check', 'Check payment method found.');
     $this->assertFieldByName('methods[check][status]', 1, 'Check payment method is enabled by default.');
 
-    $this->drupalGet('admin/store/settings/payment/method/check');
+    $this->drupalGet('admin/store/config/payment/method/check');
     $this->assertTitle('Check settings | Drupal');
     $this->assertText(\Drupal::config('uc_payment_pack.check.settings')->get('policy'), 'Default check payment policy found.');
 
@@ -60,7 +60,7 @@ class PaymentPackTest extends UbercartTestBase {
     //$edit = array(
     //  'uc_check_mailing_country' => $address->country,
     //);
-    //$this->drupalPostAjaxForm('admin/store/settings/payment/method/check', $edit, 'uc_check_mailing_country');
+    //$this->drupalPostAjaxForm('admin/store/config/payment/method/check', $edit, 'uc_check_mailing_country');
     $edit = array(
       'uc_check_mailing_name' => $address->first_name,
       'uc_check_mailing_company' => $address->company,
@@ -82,7 +82,7 @@ class PaymentPackTest extends UbercartTestBase {
     // country before we post the form. Otherwise the zone select won't be
     // populated correctly.
     \Drupal::configFactory()->getEditable('uc_payment_pack.check.settings')->set('mailing_address.country', $country_id)->save();
-    $this->drupalPostForm('admin/store/settings/payment/method/check', $edit, t('Save configuration'));
+    $this->drupalPostForm('admin/store/config/payment/method/check', $edit, t('Save configuration'));
 
     // Test that check settings show up on checkout page.
     $this->drupalGet('cart/checkout');
@@ -134,7 +134,7 @@ class PaymentPackTest extends UbercartTestBase {
    * Tests for Cash on Delivery payment method.
    */
   public function testCashOnDelivery() {
-    $this->drupalGet('admin/store/settings/payment');
+    $this->drupalGet('admin/store/config/payment');
     $this->assertText('Cash on delivery', 'COD payment method found.');
     $this->assertFieldByName('methods[cod][status]', 0, 'COD payment method is disabled by default.');
     $edit = array(
@@ -143,7 +143,7 @@ class PaymentPackTest extends UbercartTestBase {
     );
     $this->drupalPostForm(NULL, $edit, 'Save configuration');
 
-    $this->drupalGet('admin/store/settings/payment/method/cod');
+    $this->drupalGet('admin/store/config/payment/method/cod');
     $this->assertTitle('Cash on delivery settings | Drupal');
     $this->assertText(\Drupal::config('uc_payment_pack.cod.settings')->get('policy'), 'Default COD policy found.');
     // @todo: Test changing the policy on settings page
@@ -175,7 +175,7 @@ class PaymentPackTest extends UbercartTestBase {
    * Tests for Other payment method.
    */
   public function testOther() {
-    $this->drupalGet('admin/store/settings/payment');
+    $this->drupalGet('admin/store/config/payment');
     $this->assertText('Other', 'Other payment method found.');
     $this->assertFieldByName('methods[other][status]', 0, 'Other payment method is disabled by default.');
     $edit = array(
diff --git a/shipping/uc_flatrate/src/Form/FlatrateEditForm.php b/shipping/uc_flatrate/src/Form/FlatrateEditForm.php
index 388f388..5b8a6cc 100644
--- a/shipping/uc_flatrate/src/Form/FlatrateEditForm.php
+++ b/shipping/uc_flatrate/src/Form/FlatrateEditForm.php
@@ -112,7 +112,7 @@ class FlatrateEditForm extends FormBase {
 
       drupal_set_message(t('Created and enabled new flat rate shipping method.'));
       $form_state->setRedirect('uc_quote.methods');
-      //$form_state['redirect'] = 'admin/store/settings/quotes/manage/get_quote_from_flatrate_' . $form_state->getValue('mid');
+      //$form_state['redirect'] = 'admin/store/config/quotes/manage/get_quote_from_flatrate_' . $form_state->getValue('mid');
     }
   }
 
diff --git a/shipping/uc_flatrate/uc_flatrate.routing.yml b/shipping/uc_flatrate/uc_flatrate.routing.yml
index 2aad3dc..4a1dff3 100644
--- a/shipping/uc_flatrate/uc_flatrate.routing.yml
+++ b/shipping/uc_flatrate/uc_flatrate.routing.yml
@@ -1,19 +1,19 @@
 uc_flatrate.add:
-  path: '/admin/store/settings/quotes/methods/flatrate/add'
+  path: '/admin/store/config/quotes/methods/flatrate/add'
   defaults:
     _form: '\Drupal\uc_flatrate\Form\FlatrateEditForm'
   requirements:
     _permission: 'configure quotes'
 
 uc_flatrate.edit:
-  path: '/admin/store/settings/quotes/methods/flatrate/{mid}'
+  path: '/admin/store/config/quotes/methods/flatrate/{mid}'
   defaults:
     _form: '\Drupal\uc_flatrate\Form\FlatrateEditForm'
   requirements:
     _permission: 'configure quotes'
 
 uc_flatrate.delete:
-  path: '/admin/store/settings/quotes/methods/flatrate/{mid}/delete'
+  path: '/admin/store/config/quotes/methods/flatrate/{mid}/delete'
   defaults:
     _form: '\Drupal\uc_flatrate\Form\FlatrateDeleteForm'
   requirements:
diff --git a/shipping/uc_quote/src/Form/QuoteMethodsForm.php b/shipping/uc_quote/src/Form/QuoteMethodsForm.php
index 5ece3f4..44212c1 100644
--- a/shipping/uc_quote/src/Form/QuoteMethodsForm.php
+++ b/shipping/uc_quote/src/Form/QuoteMethodsForm.php
@@ -59,7 +59,7 @@ class QuoteMethodsForm extends ConfigFormBase {
         $operations = isset($method['operations']) ? $method['operations'] : array();
 //        $operations += array('conditions' => array(
 //          'title' => t('conditions'),
-//          'url' => Url::fromRoute('admin/store/settings/quotes/manage/get_quote_from_', ['id' => $id]),
+//          'url' => Url::fromRoute('admin/store/config/quotes/manage/get_quote_from_', ['id' => $id]),
 //          'weight' => 5,
 //        ));
 
diff --git a/shipping/uc_quote/src/Tests/QuoteTest.php b/shipping/uc_quote/src/Tests/QuoteTest.php
index 8e003ef..1f80008 100644
--- a/shipping/uc_quote/src/Tests/QuoteTest.php
+++ b/shipping/uc_quote/src/Tests/QuoteTest.php
@@ -47,7 +47,7 @@ class QuoteTest extends UbercartTestBase {
       'base_rate' => mt_rand(1, 10),
       'product_rate' => mt_rand(1, 10),
     );
-    $this->drupalPostForm('admin/store/settings/quotes/methods/flatrate/add', $edit, 'Submit');
+    $this->drupalPostForm('admin/store/config/quotes/methods/flatrate/add', $edit, 'Submit');
     $method = db_query("SELECT * FROM {uc_flatrate_methods} ORDER BY mid DESC LIMIT 1")->fetchObject();
     // if ($condition) {
     //   $name = 'get_quote_from_flatrate_' . $method->mid;
diff --git a/shipping/uc_quote/uc_quote.links.menu.yml b/shipping/uc_quote/uc_quote.links.menu.yml
index 7a0343b..775d2a1 100644
--- a/shipping/uc_quote/uc_quote.links.menu.yml
+++ b/shipping/uc_quote/uc_quote.links.menu.yml
@@ -1,5 +1,5 @@
-uc_quote.admin.store.settings.quotes:
+uc_quote.admin.store.config.quotes:
   title: 'Shipping quotes'
   description: 'Configure shipping quotes.'
   route_name: uc_quote.methods
-  parent: uc_store.admin.store.settings
+  parent: uc_store.admin.store.config
diff --git a/shipping/uc_quote/uc_quote.routing.yml b/shipping/uc_quote/uc_quote.routing.yml
index 505de94..18ff92e 100644
--- a/shipping/uc_quote/uc_quote.routing.yml
+++ b/shipping/uc_quote/uc_quote.routing.yml
@@ -1,5 +1,5 @@
 uc_quote.methods:
-  path: '/admin/store/settings/quotes'
+  path: '/admin/store/config/quotes'
   defaults:
     _form: '\Drupal\uc_quote\Form\QuoteMethodsForm'
     _title: 'Shipping quotes'
@@ -7,7 +7,7 @@ uc_quote.methods:
     _permission: 'configure quotes'
 
 uc_quote.settings:
-  path: '/admin/store/settings/quotes/settings'
+  path: '/admin/store/config/quotes/settings'
   defaults:
     _form: '\Drupal\uc_quote\Form\QuoteSettingsForm'
     _title: 'Shipping quote settings'
diff --git a/shipping/uc_ups/uc_ups.routing.yml b/shipping/uc_ups/uc_ups.routing.yml
index 2e046eb..67b9d6d 100644
--- a/shipping/uc_ups/uc_ups.routing.yml
+++ b/shipping/uc_ups/uc_ups.routing.yml
@@ -1,5 +1,5 @@
 uc_ups.settings:
-  path: '/admin/store/settings/quotes/settings/ups'
+  path: '/admin/store/config/quotes/settings/ups'
   defaults:
     _form: '\Drupal\uc_ups\Form\UPSSettingsForm'
   requirements:
diff --git a/shipping/uc_usps/uc_usps.routing.yml b/shipping/uc_usps/uc_usps.routing.yml
index 10b5249..905ef17 100644
--- a/shipping/uc_usps/uc_usps.routing.yml
+++ b/shipping/uc_usps/uc_usps.routing.yml
@@ -1,5 +1,5 @@
 uc_usps.settings:
-  path: '/admin/store/settings/quotes/settings/usps'
+  path: '/admin/store/config/quotes/settings/usps'
   defaults:
     _form: '\Drupal\uc_usps\Form\USPSSettingsForm'
   requirements:
diff --git a/shipping/uc_weightquote/src/Form/WeightquoteEditForm.php b/shipping/uc_weightquote/src/Form/WeightquoteEditForm.php
index 5accedc..5477deb 100644
--- a/shipping/uc_weightquote/src/Form/WeightquoteEditForm.php
+++ b/shipping/uc_weightquote/src/Form/WeightquoteEditForm.php
@@ -114,7 +114,7 @@ class WeightquoteEditForm extends FormBase {
 
       drupal_set_message(t('Created and enabled new weight quote shipping method.'));
       $form_state->setRedirect('uc_quote.methods');
-      //$form_state['redirect'] = 'admin/store/settings/quotes/manage/get_quote_from_weightquote_' . $form_state->getValue('mid');
+      //$form_state['redirect'] = 'admin/store/config/quotes/manage/get_quote_from_weightquote_' . $form_state->getValue('mid');
     }
   }
 
diff --git a/shipping/uc_weightquote/uc_weightquote.routing.yml b/shipping/uc_weightquote/uc_weightquote.routing.yml
index 79319c5..6bfcb85 100644
--- a/shipping/uc_weightquote/uc_weightquote.routing.yml
+++ b/shipping/uc_weightquote/uc_weightquote.routing.yml
@@ -1,19 +1,19 @@
 uc_weightquote.add:
-  path: '/admin/store/settings/quotes/methods/weightquote/add'
+  path: '/admin/store/config/quotes/methods/weightquote/add'
   defaults:
     _form: '\Drupal\uc_weightquote\Form\WeightquoteEditForm'
   requirements:
     _permission: 'configure quotes'
 
 uc_weightquote.edit:
-  path: '/admin/store/settings/quotes/methods/weightquote/{mid}'
+  path: '/admin/store/config/quotes/methods/weightquote/{mid}'
   defaults:
     _form: '\Drupal\uc_weightquote\Form\WeightquoteEditForm'
   requirements:
     _permission: 'configure quotes'
 
 uc_weightquote.delete:
-  path: '/admin/store/settings/quotes/methods/weightquote/{mid}/delete'
+  path: '/admin/store/config/quotes/methods/weightquote/{mid}/delete'
   defaults:
     _form: '\Drupal\uc_weightquote\Form\WeightquoteDeleteForm'
   requirements:
diff --git a/uc_ajax_admin/uc_ajax_admin.routing.yml b/uc_ajax_admin/uc_ajax_admin.routing.yml
index 7b8e45b..c5172e0 100644
--- a/uc_ajax_admin/uc_ajax_admin.routing.yml
+++ b/uc_ajax_admin/uc_ajax_admin.routing.yml
@@ -1,5 +1,5 @@
 uc_ajax_admin.settings:
-  path: '/admin/store/settings/checkout/ajax'
+  path: '/admin/store/config/checkout/ajax'
   defaults:
     _form: '\Drupal\uc_ajax_admin\Form\AjaxAdminForm'
     _title: 'Ajax'
diff --git a/uc_attribute/src/Tests/AttributeTest.php b/uc_attribute/src/Tests/AttributeTest.php
index f065e1e..d5a2ed4 100644
--- a/uc_attribute/src/Tests/AttributeTest.php
+++ b/uc_attribute/src/Tests/AttributeTest.php
@@ -383,7 +383,7 @@ class AttributeTest extends UbercartTestBase {
 
     foreach (array('none', 'adjustment', 'total') as $type) {
       $edit['uc_attribute_option_price_format'] = $type;
-      $this->drupalPostForm('admin/store/settings/products', $edit, t('Save configuration'));
+      $this->drupalPostForm('admin/store/config/products', $edit, t('Save configuration'));
 
       $this->drupalGet('node/' . $product->id());
       $this->assertRaw($raw[$type], 'Attribute option pricing is correct.');
diff --git a/uc_cart/src/Tests/CartCheckoutTest.php b/uc_cart/src/Tests/CartCheckoutTest.php
index 6231132..dce26f5 100644
--- a/uc_cart/src/Tests/CartCheckoutTest.php
+++ b/uc_cart/src/Tests/CartCheckoutTest.php
@@ -254,7 +254,7 @@ class CartCheckoutTest extends UbercartTestBase {
       'uc_cart_new_account_password' => TRUE,
     );
     $this->drupalLogin($this->adminUser);
-    $this->drupalPostForm('admin/store/settings/checkout', $settings, t('Save configuration'));
+    $this->drupalPostForm('admin/store/config/checkout', $settings, t('Save configuration'));
     $this->drupalLogout();
 
     $username = $this->randomMachineName(20);
@@ -314,7 +314,7 @@ class CartCheckoutTest extends UbercartTestBase {
       'panes[delivery][status]' => FALSE,
       'panes[billing][status]' => FALSE,
     );
-    $this->drupalPostForm('admin/store/settings/checkout', $settings, t('Save configuration'));
+    $this->drupalPostForm('admin/store/config/checkout', $settings, t('Save configuration'));
     $this->drupalLogout();
 
     // Test with an account that already exists.
@@ -343,7 +343,7 @@ class CartCheckoutTest extends UbercartTestBase {
       'uc_new_customer_status_active' => FALSE,
     );
     $this->drupalLogin($this->adminUser);
-    $this->drupalPostForm('admin/store/settings/checkout', $settings, t('Save configuration'));
+    $this->drupalPostForm('admin/store/config/checkout', $settings, t('Save configuration'));
     $this->drupalLogout();
 
     // Test as anonymous user.
@@ -364,7 +364,7 @@ class CartCheckoutTest extends UbercartTestBase {
       'uc_new_customer_login' => TRUE,
     );
     $this->drupalLogin($this->adminUser);
-    $this->drupalPostForm('admin/store/settings/checkout', $settings, t('Save configuration'));
+    $this->drupalPostForm('admin/store/config/checkout', $settings, t('Save configuration'));
     $this->drupalLogout();
 
     // Test checkout.
diff --git a/uc_cart/src/Tests/CartSettingsTest.php b/uc_cart/src/Tests/CartSettingsTest.php
index 5be7a41..e0b43e1 100644
--- a/uc_cart/src/Tests/CartSettingsTest.php
+++ b/uc_cart/src/Tests/CartSettingsTest.php
@@ -31,7 +31,7 @@ class CartSettingsTest extends UbercartTestBase {
     $this->assertText($this->product->getTitle() . ' added to your shopping cart.');
 
     $this->drupalPostForm('cart', [], 'Remove');
-    $this->drupalPostForm('admin/store/settings/cart', ['uc_cart_add_item_msg' => FALSE], 'Save configuration');
+    $this->drupalPostForm('admin/store/config/cart', ['uc_cart_add_item_msg' => FALSE], 'Save configuration');
 
     $this->addToCart($this->product);
     $this->assertNoText($this->product->getTitle() . ' added to your shopping cart.');
@@ -39,7 +39,7 @@ class CartSettingsTest extends UbercartTestBase {
 
   public function testAddToCartRedirect() {
     $this->drupalLogin($this->adminUser);
-    $this->drupalGet('admin/store/settings/cart');
+    $this->drupalGet('admin/store/config/cart');
     $this->assertField(
       'uc_add_item_redirect',
       t('Add to cart redirect field exists')
@@ -47,7 +47,7 @@ class CartSettingsTest extends UbercartTestBase {
 
     $redirect = 'admin/store';
     $this->drupalPostForm(
-      'admin/store/settings/cart',
+      'admin/store/config/cart',
       array('uc_add_item_redirect' => $redirect),
       t('Save configuration')
     );
@@ -67,7 +67,7 @@ class CartSettingsTest extends UbercartTestBase {
   public function testAddToCartQueryRedirect() {
     $this->drupalLogin($this->adminUser);
     $this->drupalPostForm(
-      'admin/store/settings/cart',
+      'admin/store/config/cart',
       array('uc_add_item_redirect' => '<none>'),
       t('Save configuration')
     );
@@ -79,7 +79,7 @@ class CartSettingsTest extends UbercartTestBase {
 
   public function testMinimumSubtotal() {
     $this->drupalLogin($this->adminUser);
-    $this->drupalGet('admin/store/settings/cart');
+    $this->drupalGet('admin/store/config/cart');
     $this->assertField(
       'uc_minimum_subtotal',
       t('Minimum order subtotal field exists')
@@ -145,7 +145,7 @@ class CartSettingsTest extends UbercartTestBase {
     );
 
     $this->drupalLogin($this->adminUser);
-    $this->drupalGet('admin/store/settings/cart');
+    $this->drupalGet('admin/store/config/cart');
     $this->assertField(
       'uc_continue_shopping_type',
       t('Continue shopping element display field exists')
@@ -181,7 +181,7 @@ class CartSettingsTest extends UbercartTestBase {
 
   public function testCartBreadcrumb() {
     $this->drupalLogin($this->adminUser);
-    $this->drupalGet('admin/store/settings/cart');
+    $this->drupalGet('admin/store/config/cart');
     $this->assertField(
       'uc_cart_breadcrumb_text',
       t('Custom cart breadcrumb text field exists')
diff --git a/uc_cart/src/Tests/CheckoutSettingsTest.php b/uc_cart/src/Tests/CheckoutSettingsTest.php
index 74ba307..a37ead3 100644
--- a/uc_cart/src/Tests/CheckoutSettingsTest.php
+++ b/uc_cart/src/Tests/CheckoutSettingsTest.php
@@ -18,14 +18,14 @@ class CheckoutSettingsTest extends UbercartTestBase {
 
   public function testEnableCheckout() {
     $this->drupalLogin($this->adminUser);
-    $this->drupalGet('admin/store/settings/checkout');
+    $this->drupalGet('admin/store/config/checkout');
     $this->assertField(
       'uc_checkout_enabled',
       t('Enable checkout field exists')
     );
 
     $this->drupalPostForm(
-      'admin/store/settings/checkout',
+      'admin/store/config/checkout',
       array('uc_checkout_enabled' => FALSE),
       t('Save configuration')
     );
@@ -45,14 +45,14 @@ class CheckoutSettingsTest extends UbercartTestBase {
 
   public function testAnonymousCheckout() {
     $this->drupalLogin($this->adminUser);
-    $this->drupalGet('admin/store/settings/checkout');
+    $this->drupalGet('admin/store/config/checkout');
     $this->assertField(
       'uc_checkout_anonymous',
       t('Anonymous checkout field exists')
     );
 
     $this->drupalPostForm(
-      'admin/store/settings/checkout',
+      'admin/store/config/checkout',
       array('uc_checkout_anonymous' => FALSE),
       t('Save configuration')
     );
diff --git a/uc_cart/uc_cart.admin.inc b/uc_cart/uc_cart.admin.inc
index 7ae4f37..8e6a362 100644
--- a/uc_cart/uc_cart.admin.inc
+++ b/uc_cart/uc_cart.admin.inc
@@ -14,7 +14,7 @@ function uc_cart_checkout_rules() {
     'plugin' => 'reaction rule',
   );
   $options = array(
-    'base path' => 'admin/store/settings/checkout/rules',
+    'base path' => 'admin/store/config/checkout/rules',
     'show plugin' => FALSE,
   );
   $content['rules'] = rules_ui()->overviewTable($conditions, $options);
diff --git a/uc_cart/uc_cart.links.menu.yml b/uc_cart/uc_cart.links.menu.yml
index e645a76..01a0fc8 100644
--- a/uc_cart/uc_cart.links.menu.yml
+++ b/uc_cart/uc_cart.links.menu.yml
@@ -1,13 +1,13 @@
-uc_cart.admin.store.settings.cart:
+uc_cart.admin.store.config.cart:
   title: Cart
   description: 'Configure the cart page display and settings.'
   route_name: uc_cart.cart_settings
-  parent: uc_store.admin.store.settings
-uc_cart.admin.store.settings.checkout:
+  parent: uc_store.admin.store.config
+uc_cart.admin.store.config.checkout:
   title: Checkout
   description: 'Configure the checkout page display and completion rules.'
   route_name: uc_cart.checkout_settings
-  parent: uc_store.admin.store.settings
+  parent: uc_store.admin.store.config
 uc_cart:
   title: 'Shopping cart'
   route_name: uc_cart.cart
diff --git a/uc_cart/uc_cart.routing.yml b/uc_cart/uc_cart.routing.yml
index 0942690..0c7ca84 100644
--- a/uc_cart/uc_cart.routing.yml
+++ b/uc_cart/uc_cart.routing.yml
@@ -1,5 +1,5 @@
 uc_cart.cart_settings:
-  path: '/admin/store/settings/cart'
+  path: '/admin/store/config/cart'
   defaults:
     _form: '\Drupal\uc_cart\Form\CartSettingsForm'
     _title: 'Cart settings'
@@ -7,7 +7,7 @@ uc_cart.cart_settings:
     _permission: 'administer store'
 
 uc_cart.checkout_settings:
-  path: '/admin/store/settings/checkout'
+  path: '/admin/store/config/checkout'
   defaults:
     _form: '\Drupal\uc_cart\Form\CheckoutSettingsForm'
     _title: 'Checkout settings'
diff --git a/uc_cart_links/src/Tests/CartLinksTest.php b/uc_cart_links/src/Tests/CartLinksTest.php
index eea4e40..9655b28 100644
--- a/uc_cart_links/src/Tests/CartLinksTest.php
+++ b/uc_cart_links/src/Tests/CartLinksTest.php
@@ -52,14 +52,14 @@ class CartLinksTest extends UbercartTestBase {
    */
   public function testCartLinksUISettingsPage() {
     // Access settings page by anonymous user
-    $this->drupalGet('admin/store/settings/cart-links');
+    $this->drupalGet('admin/store/config/cart-links');
     $this->assertResponse(403);
     $this->assertText(t('Access denied'));
     $this->assertText(t('You are not authorized to access this page.'));
 
     // Access settings page by privileged user
     $this->drupalLogin($this->adminUser);
-    $this->drupalGet('admin/store/settings/cart-links');
+    $this->drupalGet('admin/store/config/cart-links');
     $this->assertResponse(200);
     $this->assertText(
       t('View the help page to learn how to create Cart Links.'),
@@ -142,7 +142,7 @@ class CartLinksTest extends UbercartTestBase {
       // Click on link
       $this->clickLink(t('Cart Link #@link', ['@link' => $key]));
       // Check for notice that item was added (this notice is set ON
-      // by default, see admin/store/settings/cart)
+      // by default, see admin/store/config/cart)
       $this->assertText(
         t('@title added to your shopping cart.', ['@title' => $link_data[$key]['title']]),
         format_string('Product @title added to cart.', ['@title' => $link_data[$key]['title']])
@@ -357,7 +357,7 @@ class CartLinksTest extends UbercartTestBase {
     $this->clickLink(t('Cart Link #@link', ['@link' => $test_link_0]));
 
     // Check for notice that item was added (this notice is set ON
-    // by default, see admin/store/settings/cart)
+    // by default, see admin/store/config/cart)
     $this->assertText(
       t('@title added to your shopping cart.', ['@title' => $link_data[$test_link_0]['title']]),
       format_string('Product @title added to cart.', ['@title' => $link_data[$test_link_0]['title']])
@@ -548,7 +548,7 @@ class CartLinksTest extends UbercartTestBase {
    */
   protected function setCartLinksUIProductActionMessage($state = FALSE) {
     $this->drupalPostForm(
-      'admin/store/settings/cart-links',
+      'admin/store/config/cart-links',
       array('uc_cart_links_add_show' => $state),
       t('Save configuration')
     );
@@ -570,7 +570,7 @@ class CartLinksTest extends UbercartTestBase {
    */
   protected function setCartLinksUITrackClicks($state = TRUE) {
     $this->drupalPostForm(
-      'admin/store/settings/cart-links',
+      'admin/store/config/cart-links',
       array('uc_cart_links_track' => 0),
       t('Save configuration')
     );
@@ -592,7 +592,7 @@ class CartLinksTest extends UbercartTestBase {
    */
   protected function setCartLinksUIAllowEmptying($state = TRUE) {
     $this->drupalPostForm(
-      'admin/store/settings/cart-links',
+      'admin/store/config/cart-links',
       array('uc_cart_links_empty' => $state),
       t('Save configuration')
     );
@@ -615,7 +615,7 @@ class CartLinksTest extends UbercartTestBase {
   protected function setCartLinksUIMessages($messages = '') {
     $message_string = implode("\n", $messages);
     $this->drupalPostForm(
-      'admin/store/settings/cart-links',
+      'admin/store/config/cart-links',
       array('uc_cart_links_messages' => $message_string),
       t('Save configuration')
     );
@@ -637,7 +637,7 @@ class CartLinksTest extends UbercartTestBase {
    */
   protected function setCartLinksUIRestrictions($restrictions = '') {
     $this->drupalPostForm(
-      'admin/store/settings/cart-links',
+      'admin/store/config/cart-links',
       array('uc_cart_links_restrictions' => $restrictions),
       t('Save configuration')
     );
@@ -658,7 +658,7 @@ class CartLinksTest extends UbercartTestBase {
    */
   protected function setCartLinksUIRedirect($url = '') {
     $this->drupalPostForm(
-      'admin/store/settings/cart-links',
+      'admin/store/config/cart-links',
       array('uc_cart_links_invalid_page' => $url),
       t('Save configuration')
     );
diff --git a/uc_cart_links/uc_cart_links.links.menu.yml b/uc_cart_links/uc_cart_links.links.menu.yml
index bba23b3..fb92dc9 100644
--- a/uc_cart_links/uc_cart_links.links.menu.yml
+++ b/uc_cart_links/uc_cart_links.links.menu.yml
@@ -2,7 +2,7 @@ uc_cart_links.settings:
   title: 'Cart Links'
   description: 'Configure and craft special links to add products directly to the cart.'
   route_name: uc_cart_links.settings
-  parent: uc_store.admin.store.settings
+  parent: uc_store.admin.store.config
 
 uc_cart_links.reports:
   title: 'Cart Links'
diff --git a/uc_cart_links/uc_cart_links.routing.yml b/uc_cart_links/uc_cart_links.routing.yml
index a2cdfbf..be8fb4a 100644
--- a/uc_cart_links/uc_cart_links.routing.yml
+++ b/uc_cart_links/uc_cart_links.routing.yml
@@ -1,5 +1,5 @@
 uc_cart_links.settings:
-  path: '/admin/store/settings/cart-links'
+  path: '/admin/store/config/cart-links'
   defaults:
     _form: '\Drupal\uc_cart_links\Form\CartLinksSettingsForm'
     _title: 'Cart Links settings'
diff --git a/uc_catalog/src/Tests/CatalogTest.php b/uc_catalog/src/Tests/CatalogTest.php
index 72ff259..c68ecbc 100644
--- a/uc_catalog/src/Tests/CatalogTest.php
+++ b/uc_catalog/src/Tests/CatalogTest.php
@@ -96,7 +96,7 @@ class CatalogTest extends UbercartTestBase {
     $this->drupalGet('admin/store');
     $this->assertText('The catalog taxonomy reference field is missing.', 'Store status message mentions the missing field.');
 
-    $this->drupalGet('admin/store/settings/catalog/repair');
+    $this->drupalGet('admin/store/config/catalog/repair');
     $this->assertText('The catalog taxonomy reference field has been repaired.', 'Repair message is displayed.');
 
     $this->drupalGet('admin/structure/types/manage/product/fields');
diff --git a/uc_catalog/uc_catalog.links.menu.yml b/uc_catalog/uc_catalog.links.menu.yml
index b2e70fb..a5a710c 100644
--- a/uc_catalog/uc_catalog.links.menu.yml
+++ b/uc_catalog/uc_catalog.links.menu.yml
@@ -1,8 +1,8 @@
-uc_catalog.admin.store.settings.catalog:
+uc_catalog.admin.store.config.catalog:
   title: Catalog
   description: 'Configure the product catalog pages.'
   route_name: uc_catalog.settings
-  parent: uc_store.admin.store.settings
+  parent: uc_store.admin.store.config
 
 uc_catalog.admin.store.products.orphans:
   title: 'Find orphaned products'
diff --git a/uc_catalog/uc_catalog.routing.yml b/uc_catalog/uc_catalog.routing.yml
index 040c41b..50775a8 100644
--- a/uc_catalog/uc_catalog.routing.yml
+++ b/uc_catalog/uc_catalog.routing.yml
@@ -1,5 +1,5 @@
 uc_catalog.settings:
-  path: '/admin/store/settings/catalog'
+  path: '/admin/store/config/catalog'
   defaults:
     _form: '\Drupal\uc_catalog\Form\CatalogSettingsForm'
     _title: 'Catalog settings'
@@ -7,7 +7,7 @@ uc_catalog.settings:
     _permission: 'administer catalog'
 
 uc_catalog.repair:
-  path: '/admin/store/settings/catalog/repair'
+  path: '/admin/store/config/catalog/repair'
   defaults:
     _controller: '\Drupal\uc_catalog\Controller\CatalogAdminController::repairField'
     _title: 'Repair catalog field'
diff --git a/uc_country/src/Tests/CountryTest.php b/uc_country/src/Tests/CountryTest.php
index 4c312b0..ab13cbe 100644
--- a/uc_country/src/Tests/CountryTest.php
+++ b/uc_country/src/Tests/CountryTest.php
@@ -108,7 +108,7 @@ class CountryTest extends WebTestBase {
     $this->assertText('No countries are enabled.');
 
     // Verify that the country fields are hidden.
-    $this->drupalGet('admin/store/settings/store');
+    $this->drupalGet('admin/store/config/store');
     $this->assertNoText('State/Province');
     $this->assertNoText('Country');
   }
diff --git a/uc_country/uc_country.links.menu.yml b/uc_country/uc_country.links.menu.yml
index d37e4ce..8a7ecfc 100644
--- a/uc_country/uc_country.links.menu.yml
+++ b/uc_country/uc_country.links.menu.yml
@@ -1,5 +1,5 @@
-uc_country.admin.store.settings.countries:
+uc_country.admin.store.config.countries:
   title: Countries and addresses
   description: 'Manage available countries and configure address formats.'
   route_name: entity.uc_country.collection
-  parent: uc_store.admin.store.settings
+  parent: uc_store.admin.store.config
diff --git a/uc_order/src/Entity/OrderProduct.php b/uc_order/src/Entity/OrderProduct.php
index ddf1295..8416623 100644
--- a/uc_order/src/Entity/OrderProduct.php
+++ b/uc_order/src/Entity/OrderProduct.php
@@ -26,7 +26,7 @@ use Drupal\uc_order\OrderProductInterface;
  *   },
  *   base_table = "uc_order_products",
  *   fieldable = TRUE,
- *   route_base_path = "admin/store/settings/orders/products",
+ *   route_base_path = "admin/store/config/orders/products",
  *   entity_keys = {
  *     "id" = "order_product_id",
  *   }
diff --git a/uc_order/src/Tests/OrderTest.php b/uc_order/src/Tests/OrderTest.php
index 68fd13a..4829903 100644
--- a/uc_order/src/Tests/OrderTest.php
+++ b/uc_order/src/Tests/OrderTest.php
@@ -191,7 +191,7 @@ class OrderTest extends UbercartTestBase {
     $this->drupalLogin($this->adminUser);
 
     // Check that the default order state and status is correct.
-    $this->drupalGet('admin/store/settings/orders');
+    $this->drupalGet('admin/store/config/orders');
     $this->assertFieldByName('order_states[in_checkout][default]', 'in_checkout', 'State defaults to correct default status.');
     $this->assertEqual(uc_order_state_default('in_checkout'), 'in_checkout', 'uc_order_state_default() returns correct default status.');
     $order = $this->ucCreateOrder($this->customer);
@@ -199,7 +199,7 @@ class OrderTest extends UbercartTestBase {
     $this->assertEqual($order->getStatusId(), 'in_checkout', 'Order has correct default status.');
 
     // Create a custom "in checkout" order status with a lower weight.
-    $this->drupalGet('admin/store/settings/orders');
+    $this->drupalGet('admin/store/config/orders');
     $this->clickLink('Create custom order status');
     $edit = array(
       'id' => strtolower($this->randomMachineName()),
@@ -223,7 +223,7 @@ class OrderTest extends UbercartTestBase {
     $this->drupalLogin($this->adminUser);
 
     // Update an order status label.
-    $this->drupalGet('admin/store/settings/orders');
+    $this->drupalGet('admin/store/config/orders');
     $title = $this->randomMachineName();
     $edit = array(
       'order_statuses[in_checkout][name]' => $title,
@@ -236,7 +236,7 @@ class OrderTest extends UbercartTestBase {
     $this->assertText($title, 'Order displays updated status title.');
 
     // Create a custom order status.
-    $this->drupalGet('admin/store/settings/orders');
+    $this->drupalGet('admin/store/config/orders');
     $this->clickLink('Create custom order status');
     $edit = array(
       'id' => strtolower($this->randomMachineName()),
diff --git a/uc_order/uc_order.links.menu.yml b/uc_order/uc_order.links.menu.yml
index 4054181..2f29327 100644
--- a/uc_order/uc_order.links.menu.yml
+++ b/uc_order/uc_order.links.menu.yml
@@ -16,8 +16,8 @@ uc_order.admin.store.orders.create:
   route_name: uc_order.create
   parent: uc_order.admin.store.orders
   weight: -5
-uc_order.admin.store.settings.orders:
+uc_order.admin.store.config.orders:
   title: Orders
   description: 'Configure the workflow and fields for orders.'
   route_name: uc_order.workflow
-  parent: uc_store.admin.store.settings
+  parent: uc_store.admin.store.config
diff --git a/uc_order/uc_order.module b/uc_order/uc_order.module
index 000f7cb..1f3b5ea 100644
--- a/uc_order/uc_order.module
+++ b/uc_order/uc_order.module
@@ -80,11 +80,11 @@ function uc_order_menu() {
  * Implements hook_menu_alter().
  */
 function uc_order_menu_alter(&$items) {
-  // Adjust the Field UI tabs on admin/store/settings/orders.
-  $items['admin/store/settings/orders/products/fields']['title'] = 'Ordered product fields';
-  $items['admin/store/settings/orders/products/fields']['weight'] = 3;
+  // Adjust the Field UI tabs on admin/store/config/orders.
+  $items['admin/store/config/orders/products/fields']['title'] = 'Ordered product fields';
+  $items['admin/store/config/orders/products/fields']['weight'] = 3;
   // Disable field display settings for ordered products, as we don't use this anywhere (yet).
-  unset($items['admin/store/settings/orders/products/display']);
+  unset($items['admin/store/config/orders/products/display']);
 }
 
 /**
diff --git a/uc_order/uc_order.routing.yml b/uc_order/uc_order.routing.yml
index 156e295..e15a521 100644
--- a/uc_order/uc_order.routing.yml
+++ b/uc_order/uc_order.routing.yml
@@ -15,7 +15,7 @@ uc_order.order_admin:
     _permission: 'access administration pages'
 
 uc_order.workflow:
-  path: '/admin/store/settings/orders'
+  path: '/admin/store/config/orders'
   defaults:
     _form: '\Drupal\uc_order\Form\OrderWorkflowForm'
     _title: 'Order workflow settings'
@@ -23,7 +23,7 @@ uc_order.workflow:
     _permission: 'administer order workflow'
 
 uc_order.status_add:
-  path: '/admin/store/settings/orders/workflow/create'
+  path: '/admin/store/config/orders/workflow/create'
   defaults:
     _form: '\Drupal\uc_order\Form\OrderStatusAddForm'
     _title: 'Create custom order status'
diff --git a/uc_product/src/Tests/ProductTest.php b/uc_product/src/Tests/ProductTest.php
index 5fd8583..51ae7c7 100644
--- a/uc_product/src/Tests/ProductTest.php
+++ b/uc_product/src/Tests/ProductTest.php
@@ -204,7 +204,7 @@ class ProductTest extends UbercartTestBase {
 
   public function testProductQuantity() {
     $edit = array('uc_product_add_to_cart_qty' => TRUE);
-    $this->drupalPostForm('admin/store/settings/products', $edit, 'Save configuration');
+    $this->drupalPostForm('admin/store/config/products', $edit, 'Save configuration');
 
     // Check zero quantity message.
     $this->addToCart($this->product, array('qty' => 0));
diff --git a/uc_product/uc_product.links.menu.yml b/uc_product/uc_product.links.menu.yml
index c32d3ba..90ffca9 100644
--- a/uc_product/uc_product.links.menu.yml
+++ b/uc_product/uc_product.links.menu.yml
@@ -10,8 +10,8 @@ uc_product.admin.store.products.classes:
   route_name: uc_product.classes
   parent: uc_product.admin.store.products
   weight: -2
-uc_product.admin.store.settings.products:
+uc_product.admin.store.config.products:
   title: Products
   description: 'Configure product settings.'
   route_name: uc_product.settings
-  parent: uc_store.admin.store.settings
+  parent: uc_store.admin.store.config
diff --git a/uc_product/uc_product.routing.yml b/uc_product/uc_product.routing.yml
index 640fdcc..2e7aee0 100644
--- a/uc_product/uc_product.routing.yml
+++ b/uc_product/uc_product.routing.yml
@@ -15,7 +15,7 @@ uc_product.classes:
     _permission: 'administer product classes'
 
 uc_product.settings:
-  path: '/admin/store/settings/products'
+  path: '/admin/store/config/products'
   defaults:
     _form: '\Drupal\uc_product\Form\ProductSettingsForm'
     _title: 'Product settings'
@@ -23,7 +23,7 @@ uc_product.settings:
     _permission: 'administer products'
 
 uc_product.image_defaults:
-  path: '/admin/store/settings/products/defaults'
+  path: '/admin/store/config/products/defaults'
   defaults:
     _controller: '\Drupal\uc_product\Controller\ProductController::setImageDefaults'
   requirements:
diff --git a/uc_product_kit/src/Tests/ProductKitTest.php b/uc_product_kit/src/Tests/ProductKitTest.php
index 97448ca..d46bba8 100644
--- a/uc_product_kit/src/Tests/ProductKitTest.php
+++ b/uc_product_kit/src/Tests/ProductKitTest.php
@@ -24,7 +24,7 @@ class ProductKitTest extends UbercartTestBase {
 
     // Allow the default quantity to be set.
     $edit = array('uc_product_add_to_cart_qty' => TRUE);
-    $this->drupalPostForm('admin/store/settings/products', $edit, 'Save configuration');
+    $this->drupalPostForm('admin/store/config/products', $edit, 'Save configuration');
 
     // Create some test products.
     $products = array();
diff --git a/uc_report/uc_report.info.yml b/uc_report/uc_report.info.yml
index 8cc9281..7d08ddb 100644
--- a/uc_report/uc_report.info.yml
+++ b/uc_report/uc_report.info.yml
@@ -6,4 +6,4 @@ core: 8.x
 dependencies:
   - uc_order
   - uc_product
-configure: uc_store.settings
+configure: uc_store.config
diff --git a/uc_role/src/Form/RoleFeatureForm.php b/uc_role/src/Form/RoleFeatureForm.php
index 149f9a1..24834b0 100644
--- a/uc_role/src/Form/RoleFeatureForm.php
+++ b/uc_role/src/Form/RoleFeatureForm.php
@@ -88,7 +88,7 @@ class RoleFeatureForm extends FormBase {
       unset($form['buttons']);
 
       $form['no_roles'] = array(
-        '#markup' => $this->t('You need to <a href="!url">create new roles</a> before any can be added as product features.', ['!url' => $this->url('user.role_add', [], ['query' => ['destination' => 'admin/store/settings/products']])]),
+        '#markup' => $this->t('You need to <a href="!url">create new roles</a> before any can be added as product features.', ['!url' => $this->url('user.role_add', [], ['query' => ['destination' => 'admin/store/config/products']])]),
         '#prefix' => '<p>',
         '#suffix' => '</p>',
       );
diff --git a/uc_role/src/Form/RoleSettingsForm.php b/uc_role/src/Form/RoleSettingsForm.php
index fa5bb97..a1e6695 100644
--- a/uc_role/src/Form/RoleSettingsForm.php
+++ b/uc_role/src/Form/RoleSettingsForm.php
@@ -47,7 +47,7 @@ class RoleSettingsForm extends ConfigFormBase {
 
     if (!count($default_role_choices)) {
       $form['no_roles'] = array(
-        '#markup' => $this->t('You need to <a href="!url">create new roles</a> before any can be added as product features.', array('!url' => $this->url('user.role_add', [], ['query' => ['destination' => 'admin/store/settings/products']]))),
+        '#markup' => $this->t('You need to <a href="!url">create new roles</a> before any can be added as product features.', array('!url' => $this->url('user.role_add', [], ['query' => ['destination' => 'admin/store/config/products']]))),
         '#prefix' => '<p>',
         '#suffix' => '</p>',
       );
diff --git a/uc_role/uc_role.module b/uc_role/uc_role.module
index 344ce16..d0f4bd9 100644
--- a/uc_role/uc_role.module
+++ b/uc_role/uc_role.module
@@ -410,7 +410,7 @@ function uc_role_feature_settings($form, FormStateInterface $form_state) {
 
   if (!count($default_role_choices)) {
     $form['no_roles'] = array(
-      '#markup' => t('You need to <a href="!url">create new roles</a> before any can be added as product features.', ['!url' => \Drupal::url('user.role_add', [], ['query' => ['destination' => 'admin/store/settings/products']])]),
+      '#markup' => t('You need to <a href="!url">create new roles</a> before any can be added as product features.', ['!url' => \Drupal::url('user.role_add', [], ['query' => ['destination' => 'admin/store/config/products']])]),
       '#prefix' => '<p>',
       '#suffix' => '</p>',
     );
diff --git a/uc_role/uc_role.routing.yml b/uc_role/uc_role.routing.yml
index d2aa411..00d703a 100644
--- a/uc_role/uc_role.routing.yml
+++ b/uc_role/uc_role.routing.yml
@@ -1,5 +1,5 @@
 uc_role.settings:
-  path: 'admin/store/settings/roles'
+  path: 'admin/store/config/roles'
   defaults:
     _form: '\Drupal\uc_role\Form\RoleSettingsForm'
     _title: 'Role settings'
diff --git a/uc_stock/src/Tests/StockTest.php b/uc_stock/src/Tests/StockTest.php
index bc7bfe6..0c05123 100644
--- a/uc_stock/src/Tests/StockTest.php
+++ b/uc_stock/src/Tests/StockTest.php
@@ -71,7 +71,7 @@ class StockTest extends UbercartTestBase {
 
     // Enable product quantity field.
     $edit = array('uc_product_add_to_cart_qty' => TRUE);
-    $this->drupalPostForm('admin/store/settings/products', $edit, 'Save configuration');
+    $this->drupalPostForm('admin/store/config/products', $edit, 'Save configuration');
 
     $qty = rand(1, 100);
     $edit = array('qty' => $qty);
@@ -85,7 +85,7 @@ class StockTest extends UbercartTestBase {
     $prefix = 'stock[' . $this->product->model->value . ']';
 
     $edit = array('uc_stock_threshold_notification' => 1);
-    $this->drupalPostForm('admin/store/settings/stock', $edit, 'Save configuration');
+    $this->drupalPostForm('admin/store/config/stock', $edit, 'Save configuration');
 
     $qty = rand(10, 100);
     $edit = array(
diff --git a/uc_stock/uc_stock.routing.yml b/uc_stock/uc_stock.routing.yml
index fda56f1..9a9896f 100644
--- a/uc_stock/uc_stock.routing.yml
+++ b/uc_stock/uc_stock.routing.yml
@@ -1,5 +1,5 @@
 uc_stock.settings:
-  path: '/admin/store/settings/stock'
+  path: '/admin/store/config/stock'
   defaults:
     _form: '\Drupal\uc_stock\Form\StockSettingsForm'
     _title: 'Stock notifications'
diff --git a/uc_store/src/Tests/AjaxTest.php b/uc_store/src/Tests/AjaxTest.php
index d0d89ba..d81ebfe 100644
--- a/uc_store/src/Tests/AjaxTest.php
+++ b/uc_store/src/Tests/AjaxTest.php
@@ -82,7 +82,7 @@ class AjaxTest extends UbercartTestBase {
       'methods[check][status]' => TRUE,
       'methods[other][status]' => TRUE,
     );
-    $this->drupalPostForm('admin/store/settings/payment', $edit, 'Save configuration');
+    $this->drupalPostForm('admin/store/config/payment', $edit, 'Save configuration');
     // $this->addPaymentZoneCondition('other', 'KS');
 
     // Specify that the billing zone should update the payment pane.
diff --git a/uc_store/src/Tests/StoreTest.php b/uc_store/src/Tests/StoreTest.php
index 8443df8..c8dc1e2 100644
--- a/uc_store/src/Tests/StoreTest.php
+++ b/uc_store/src/Tests/StoreTest.php
@@ -50,7 +50,7 @@ class StoreTest extends UbercartTestBase {
       );
     }
 
-    $this->drupalPostForm('admin/store/settings/store', $edit, 'Save configuration');
+    $this->drupalPostForm('admin/store/config/store', $edit, 'Save configuration');
 
     foreach ($edit as $name => $value) {
       $this->assertFieldByName($name, $value);
diff --git a/uc_store/uc_store.links.menu.yml b/uc_store/uc_store.links.menu.yml
index d886f8d..6093dce 100644
--- a/uc_store/uc_store.links.menu.yml
+++ b/uc_store/uc_store.links.menu.yml
@@ -10,15 +10,15 @@ uc_store.admin.store.reports:
   route_name: uc_store.reports
   parent: uc_store.admin.store
   weight: 2
-uc_store.admin.store.settings:
+uc_store.admin.store.config:
   title: Configuration
   description: 'Adjust configuration settings for Ubercart.'
-  route_name: uc_store.settings
+  route_name: uc_store.config
   parent: uc_store.admin.store
   weight: 6
-uc_store.admin.store.settings.store:
+uc_store.admin.store.config.store:
   title: Store
   description: 'Configure basic store settings.'
-  route_name: uc_store.settings_form
-  parent: uc_store.admin.store.settings
+  route_name: uc_store.config_form
+  parent: uc_store.admin.store.config
   weight: -1
diff --git a/uc_store/uc_store.routing.yml b/uc_store/uc_store.routing.yml
index 1c2582c..e776556 100644
--- a/uc_store/uc_store.routing.yml
+++ b/uc_store/uc_store.routing.yml
@@ -14,16 +14,16 @@ uc_store.reports:
   requirements:
     _permission: 'view reports'
 
-uc_store.settings:
-  path: '/admin/store/settings'
+uc_store.config:
+  path: '/admin/store/config'
   defaults:
     _controller: '\Drupal\system\Controller\SystemController::systemAdminMenuBlockPage'
     _title: 'Configuration'
   requirements:
     _permission: 'administer store'
 
-uc_store.settings_form:
-  path: '/admin/store/settings/store'
+uc_store.config_form:
+  path: '/admin/store/config/config'
   defaults:
     _form: '\Drupal\uc_store\Form\StoreSettingsForm'
     _title: 'Store'
@@ -31,17 +31,9 @@ uc_store.settings_form:
     _permission: 'administer store'
 
 uc_store.address_fields:
-  path: '/admin/store/settings/countries/fields'
+  path: '/admin/store/config/config/fields'
   defaults:
     _form: '\Drupal\uc_store\Form\AddressFieldsForm'
     _title: 'Address fields'
   requirements:
     _permission: 'administer store'
-
-uc_store.config_form:
-  path: '/admin/store/config/store'
-  defaults:
-    _form: '\Drupal\uc_store\Form\StoreSettingsForm'
-    _title: 'Store'
-  requirements:
-    _permission: 'administer store'
diff --git a/uc_tax/src/Form/TaxRateMethodsForm.php b/uc_tax/src/Form/TaxRateMethodsForm.php
index 22b7018..2d05722 100644
--- a/uc_tax/src/Form/TaxRateMethodsForm.php
+++ b/uc_tax/src/Form/TaxRateMethodsForm.php
@@ -65,7 +65,7 @@ class TaxRateMethodsForm extends ConfigFormBase {
 // @todo: Fix when Rules works.
 //      'conditions' => array(
 //        'title' => $this->t('conditions'),
-//        'url' => Url::fromRoute('admin/store/settings/taxes/manage/uc_tax_', ['rate_id' => $rate_id]),
+//        'url' => Url::fromRoute('admin/store/config/taxes/manage/uc_tax_', ['rate_id' => $rate_id]),
 //        'weight' => 5,
 //      ),
         'clone' => array(
diff --git a/uc_tax/src/Tests/StoredTaxTest.php b/uc_tax/src/Tests/StoredTaxTest.php
index e6cfbf5..c50c9f1 100644
--- a/uc_tax/src/Tests/StoredTaxTest.php
+++ b/uc_tax/src/Tests/StoredTaxTest.php
@@ -42,7 +42,7 @@ class StoredTaxTest extends UbercartTestBase {
 
     // Enable a payment method for the payment preview checkout pane.
     $edit = array('methods[check][status]' => 1);
-    $this->drupalPostForm('admin/store/settings/payment', $edit, t('Save configuration'));
+    $this->drupalPostForm('admin/store/config/payment', $edit, t('Save configuration'));
 
     // Create a 20% inclusive tax rate.
     $rate = (object) array(
@@ -57,10 +57,10 @@ class StoredTaxTest extends UbercartTestBase {
     );
     uc_tax_rate_save($rate);
 
-    $this->drupalGet('admin/store/settings/taxes');
+    $this->drupalGet('admin/store/config/taxes');
     $this->assertText($rate->name, t('Tax was saved successfully.'));
 
-    // $this->drupalGet("admin/store/settings/taxes/manage/uc_tax_$rate->id");
+    // $this->drupalGet("admin/store/config/taxes/manage/uc_tax_$rate->id");
     // $this->assertText(t('Conditions'), t('Rules configuration linked to tax.'));
 
     $this->addToCart($this->product);
diff --git a/uc_tax/uc_tax.links.menu.yml b/uc_tax/uc_tax.links.menu.yml
index 3ce8ac4..66c3a68 100644
--- a/uc_tax/uc_tax.links.menu.yml
+++ b/uc_tax/uc_tax.links.menu.yml
@@ -1,5 +1,5 @@
-uc_tax.admin.store.settings.tax:
+uc_tax.admin.store.config.tax:
   title: Tax
   description: 'Configure tax rates and rules.'
   route_name: entity.uc_tax_rate.collection
-  parent: uc_store.admin.store.settings
+  parent: uc_store.admin.store.config
diff --git a/uc_tax/uc_tax.module b/uc_tax/uc_tax.module
index ed01c7c..9488f80 100644
--- a/uc_tax/uc_tax.module
+++ b/uc_tax/uc_tax.module
@@ -19,12 +19,12 @@ use Drupal\uc_order\OrderInterface;
 // * Implements hook_menu().
 // */
 //function uc_tax_menu() {
-//  $items['admin/store/settings/taxes'] = array(
+//  $items['admin/store/config/taxes'] = array(
 //    'title' => 'Tax',
 //    'description' => 'Configure tax rates and rules.',
 //    'route_name' => 'uc_tax.methods',
 //  );
-//  $items += rules_ui()->config_menu('admin/store/settings/taxes');
+//  $items += rules_ui()->config_menu('admin/store/config/taxes');
 //
 //  return $items;
 //}
diff --git a/uc_tax/uc_tax.routing.yml b/uc_tax/uc_tax.routing.yml
index 54d8cc1..8e8bf12 100644
--- a/uc_tax/uc_tax.routing.yml
+++ b/uc_tax/uc_tax.routing.yml
@@ -1,5 +1,5 @@
 uc_tax.methods:
-  path: '/admin/store/settings/taxes'
+  path: '/admin/store/config/taxes'
   defaults:
     _form: '\Drupal\uc_tax\Form\TaxRateMethodsForm'
     _title: 'Taxes'
@@ -7,28 +7,28 @@ uc_tax.methods:
     _permission: 'administer taxes'
 
 uc_tax.rate_add:
-  path: '/admin/store/settings/taxes/add'
+  path: '/admin/store/config/taxes/add'
   defaults:
     _form: '\Drupal\uc_tax\Form\TaxRateAddForm'
   requirements:
     _permission: 'administer taxes'
 
 uc_tax.rate_edit:
-  path: '/admin/store/settings/taxes/{tax_rate}/edit'
+  path: '/admin/store/config/taxes/{tax_rate}/edit'
   defaults:
     _form: '\Drupal\uc_tax\Form\TaxRateEditForm'
   requirements:
     _permission: 'administer taxes'
 
 uc_tax.rate_clone:
-  path: '/admin/store/settings/taxes/{tax_rate}/clone'
+  path: '/admin/store/config/taxes/{tax_rate}/clone'
   defaults:
     _controller: '\Drupal\uc_tax\Controller\TaxController::saveClone'
   requirements:
     _permission: 'administer taxes'
 
 uc_tax.rate_delete:
-  path: '/admin/store/settings/taxes/{tax_rate}/delete'
+  path: '/admin/store/config/taxes/{tax_rate}/delete'
   defaults:
     _form: '\Drupal\uc_tax\Form\TaxRateDeleteForm'
   requirements: