diff --git a/shipping/uc_shipping/uc_shipping.admin.inc b/shipping/uc_shipping/uc_shipping.admin.inc
index 7fef4d8..d62db8a 100644
--- a/shipping/uc_shipping/uc_shipping.admin.inc
+++ b/shipping/uc_shipping/uc_shipping.admin.inc
@@ -550,7 +550,7 @@ function uc_shipping_new_shipment($form, &$form_state, $order) {
   $form['order_id'] = array('#type' => 'hidden', '#value' => $order->id());
 
   $packages_by_type = array();
-  $units = config('uc_store.settings')->get('units.weight');
+  $units = \Drupal::config('uc_store.settings')->get('units.weight');
   $result = db_query("SELECT * FROM {uc_packages} WHERE order_id = :id AND sid IS NULL", array(':id' => $order->id()));
   foreach ($result as $package) {
     $products = array();
@@ -861,7 +861,7 @@ function uc_shipping_shipment_edit($form, &$form_state, $order, $shipment) {
         'oz' => t('Ounces'),
         'g'  => t('Grams'),
       ),
-      '#default_value' => isset($package->weight_units) ? $package->weight_units : config('uc_store.settings')->get('units.weight'),
+      '#default_value' => isset($package->weight_units) ? $package->weight_units : \Drupal::config('uc_store.settings')->get('units.weight'),
     );
     $pkg_form['dimensions'] = array(
       '#type'        => 'container',
@@ -897,7 +897,7 @@ function uc_shipping_shipment_edit($form, &$form_state, $order, $shipment) {
         'cm' => t('Centimeters'),
         'mm' => t('Millimeters'),
       ),
-      '#default_value' => isset($package->length_units) ? $package->length_units : config('uc_store.settings')->get('units.length'),
+      '#default_value' => isset($package->length_units) ? $package->length_units : \Drupal::config('uc_store.settings')->get('units.length'),
     );
     $pkg_form['tracking_number'] = array(
       '#type'          => 'textfield',
diff --git a/shipping/uc_shipping/uc_shipping.module b/shipping/uc_shipping/uc_shipping.module
index 7186e23..8645c6f 100644
--- a/shipping/uc_shipping/uc_shipping.module
+++ b/shipping/uc_shipping/uc_shipping.module
@@ -398,7 +398,7 @@ function uc_shipping_package_load($package_id) {
       $products = array();
       $description = '';
       $weight = 0;
-      $units = config('uc_store.settings')->get('units.weight');
+      $units = \Drupal::config('uc_store.settings')->get('units.weight');
       $addresses = array();
       $result = db_query("SELECT op.order_product_id, pp.qty, pp.qty * op.weight AS weight, op.weight_units, op.nid, op.title, op.model, op.price, op.data FROM {uc_packaged_products} pp LEFT JOIN {uc_order_products} op ON op.order_product_id = pp.order_product_id WHERE pp.package_id = :id ORDER BY op.order_product_id", array(':id' => $package_id));
       foreach ($result as $product) {
diff --git a/shipping/uc_ups/uc_ups.ship.inc b/shipping/uc_ups/uc_ups.ship.inc
index 9d14d68..add6996 100644
--- a/shipping/uc_ups/uc_ups.ship.inc
+++ b/shipping/uc_ups/uc_ups.ship.inc
@@ -1,4 +1,4 @@
-<?php
+3<?php
 
 /**
  * @file
@@ -362,7 +362,7 @@ function uc_ups_shipment_request($packages, $origin, $destination, $ups_service)
 
   $pkg_types = \Drupal\uc_ups\UPSUtilities::packageTypes();
 
-  $store_config = config('uc_store.settings');
+  $store_config = \Drupal::config('uc_store.settings');
   $shipper_zone = uc_get_zone_code($store_config->get('address.zone'));
   $shipper_country = uc_get_country_data(array('country_id' => $store_config->get('address.country')));
   $shipper_country = $shipper_country[0]['country_iso_code_2'];
diff --git a/shipping/uc_weightquote/uc_weightquote.module b/shipping/uc_weightquote/uc_weightquote.module
index 3f84d9b..8b0b83d 100644
--- a/shipping/uc_weightquote/uc_weightquote.module
+++ b/shipping/uc_weightquote/uc_weightquote.module
@@ -31,7 +31,7 @@ function uc_weightquote_form_node_form_alter(&$form, &$form_state, $form_id) {
           '#weight' => 0,
         );
       }
-      $unit = config('uc_store.settings')->get('units.weight');
+      $unit = \Drupal::config('uc_store.settings')->get('units.weight');
       $form['shipping']['weightquote'][$method->mid] = array(
         '#type' => 'uc_price',
         '#title' => check_plain($method->title),
@@ -132,7 +132,7 @@ function uc_weightquote_uc_shipping_method() {
       'id' => 'weightquote_' . $method->mid,
       'module' => 'uc_weightquote',
       'title' => $method->title,
-      'description' => t('!base_rate + !product_rate per !unit', array('!base_rate' => uc_currency_format($method->base_rate), '!product_rate' => uc_currency_format($method->product_rate), '!unit' => config('uc_store.settings')->get('units.weight'))),
+      'description' => t('!base_rate + !product_rate per !unit', array('!base_rate' => uc_currency_format($method->base_rate), '!product_rate' => uc_currency_format($method->product_rate), '!unit' => \Drupal::config('uc_store.settings')->get('units.weight'))),
       'operations' => array(
         'edit' => array(
           'title' => t('edit'),
@@ -187,7 +187,7 @@ function uc_weightquote_quote($products, $details, $method) {
         // Add the product-specific rate.
         $product_rate = $product->weightquote[$mid] * $product->qty->value;
       }
-      $rate += $product_rate  * $product->weight->value * uc_weight_conversion($product->weight_units->value, config('uc_store.settings')->get('units.weight'));
+      $rate += $product_rate  * $product->weight->value * uc_weight_conversion($product->weight_units->value);
     }
 
     $quotes[] = array(
diff --git a/uc_cart/lib/Drupal/uc_cart/Tests/CartCheckoutTest.php b/uc_cart/lib/Drupal/uc_cart/Tests/CartCheckoutTest.php
index 8e3d6c0..56a8df7 100644
--- a/uc_cart/lib/Drupal/uc_cart/Tests/CartCheckoutTest.php
+++ b/uc_cart/lib/Drupal/uc_cart/Tests/CartCheckoutTest.php
@@ -489,7 +489,7 @@ class CartCheckoutTest extends UbercartTestBase {
     );
 
     // Build the panes.
-    $zone_id = db_query_range('SELECT zone_id FROM {uc_zones} WHERE zone_country_id = :country ORDER BY rand()', 0, 1, array('country' => config('uc_store.settings')->get('address.country')))->fetchField();
+    $zone_id = db_query_range('SELECT zone_id FROM {uc_zones} WHERE zone_country_id = :country ORDER BY rand()', 0, 1, array('country' => \Drupal::config('uc_store.settings')->get('address.country')))->fetchField();
     $oldname = $this->randomName(10);
     $edit = array(
       'panes[delivery][first_name]' => $oldname,
diff --git a/uc_cart_links/lib/Drupal/uc_cart_links/Form/CartLinksForm.php b/uc_cart_links/lib/Drupal/uc_cart_links/Form/CartLinksForm.php
index 07a0ad8..6d1e66a 100644
--- a/uc_cart_links/lib/Drupal/uc_cart_links/Form/CartLinksForm.php
+++ b/uc_cart_links/lib/Drupal/uc_cart_links/Form/CartLinksForm.php
@@ -47,7 +47,7 @@ class CartLinksForm extends ConfirmFormBase {
    * {@inheritdoc}
    */
   public function buildForm(array $form, array &$form_state, $actions = NULL) {
-    $cart_links_config = config('uc_cart_links.settings');
+    $cart_links_config = $this->config('uc_cart_links.settings');
 
     $this->actions = $actions;
 
@@ -89,7 +89,7 @@ class CartLinksForm extends ConfirmFormBase {
    * {@inheritdoc}
    */
   public function submitForm(array &$form, array &$form_state) {
-    $cart_links_config = config('uc_cart_links.settings');
+    $cart_links_config = $this->config('uc_cart_links.settings');
 
     $actions = explode('-', urldecode($this->actions));
     $rebuild_cart = FALSE;
diff --git a/uc_catalog/lib/Drupal/uc_catalog/Plugin/Block/CatalogBlock.php b/uc_catalog/lib/Drupal/uc_catalog/Plugin/Block/CatalogBlock.php
index 4369fdb..41ef53f 100644
--- a/uc_catalog/lib/Drupal/uc_catalog/Plugin/Block/CatalogBlock.php
+++ b/uc_catalog/lib/Drupal/uc_catalog/Plugin/Block/CatalogBlock.php
@@ -83,7 +83,7 @@ class CatalogBlock extends BlockBase {
    */
   public function build() {
     // Get the vocabulary tree information.
-    $vid = config('uc_catalog.settings')->get('vocabulary');
+    $vid = \Drupal::config('uc_catalog.settings')->get('vocabulary');
     $tree = taxonomy_get_tree($vid);
 
     // Then convert it into an actual tree structure.
diff --git a/uc_catalog/uc_catalog.admin.inc b/uc_catalog/uc_catalog.admin.inc
index 89a09b9..f40fe16 100644
--- a/uc_catalog/uc_catalog.admin.inc
+++ b/uc_catalog/uc_catalog.admin.inc
@@ -12,8 +12,8 @@
 function uc_catalog_orphaned_products() {
   $build = array();
 
-  if (config('taxonomy.settings')->get('maintain_index_table')) {
-    $vid = config('uc_catalog.settings')->get('vocabulary');
+  if (\Drupal::config('taxonomy.settings')->get('maintain_index_table')) {
+    $vid = \Drupal::config('uc_catalog.settings')->get('vocabulary');
     $product_types = uc_product_types();
     $field = field_info_field('node', 'taxonomy_catalog');
     $types = array_intersect($product_types, $field['bundles']['node']);
diff --git a/uc_catalog/uc_catalog.module b/uc_catalog/uc_catalog.module
index 2392ce1..cd04fa2 100644
--- a/uc_catalog/uc_catalog.module
+++ b/uc_catalog/uc_catalog.module
@@ -153,11 +153,11 @@ function uc_catalog_uc_store_status() {
   }
 
   $statuses = array();
-  $cat_id = config('uc_catalog.settings')->get('vocabulary');
+  $cat_id = \Drupal::config('uc_catalog.settings')->get('vocabulary');
   $catalog = taxonomy_vocabulary_load($cat_id);
   if ($catalog) {
     // Don't display a status if the taxonomy_index table has no data.
-    if (config('taxonomy.settings')->get('maintain_index_table')) {
+    if (\Drupal::config('taxonomy.settings')->get('maintain_index_table')) {
       $statuses[] = array('status' => 'ok', 'title' => t('Catalog vocabulary'),
         'desc' => t('Vocabulary !name has been identified as the Ubercart catalog.', array('!name' => l($catalog->label(), 'admin/structure/taxonomy/manage/' . $catalog->vid)))
       );
diff --git a/uc_order/lib/Drupal/uc_order/Entity/UcOrder.php b/uc_order/lib/Drupal/uc_order/Entity/UcOrder.php
index 5c86a36..efedb1f 100644
--- a/uc_order/lib/Drupal/uc_order/Entity/UcOrder.php
+++ b/uc_order/lib/Drupal/uc_order/Entity/UcOrder.php
@@ -121,10 +121,10 @@ class UcOrder extends ContentEntityBase implements UcOrderInterface {
     $this->order_total->value = $this->getTotal();
     $this->product_count->value = $this->getProductCount();
     if (is_null($this->delivery_country->value) || $this->delivery_country->value == 0) {
-      $this->delivery_country->value = config('uc_store.settings')->get('address.country');
+      $this->delivery_country->value = \Drupal::config('uc_store.settings')->get('address.country');
     }
     if (is_null($this->billing_country->value) || $this->billing_country->value == 0) {
-      $this->billing_country->value = config('uc_store.settings')->get('address.country');
+      $this->billing_country->value = \Drupal::config('uc_store.settings')->get('address.country');
     }
     $this->host->value = \Drupal::request()->getClientIp();
     $this->modified->value = REQUEST_TIME;
diff --git a/uc_order/lib/Drupal/uc_order/Plugin/views/argument_validator/CurrentUserOrPermission.php b/uc_order/lib/Drupal/uc_order/Plugin/views/argument_validator/CurrentUserOrPermission.php
index d281d7e..dae9105 100644
--- a/uc_order/lib/Drupal/uc_order/Plugin/views/argument_validator/CurrentUserOrPermission.php
+++ b/uc_order/lib/Drupal/uc_order/Plugin/views/argument_validator/CurrentUserOrPermission.php
@@ -85,7 +85,7 @@ class CurrentUserOrPermission extends ArgumentValidatorPluginBase {
     }
     else {
       if ($type == 'name' || $type == 'either') {
-        $name = !empty($GLOBALS['user']->name) ? $GLOBALS['user']->name : config('user.settings')->get('anonymous');
+        $name = !empty($GLOBALS['user']->name) ? $GLOBALS['user']->name : \Drupal::config('user.settings')->get('anonymous');
         if ($argument == $name) {
           $account = clone $GLOBALS['user'];
         }
diff --git a/uc_order/lib/Drupal/uc_order/UcOrderProductStorageController.php b/uc_order/lib/Drupal/uc_order/UcOrderProductStorageController.php
index e8ef02c..60abc50 100644
--- a/uc_order/lib/Drupal/uc_order/UcOrderProductStorageController.php
+++ b/uc_order/lib/Drupal/uc_order/UcOrderProductStorageController.php
@@ -27,11 +27,11 @@ class UcOrderProductStorageController extends FieldableDatabaseStorageController
 
     if (empty($product->weight_units->value)) {
       if (empty($product->nid->value)) {
-        $product->weight_units->value = config('uc_store.settings')->get('units.weight');
+        $product->weight_units->value = \Drupal::config('uc_store.settings')->get('units.weight');
       }
       else {
         $units = db_query("SELECT weight_units FROM {node} n JOIN {uc_products} p ON n.vid = p.vid WHERE n.nid = :nid", array(':nid' => $product->nid->value))->fetchField();
-        $product->weight_units->value = empty($units) ? config('uc_store.settings')->get('units.weight') : $units;
+        $product->weight_units->value = empty($units) ? \Drupal::config('uc_store.settings')->get('units.weight') : $units;
       }
     }
     return parent::save($product);
diff --git a/uc_order/lib/Drupal/uc_order/UcOrderStorageController.php b/uc_order/lib/Drupal/uc_order/UcOrderStorageController.php
index 623c5bc..892c383 100644
--- a/uc_order/lib/Drupal/uc_order/UcOrderStorageController.php
+++ b/uc_order/lib/Drupal/uc_order/UcOrderStorageController.php
@@ -19,7 +19,7 @@ class UcOrderStorageController extends FieldableDatabaseStorageController {
    * {@inheritdoc}
    */
   public function create(array $values) {
-    $store_config = config('uc_store.settings');
+    $store_config = \Drupal::config('uc_store.settings');
 
     // Set the primary email address.
     if (empty($values['primary_email']) && !empty($values['uid'])) {
diff --git a/uc_order/uc_order.module b/uc_order/uc_order.module
index 4f5372b..dd3af12 100644
--- a/uc_order/uc_order.module
+++ b/uc_order/uc_order.module
@@ -869,7 +869,7 @@ function template_preprocess_uc_order_invoice_page(&$variables) {
   $variables['html_attributes']['lang'] = $language_interface->langcode;
   $variables['html_attributes']['dir'] = $language_interface->direction ? 'rtl' : 'ltr';
 
-  $site_config = config('system.site');
+  $site_config = \Drupal::config('system.site');
   // Construct page title.
   if (drupal_get_title()) {
     $head_title = array(
diff --git a/uc_order/uc_order.tokens.inc b/uc_order/uc_order.tokens.inc
index 78c0a50..aabe2a8 100644
--- a/uc_order/uc_order.tokens.inc
+++ b/uc_order/uc_order.tokens.inc
@@ -246,7 +246,7 @@ function uc_order_tokens($type, $tokens, $data = array(), $options = array()) {
           break;
 
         case 'first-name':
-          if (config('uc_store.settings')->get('customer_address') == 'shipping') {
+          if (\Drupal::config('uc_store.settings')->get('customer_address') == 'shipping') {
             $replacements[$original] = $sanitize ? check_plain($order->getAddress('delivery')->first_name) : $order->getAddress('delivery')->first_name;
           }
           else {
@@ -255,7 +255,7 @@ function uc_order_tokens($type, $tokens, $data = array(), $options = array()) {
           break;
 
         case 'last-name':
-          if (config('uc_store.settings')->get('customer_address') == 'shipping') {
+          if (\Drupal::config('uc_store.settings')->get('customer_address') == 'shipping') {
             $replacements[$original] = $sanitize ? check_plain($order->getAddress('delivery')->last_name) : $order->getAddress('delivery')->last_name;
           }
           else {
diff --git a/uc_product/uc_product.module b/uc_product/uc_product.module
index c9c2ee8..1f181e0 100644
--- a/uc_product/uc_product.module
+++ b/uc_product/uc_product.module
@@ -344,11 +344,11 @@ function uc_product_node_prepare_form(NodeInterface $node, $form_display, $opera
     'cost' => 0,
     'sell_price' => 0,
     'weight' => 0,
-    'weight_units' => config('uc_store.settings')->get('units.weight'),
+    'weight_units' => \Drupal::config('uc_store.settings')->get('units.weight'),
     'length' => 0,
     'width' => 0,
     'height' => 0,
-    'length_units' => config('uc_store.settings')->get('units.length'),
+    'length_units' => \Drupal::config('uc_store.settings')->get('units.length'),
     'pkg_qty' => 1,
     'default_qty' => 1,
     'shippable' => isset($settings['shippable']) ? $settings['shippable'] : TRUE,
@@ -1365,11 +1365,11 @@ function uc_product_node_type_insert(NodeTypeInterface $type) {
       'cost' => 0,
       'sell_price' => 0,
       'weight' => 0,
-      'weight_units' => config('uc_store.settings')->get('units.weight'),
+      'weight_units' => \Drupal::config('uc_store.settings')->get('units.weight'),
       'length' => 0,
       'width' => 0,
       'height' => 0,
-      'length_units' => config('uc_store.settings')->get('units.length'),
+      'length_units' => \Drupal::config('uc_store.settings')->get('units.length'),
       'pkg_qty' => 1,
       'default_qty' => 1,
       'shippable' => isset($settings['shippable']) ? $settings['shippable'] : TRUE,
diff --git a/uc_product_kit/uc_product_kit.module b/uc_product_kit/uc_product_kit.module
index d042bd9..85cfcb4 100644
--- a/uc_product_kit/uc_product_kit.module
+++ b/uc_product_kit/uc_product_kit.module
@@ -141,7 +141,7 @@ function uc_product_kit_node_insert($node) {
   $obj->cost = 0;
   $obj->sell_price = 0;
   $obj->weight = 0;
-  $obj->weight_units = config('uc_store.settings')->get('units.weight');
+  $obj->weight_units = \Drupal::config('uc_store.settings')->get('units.weight');
   $obj->default_qty = $node->default_qty;
   $obj->ordering = $node->ordering;
   $obj->shippable = FALSE;
@@ -230,7 +230,7 @@ function uc_product_kit_node_update($node) {
   $obj->cost = 0;
   $obj->sell_price = 0;
   $obj->weight = 0;
-  $obj->weight_units = config('uc_store.settings')->get('units.weight');
+  $obj->weight_units = \Drupal::config('uc_store.settings')->get('units.weight');
   $obj->default_qty = $node->default_qty;
   $obj->ordering = $node->ordering;
   $obj->shippable = FALSE;
diff --git a/uc_reports/uc_reports.admin.inc b/uc_reports/uc_reports.admin.inc
index 5b973b8..06e7e98 100644
--- a/uc_reports/uc_reports.admin.inc
+++ b/uc_reports/uc_reports.admin.inc
@@ -12,7 +12,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
  * Displays the customer report.
  */
 function uc_reports_customers() {
-  $address_preference = config('uc_store.settings')->get('customer_address');
+  $address_preference = \Drupal::config('uc_store.settings')->get('customer_address');
   $first_name = ($address_preference == 'billing') ? 'billing_first_name' : 'delivery_first_name';
   $last_name = ($address_preference == 'billing') ? 'billing_last_name' : 'delivery_last_name';
   $page = isset($_GET['page']) ? intval($_GET['page']) : 0;
@@ -124,7 +124,7 @@ function uc_reports_customers() {
  * Displays the product reports.
  */
 function uc_reports_products() {
-  $views_column = module_exists('statistics') && config('statistics.settings')->get('count_content_views');
+  $views_column = module_exists('statistics') && \Drupal::config('statistics.settings')->get('count_content_views');
 
   $page = isset($_GET['page']) ? intval($_GET['page']) : 0;
   $page_size = isset($_GET['nopage']) ? UC_REPORTS_MAX_RECORDS : variable_get('uc_reports_table_size', 30);
@@ -321,7 +321,7 @@ function uc_reports_product_get_skus($nid) {
  * Displays the custom product report.
  */
 function uc_reports_products_custom() {
-  $views_column = module_exists('statistics') && config('statistics.settings')->get('count_content_views');
+  $views_column = module_exists('statistics') && \Drupal::config('statistics.settings')->get('count_content_views');
 
   $page = isset($_GET['page']) ? intval($_GET['page']) : 0;
   $page_size = isset($_GET['nopage']) ? UC_REPORTS_MAX_RECORDS : variable_get('uc_reports_table_size', 30);
diff --git a/uc_taxes/lib/Drupal/uc_taxes/Tests/InclusiveTaxesTest.php b/uc_taxes/lib/Drupal/uc_taxes/Tests/InclusiveTaxesTest.php
index d421f50..583dbe5 100644
--- a/uc_taxes/lib/Drupal/uc_taxes/Tests/InclusiveTaxesTest.php
+++ b/uc_taxes/lib/Drupal/uc_taxes/Tests/InclusiveTaxesTest.php
@@ -110,7 +110,7 @@ class InclusiveTaxesTest extends UbercartTestBase {
     $this->assertText('Subtotal: $16.80', 'Order subtotal is correct on checkout page.');
 
     // Manually proceed to checkout review.
-    $zone_id = db_query_range('SELECT zone_id FROM {uc_zones} WHERE zone_country_id = :country ORDER BY rand()', 0, 1, array('country' => config('uc_store.settings')->get('address.country')))->fetchField();
+    $zone_id = db_query_range('SELECT zone_id FROM {uc_zones} WHERE zone_country_id = :country ORDER BY rand()', 0, 1, array('country' => \Drupal::config('uc_store.settings')->get('address.country')))->fetchField();
     $edit = array(
       'panes[delivery][first_name]' => $this->randomName(10),
       'panes[delivery][last_name]' => $this->randomName(10),
diff --git a/uc_taxes/lib/Drupal/uc_taxes/Tests/StoredTaxesTest.php b/uc_taxes/lib/Drupal/uc_taxes/Tests/StoredTaxesTest.php
index 33b20cd..e0955eb 100644
--- a/uc_taxes/lib/Drupal/uc_taxes/Tests/StoredTaxesTest.php
+++ b/uc_taxes/lib/Drupal/uc_taxes/Tests/StoredTaxesTest.php
@@ -82,7 +82,7 @@ class StoredTaxesTest extends UbercartTestBase {
     $this->assertRaw(uc_currency_format($rate->rate * $this->product->sell_price), t('Correct tax amount displayed.'));
 
     // Build the panes.
-    $zone_id = db_query_range('SELECT zone_id FROM {uc_zones} WHERE zone_country_id = :country ORDER BY rand()', 0, 1, array('country' => config('uc_store.settings')->get('address.country')))->fetchField();
+    $zone_id = db_query_range('SELECT zone_id FROM {uc_zones} WHERE zone_country_id = :country ORDER BY rand()', 0, 1, array('country' => \Drupal::config('uc_store.settings')->get('address.country')))->fetchField();
     $edit = array(
       'panes[delivery][first_name]' => $this->randomName(10),
       'panes[delivery][last_name]' => $this->randomName(10),