diff --git a/payment/uc_payment_pack/src/Tests/PaymentPackTest.php b/payment/uc_payment_pack/src/Tests/PaymentPackTest.php
index 8095739..e2773f3 100644
--- a/payment/uc_payment_pack/src/Tests/PaymentPackTest.php
+++ b/payment/uc_payment_pack/src/Tests/PaymentPackTest.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\uc_payment_pack\Tests;
 
+use Drupal\uc_order\Entity\Order;
 use Drupal\uc_store\Tests\UbercartTestBase;
 use Drupal\uc_store\Address;
 
@@ -99,7 +100,7 @@ class PaymentPackTest extends UbercartTestBase {
     $this->drupalPostForm(NULL, array(), 'Submit order');
 
     // Test user order view
-    $order = \Drupal\uc_order\Entity\Order::load(1);
+    $order = Order::load(1);
     $this->assertEqual($order->getPaymentMethodId(), 'check', 'Order has check payment method.');
 
     $this->drupalGet('user/' . $order->getOwnerId() . '/orders/' . $order->id());
@@ -160,7 +161,7 @@ class PaymentPackTest extends UbercartTestBase {
     $this->drupalPostForm(NULL, array(), 'Submit order');
 
     // Test user order view
-    $order = \Drupal\uc_order\Entity\Order::load(1);
+    $order = Order::load(1);
     $this->assertEqual($order->getPaymentMethodId(), 'cod', 'Order has COD payment method.');
 
     $this->drupalGet('user/' . $order->getOwnerId() . '/orders/' . $order->id());
@@ -194,7 +195,7 @@ class PaymentPackTest extends UbercartTestBase {
     $this->drupalPostForm(NULL, array(), 'Submit order');
 
     // Test user order view
-    $order = \Drupal\uc_order\Entity\Order::load(1);
+    $order = Order::load(1);
     $this->assertEqual($order->getPaymentMethodId(), 'other', 'Order has other payment method.');
 
     $this->drupalGet('user/' . $order->getOwnerId() . '/orders/' . $order->id());
diff --git a/shipping/uc_quote/src/Tests/QuoteTest.php b/shipping/uc_quote/src/Tests/QuoteTest.php
index 21d3cdd..11bb3b6 100644
--- a/shipping/uc_quote/src/Tests/QuoteTest.php
+++ b/shipping/uc_quote/src/Tests/QuoteTest.php
@@ -7,6 +7,8 @@
 
 namespace Drupal\uc_quote\Tests;
 
+use Drupal\uc_country\Entity\Country;
+use Drupal\uc_order\Entity\Order;
 use Drupal\uc_store\Tests\UbercartTestBase;
 
 /**
@@ -25,8 +27,8 @@ class QuoteTest extends UbercartTestBase {
 
     // In order to test zone-based conditions, this particular test class
     // assumes that US is enabled as default, and CA is also enabled.
-    \Drupal\uc_country\Entity\Country::load('US')->enable()->save();
-    \Drupal\uc_country\Entity\Country::load('CA')->enable()->save();
+    Country::load('US')->enable()->save();
+    Country::load('CA')->enable()->save();
     \Drupal::configFactory()->getEditable('uc_store.settings')->set('address.country', 'US')->save();
   }
 
@@ -207,7 +209,7 @@ class QuoteTest extends UbercartTestBase {
     $order_id = reset($order_ids);
 
     if ($order_id) {
-      $order = \Drupal\uc_order\Entity\Order::load($order_id);
+      $order = Order::load($order_id);
       foreach ($order->line_items as $line) {
         if ($line['type'] == 'shipping') {
           break;
diff --git a/shipping/uc_ups/src/Form/UPSSettingsForm.php b/shipping/uc_ups/src/Form/UPSSettingsForm.php
index 3067d0f..60e7966 100644
--- a/shipping/uc_ups/src/Form/UPSSettingsForm.php
+++ b/shipping/uc_ups/src/Form/UPSSettingsForm.php
@@ -10,6 +10,7 @@ namespace Drupal\uc_ups\Form;
 use Drupal\Core\Form\ConfigFormBase;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Url;
+use Drupal\uc_ups\UPSUtilities;
 
 /**
  * Configures UPS settings.
@@ -104,7 +105,7 @@ class UPSSettingsForm extends ConfigFormBase {
       '#type' => 'checkboxes',
       '#title' => $this->t('UPS services'),
       '#default_value' => $ups_config->get('services'),
-      '#options' => \Drupal\uc_ups\UPSUtilities::services(),
+      '#options' => UPSUtilities::services(),
       '#description' => $this->t('Select the UPS services that are available to customers.'),
     );
 
@@ -132,7 +133,7 @@ class UPSSettingsForm extends ConfigFormBase {
       '#type' => 'select',
       '#title' => $this->t('Default Package Type'),
       '#default_value' => $ups_config->get('package_type'),
-      '#options' => \Drupal\uc_ups\UPSUtilities::packageTypes(),
+      '#options' => UPSUtilities::packageTypes(),
       '#description' => $this->t('Type of packaging to be used.  May be overridden on a per-product basis via the product node edit form.'),
     );
     $form['uc_ups_quote_options']['uc_ups_classification'] = array(
diff --git a/shipping/uc_usps/src/Form/USPSSettingsForm.php b/shipping/uc_usps/src/Form/USPSSettingsForm.php
index a3fb2d0..53b263f 100644
--- a/shipping/uc_usps/src/Form/USPSSettingsForm.php
+++ b/shipping/uc_usps/src/Form/USPSSettingsForm.php
@@ -10,6 +10,7 @@ namespace Drupal\uc_usps\Form;
 use Drupal\Core\Form\ConfigFormBase;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Url;
+use Drupal\uc_usps\USPSUtilities;
 
 /**
  * Configures USPS settings.
@@ -81,7 +82,7 @@ class USPSSettingsForm extends ConfigFormBase {
       '#type' => 'checkboxes',
       '#title' => $this->t('USPS envelope services'),
       '#default_value' => $usps_config->get('env_services'),
-      '#options' => \Drupal\uc_usps\USPSUtilities::envelopeServices(),
+      '#options' => USPSUtilities::envelopeServices(),
       '#description' => $this->t('Select the USPS services that are available to customers. Be sure to include the services that the Postal Service agrees are available to you.'),
     );
 
@@ -89,7 +90,7 @@ class USPSSettingsForm extends ConfigFormBase {
       '#type' => 'checkboxes',
       '#title' => $this->t('USPS parcel services'),
       '#default_value' => $usps_config->get('services'),
-      '#options' => \Drupal\uc_usps\USPSUtilities::services(),
+      '#options' => USPSUtilities::services(),
       '#description' => $this->t('Select the USPS services that are available to customers. Be sure to include the services that the Postal Service agrees are available to you.'),
     );
 
@@ -104,7 +105,7 @@ class USPSSettingsForm extends ConfigFormBase {
       '#type' => 'checkboxes',
       '#title' => $this->t('USPS international envelope services'),
       '#default_value' => $usps_config->get('intl_env_services'),
-      '#options' => \Drupal\uc_usps\USPSUtilities::internationalEnvelopeServices(),
+      '#options' => USPSUtilities::internationalEnvelopeServices(),
       '#description' => $this->t('Select the USPS services that are available to customers. Be sure to include the services that the Postal Service agrees are available to you.'),
     );
 
@@ -112,7 +113,7 @@ class USPSSettingsForm extends ConfigFormBase {
       '#type' => 'checkboxes',
       '#title' => $this->t('USPS international parcel services'),
       '#default_value' => $usps_config->get('intl_services'),
-      '#options' => \Drupal\uc_usps\USPSUtilities::internationalServices(),
+      '#options' => USPSUtilities::internationalServices(),
       '#description' => $this->t('Select the USPS services that are available to customers. Be sure to include the services that the Postal Service agrees are available to you.'),
     );
 
diff --git a/uc_cart/src/Controller/CheckoutController.php b/uc_cart/src/Controller/CheckoutController.php
index 9f8ad8f..c99f405 100644
--- a/uc_cart/src/Controller/CheckoutController.php
+++ b/uc_cart/src/Controller/CheckoutController.php
@@ -12,6 +12,7 @@ use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Drupal\uc_cart\CartInterface;
 use Drupal\uc_cart\CartManagerInterface;
 use Drupal\uc_cart\Plugin\CheckoutPaneManager;
+use Drupal\uc_order\Entity\Order;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -118,7 +119,7 @@ class CheckoutController extends ControllerBase implements ContainerInjectionInt
       $rebuild = FALSE;
       if (!isset($order)) {
         // Create a new order if necessary.
-        $order = \Drupal\uc_order\Entity\Order::create(array(
+        $order = Order::create(array(
           'uid' => $this->currentUser()->id(),
         ));
         $order->save();
diff --git a/uc_cart/src/Entity/CartItem.php b/uc_cart/src/Entity/CartItem.php
index 399f573..df23d83 100644
--- a/uc_cart/src/Entity/CartItem.php
+++ b/uc_cart/src/Entity/CartItem.php
@@ -13,6 +13,7 @@ use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Field\BaseFieldDefinition;
 use Drupal\uc_cart\CartItemInterface;
+use Drupal\uc_order\Entity\OrderProduct;
 
 /**
  * Defines the cart item entity class.
@@ -47,7 +48,7 @@ class CartItem extends ContentEntityBase implements CartItemInterface {
    * Converts a cart item into an order product.
    */
   public function toOrderProduct() {
-    $order_product = \Drupal\uc_order\Entity\OrderProduct::create(array(
+    $order_product = OrderProduct::create(array(
       'nid' => $this->nid->target_id,
       'title' => $this->title,
       'model' => $this->model,
diff --git a/uc_cart_links/src/Tests/CartLinksTest.php b/uc_cart_links/src/Tests/CartLinksTest.php
index e1210d7..db1f713 100644
--- a/uc_cart_links/src/Tests/CartLinksTest.php
+++ b/uc_cart_links/src/Tests/CartLinksTest.php
@@ -9,6 +9,7 @@ namespace Drupal\uc_cart_links\Tests;
 
 use Drupal\Core\Url;
 use Drupal\Component\Utility\SafeMarkup;
+use Drupal\filter\Entity\FilterFormat;
 use Drupal\uc_store\Tests\UbercartTestBase;
 
 /**
@@ -44,7 +45,7 @@ class CartLinksTest extends UbercartTestBase {
 
     // Create Full HTML text format, needed because we want links
     // to appear on pages.
-    $full_html_format = \Drupal\filter\Entity\FilterFormat::create(array(
+    $full_html_format = FilterFormat::create(array(
       'format' => 'full_html',
       'name' => 'Full HTML',
     ));
diff --git a/uc_catalog/src/Form/CatalogSettingsForm.php b/uc_catalog/src/Form/CatalogSettingsForm.php
index e758eb7..38cb0b0 100644
--- a/uc_catalog/src/Form/CatalogSettingsForm.php
+++ b/uc_catalog/src/Form/CatalogSettingsForm.php
@@ -9,6 +9,7 @@ namespace Drupal\uc_catalog\Form;
 
 use Drupal\Core\Form\ConfigFormBase;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\taxonomy\Entity\Vocabulary;
 use Drupal\views\Views;
 
 /**
@@ -56,7 +57,7 @@ class CatalogSettingsForm extends ConfigFormBase {
 
     $vid = $config->get('vocabulary');
     if ($vid) {
-      $catalog = \Drupal\taxonomy\Entity\Vocabulary::load($vid);
+      $catalog = Vocabulary::load($vid);
 
       $form['catalog_vid'] = array(
         '#markup' => '<p>' . $this->t('The taxonomy vocabulary <a href=":edit-url">%name</a> is set as the product catalog.', array(':edit-url' => $this->url('entity.taxonomy_vocabulary.edit_form', ['taxonomy_vocabulary' => $catalog->id()]), '%name' => $catalog->label())) . '</p>',
@@ -64,7 +65,7 @@ class CatalogSettingsForm extends ConfigFormBase {
     }
 
     $vocabs = array();
-    $vocabularies = \Drupal\taxonomy\Entity\Vocabulary::loadMultiple();
+    $vocabularies = Vocabulary::loadMultiple();
     foreach ($vocabularies as $vid => $vocabulary) {
       $vocabs[$vid] = $vocabulary->label();
     }
diff --git a/uc_order/src/Form/OrderCreateForm.php b/uc_order/src/Form/OrderCreateForm.php
index 0f032c4..ad60e03 100644
--- a/uc_order/src/Form/OrderCreateForm.php
+++ b/uc_order/src/Form/OrderCreateForm.php
@@ -9,6 +9,8 @@ namespace Drupal\uc_order\Form;
 
 use Drupal\Core\Form\FormBase;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\uc_order\Entity\Order;
+use Drupal\user\Entity\User;
 
 /**
  * Creates a new order and redirect to its edit screen.
@@ -244,7 +246,7 @@ class OrderCreateForm extends FormBase {
           'pass' => user_password(),
           'status' => $this->config('uc_cart.settings')->get('new_customer_status_active') ? 1 : 0,
         );
-        $account = \Drupal\user\Entity\User::create($fields);
+        $account = User::create($fields);
         $account->save();
         $uid = $account->id();
 
@@ -260,7 +262,7 @@ class OrderCreateForm extends FormBase {
         $uid = 0;
     }
 
-    $order = \Drupal\uc_order\Entity\Order::create(array(
+    $order = Order::create(array(
       'uid' => $uid,
       'order_status' => uc_order_state_default('post_checkout'),
     ));
diff --git a/uc_order/src/Form/OrderStatusAddForm.php b/uc_order/src/Form/OrderStatusAddForm.php
index a1c59c1..44878d8 100644
--- a/uc_order/src/Form/OrderStatusAddForm.php
+++ b/uc_order/src/Form/OrderStatusAddForm.php
@@ -10,6 +10,7 @@ namespace Drupal\uc_order\Form;
 use Drupal\Core\Form\FormBase;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Url;
+use Drupal\uc_order\Entity\OrderStatus;
 
 /**
  * Presents the form to create a custom order status.
@@ -81,7 +82,7 @@ class OrderStatusAddForm extends FormBase {
       $form_state->setErrorByName('id', $this->t('You have entered an invalid status ID.'));
     }
 
-    if (\Drupal\uc_order\Entity\OrderStatus::load($id)) {
+    if (OrderStatus::load($id)) {
       $form_state->setErrorByName('id', $this->t('This ID is already in use.  Please specify a unique ID.'));
     }
   }
@@ -90,7 +91,7 @@ class OrderStatusAddForm extends FormBase {
    * {@inheritdoc}
    */
   public function submitForm(array &$form, FormStateInterface $form_state) {
-    \Drupal\uc_order\Entity\OrderStatus::create(array(
+    OrderStatus::create(array(
       'id' => strtolower(trim($form_state->getValue('id'))),
       'name' => $form_state->getValue('name'),
       'state' => $form_state->getValue('state'),
diff --git a/uc_order/src/Form/OrderUpdateForm.php b/uc_order/src/Form/OrderUpdateForm.php
index 26ef82a..58a2b86 100644
--- a/uc_order/src/Form/OrderUpdateForm.php
+++ b/uc_order/src/Form/OrderUpdateForm.php
@@ -9,6 +9,7 @@ namespace Drupal\uc_order\Form;
 
 use Drupal\Core\Form\FormBase;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\uc_order\Entity\Order;
 use Drupal\uc_order\Entity\OrderStatus;
 use Drupal\uc_order\OrderInterface;
 
@@ -97,7 +98,7 @@ class OrderUpdateForm extends FormBase {
     }
 
     if ($form_state->getValue('status') != $form_state->getValue('current_status')) {
-      \Drupal\uc_order\Entity\Order::load($form_state->getValue('order_id'))
+      Order::load($form_state->getValue('order_id'))
         ->setStatusId($form_state->getValue('status'))
         ->save();
 
diff --git a/uc_role/src/Form/RoleSettingsForm.php b/uc_role/src/Form/RoleSettingsForm.php
index 01587a2..ef6d47e 100644
--- a/uc_role/src/Form/RoleSettingsForm.php
+++ b/uc_role/src/Form/RoleSettingsForm.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\uc_role\Form;
 
+use Drupal\Core\Datetime\DrupalDateTime;
 use Drupal\Core\Form\ConfigFormBase;
 use Drupal\Core\Form\FormStateInterface;
 
@@ -121,7 +122,7 @@ class RoleSettingsForm extends ConfigFormBase {
       ),
     );
     $date = $roles_config->get('default_end_time');
-    $date = !empty($date) ? \Drupal\Core\Datetime\DrupalDateTime::createFromTimestamp($date) : \Drupal\Core\Datetime\DrupalDateTime::createFromTimestamp(REQUEST_TIME);
+    $date = !empty($date) ? DrupalDateTime::createFromTimestamp($date) : DrupalDateTime::createFromTimestamp(REQUEST_TIME);
     $form['role_lifetime']['absolute']['uc_role_default_end_time'] = array(
       '#type' => 'datetime',
       '#description' => $this->t('Expire the role at the beginning of this day.'),
diff --git a/uc_role/src/Tests/RoleTest.php b/uc_role/src/Tests/RoleTest.php
index 147ddbf..bb9d49e 100644
--- a/uc_role/src/Tests/RoleTest.php
+++ b/uc_role/src/Tests/RoleTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\uc_role\Tests;
 
 use Drupal\uc_store\Tests\UbercartTestBase;
+use Drupal\user\Entity\Role;
 
 /**
  * Tests the role purchase functionality.
@@ -41,7 +42,7 @@ class RoleTest extends UbercartTestBase {
     // $this->assertTrue($order->getOwner()->hasRole($rid), 'Existing user was granted role.');
 
     // Test that the email is correct.
-    $role = \Drupal\user\Entity\Role::load($rid);
+    $role = Role::load($rid);
     // @todo Re-enable when Rules is available.
     // $this->assertMailString('subject', $role->label(), 4, 'Role assignment email mentions role in subject line.');
 
diff --git a/uc_stock/src/Controller/StockReports.php b/uc_stock/src/Controller/StockReports.php
index 67531ec..dca6921 100644
--- a/uc_stock/src/Controller/StockReports.php
+++ b/uc_stock/src/Controller/StockReports.php
@@ -9,6 +9,7 @@ namespace Drupal\uc_stock\Controller;
 
 use Drupal\Core\Controller\ControllerBase;
 use Drupal\Core\Url;
+use Drupal\uc_report\Controller\Reports;
 
 /**
  * Displays a stock report for products with stock tracking enabled.
@@ -82,7 +83,7 @@ class StockReports extends ControllerBase {
     }
 
     // Cache the CSV export.
-    $controller = new \Drupal\uc_report\Controller\Reports();
+    $controller = new Reports();
     $csv_data = $controller->store_csv('uc_stock', $csv_rows);
 
     $build['form'] = \Drupal::formBuilder()->getForm('\Drupal\uc_stock\Form\StockReportForm');
diff --git a/uc_store/src/Tests/AjaxTest.php b/uc_store/src/Tests/AjaxTest.php
index d81ebfe..3b442d5 100644
--- a/uc_store/src/Tests/AjaxTest.php
+++ b/uc_store/src/Tests/AjaxTest.php
@@ -6,6 +6,7 @@
  */
 
 namespace Drupal\uc_store\Tests;
+use Drupal\uc_country\Entity\Country;
 
 /**
  * Tests Ajax updating of checkout and order pages.
@@ -27,7 +28,7 @@ class AjaxTest extends UbercartTestBase {
 
     // In order to test zone-based conditions, this particular test class
     // assumes that US is enabled and set as the store country.
-    \Drupal\uc_country\Entity\Country::load('US')->enable()->save();
+    Country::load('US')->enable()->save();
     \Drupal::configFactory()->getEditable('uc_store.settings')->set('address.country', 'US')->save();
   }
 
diff --git a/uc_store/src/Tests/UbercartTestBase.php b/uc_store/src/Tests/UbercartTestBase.php
index 5d2c33a..d078416 100644
--- a/uc_store/src/Tests/UbercartTestBase.php
+++ b/uc_store/src/Tests/UbercartTestBase.php
@@ -9,6 +9,9 @@ namespace Drupal\uc_store\Tests;
 
 use Drupal\Component\Utility\SafeMarkup;
 use Drupal\simpletest\WebTestBase;
+use Drupal\uc_country\Entity\Country;
+use Drupal\uc_order\Entity\Order;
+use Drupal\uc_order\Entity\OrderProduct;
 
 abstract class UbercartTestBase extends WebTestBase {
 
@@ -78,7 +81,7 @@ abstract class UbercartTestBase extends WebTestBase {
     $country_ids = array_rand($countries, 8);
     foreach ($country_ids as $country_id) {
       // Don't use the country UI, we're not testing that here...
-      \Drupal\uc_country\Entity\Country::load($country_id)->enable()->save();
+      Country::load($country_id)->enable()->save();
     }
     // Last one of the 8 gets to be the store default country.
     \Drupal::configFactory()->getEditable('uc_store.settings')->set('address.country', $country_id)->save();
@@ -266,7 +269,7 @@ abstract class UbercartTestBase extends WebTestBase {
     $order_id = reset($order_ids);
     if ($order_id) {
       $this->pass(SafeMarkup::format('Order %order_id has been created', ['%order_id' => $order_id]));
-      $order = \Drupal\uc_order\Entity\Order::load($order_id);
+      $order = Order::load($order_id);
     }
     else {
       $this->fail('No order was created.');
@@ -284,10 +287,10 @@ abstract class UbercartTestBase extends WebTestBase {
       $edit['primary_email'] = $this->randomString() . '@example.org';
     }
 
-    $order = \Drupal\uc_order\Entity\Order::create($edit);
+    $order = Order::create($edit);
 
     if (!isset($fields['products'])) {
-      $order->products[] = \Drupal\uc_order\Entity\OrderProduct::create(array(
+      $order->products[] = OrderProduct::create(array(
         'nid' => $this->product->nid->target_id,
         'title' => $this->product->title->value,
         'model' => $this->product->model,
@@ -301,7 +304,7 @@ abstract class UbercartTestBase extends WebTestBase {
 
     $order->save();
 
-    return \Drupal\uc_order\Entity\Order::load($order->id());
+    return Order::load($order->id());
   }
 
   /**
diff --git a/uc_tax/src/Controller/TaxController.php b/uc_tax/src/Controller/TaxController.php
index 3694d7e..dae3fc3 100644
--- a/uc_tax/src/Controller/TaxController.php
+++ b/uc_tax/src/Controller/TaxController.php
@@ -8,6 +8,7 @@
 namespace Drupal\uc_tax\Controller;
 
 use Drupal\Core\Controller\ControllerBase;
+use Drupal\uc_tax\Entity\TaxRate;
 
 /**
  * Controller routines for tax routes.
@@ -19,7 +20,7 @@ class TaxController extends ControllerBase {
    */
   public function saveClone($uc_tax_rate) {
     // Load the source rate entity.
-    $rate = \Drupal\uc_tax\Entity\TaxRate::load($uc_tax_rate);
+    $rate = TaxRate::load($uc_tax_rate);
     $name = $rate->label();
 
     // Tweak the name and unset the rate ID.
diff --git a/uc_tax/src/Tests/StoredTaxTest.php b/uc_tax/src/Tests/StoredTaxTest.php
index 9a6cb91..fe98420 100644
--- a/uc_tax/src/Tests/StoredTaxTest.php
+++ b/uc_tax/src/Tests/StoredTaxTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\uc_tax\Tests;
 
 use Drupal\Component\Utility\SafeMarkup;
+use Drupal\uc_order\Entity\Order;
 use Drupal\uc_store\Tests\UbercartTestBase;
 
 /**
@@ -121,7 +122,7 @@ class StoredTaxTest extends UbercartTestBase {
       $this->assertTaxLineCorrect($this->loadTaxLine($order_id), $oldrate, 'after applicable product change');
 
       // Change order Status back to in_checkout and ensure tax-rate changes now update the order.
-      \Drupal\uc_order\Entity\Order::load($order_id)->setStatusId('in_checkout')->save();
+      Order::load($order_id)->setStatusId('in_checkout')->save();
       $this->drupalPostForm('admin/store/orders/' . $order_id . '/edit', array(), t('Save changes'));
       $this->assertText(t('Order changes saved.'));
       $this->assertFalse($this->loadTaxLine($order_id), 'The tax line was removed from the order when order status changed back to in_checkout.');
diff --git a/uc_tax_report/src/Controller/SalesTaxReport.php b/uc_tax_report/src/Controller/SalesTaxReport.php
index 91f124d..a90958c 100644
--- a/uc_tax_report/src/Controller/SalesTaxReport.php
+++ b/uc_tax_report/src/Controller/SalesTaxReport.php
@@ -8,6 +8,7 @@
 namespace Drupal\uc_tax_report\Controller;
 
 use Drupal\Core\Url;
+use Drupal\uc_report\Controller\Reports;
 
 /**
  * Displays sales tax report.
@@ -160,7 +161,7 @@ class SalesTaxReport {
     $csv_rows[] = $row;
 
     // Cache the CSV export.
-    $controller = new \Drupal\uc_report\Controller\Reports();
+    $controller = new Reports();
     $csv_data = $controller->store_csv('uc_tax_report', $csv_rows);
 
     // Build the page output holding the form, table, and CSV export link.