diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 358458c..859895f 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -40,7 +40,7 @@ Ubercart 4.x
     * uc_cart_get_total_qty() removed
 * Order statuses are configuration entities
     * uc_order_update_status() => $order->setStatusId()->save()
-    * uc_order_status_list() => entity_load_multiple('uc_order_status')
+    * uc_order_status_list() => OrderStatus::loadMultiple()
     * uc_order_status_data() removed
     * uc_order_state_list() converted to uc_order_state_options_list()
     * Order state scopes removed, replaced with order status weights.
diff --git a/uc_order/src/Plugin/views/field/Status.php b/uc_order/src/Plugin/views/field/Status.php
index cc8907a..7b9f7d8 100644
--- a/uc_order/src/Plugin/views/field/Status.php
+++ b/uc_order/src/Plugin/views/field/Status.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\uc_order\Plugin\views\field;
 
+use Drupal\uc_order\Entity\OrderStatus;
 use Drupal\views\Plugin\views\field\FieldPluginBase;
 use Drupal\views\ResultRow;
 
@@ -23,7 +24,7 @@ class Status extends FieldPluginBase {
    * {@inheritdoc}
    */
   public function render(ResultRow $values) {
-    $status = entity_load('uc_order_status', $this->getValue($values));
+    $status = OrderStatus::load($this->getValue($values));
     return $this->sanitizeValue($status->name);
   }
 
diff --git a/uc_order/uc_order.module b/uc_order/uc_order.module
index b816152..50681e6 100644
--- a/uc_order/uc_order.module
+++ b/uc_order/uc_order.module
@@ -16,6 +16,8 @@ use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\Core\Template\Attribute;
 use Drupal\Core\Url;
+use Drupal\uc_order\Entity\Order;
+use Drupal\uc_order\Entity\OrderStatus;
 
 require_once dirname(__FILE__) . '/uc_order.order_pane.inc';
 require_once dirname(__FILE__) . '/uc_order.line_item.inc';
@@ -274,7 +276,7 @@ function uc_order_form_views_exposed_form_alter(&$form, FormStateInterface $form
  * Redirects if a valid order ID was entered in the exposed field.
  */
 function uc_order_form_views_exposed_form_submit($form, FormStateInterface $form_state) {
-  if (!$form_state->isValueEmpty('order_id') && entity_load('uc_order', $form_state->getValue('order_id'))) {
+  if (!$form_state->isValueEmpty('order_id') && Order::load($form_state->getValue('order_id'))) {
     $form_state->setRedirect('uc_order.admin_view', ['uc_order' => $form_state->getValue('order_id')]);
     $form_state->disableRedirect(FALSE);
   }
@@ -426,7 +428,7 @@ function uc_order_uc_line_item() {
  *   The initial state of the order.
  */
 function uc_order_new($uid = 0, $state = 'in_checkout') {
-  $order = \Drupal\uc_order\Entity\Order::create(array(
+  $order = Order::create(array(
     'uid' => $uid,
     'order_status' => uc_order_state_default($state),
   ));
@@ -498,7 +500,7 @@ function uc_order_product_revive($products, $published = TRUE) {
  * @param bool $reset
  *   (optional) Whether to reset the internal cache. Defaults to FALSE.
  *
- * @return Drupal\uc_order\Order|false
+ * @return Drupal\uc_order\Entity\Order|false
  *   A fully-populated order entity, or FALSE if the order is not found.
  */
 function uc_order_load($order_id, $reset = FALSE) {
@@ -731,7 +733,7 @@ function uc_order_state_default($state_id) {
  */
 function uc_order_status_options_list() {
   $options = array();
-  foreach (entity_load_multiple('uc_order_status') as $status) {
+  foreach (OrderStatus::loadMultiple() as $status) {
     $options[$status->id] = $status->name;
   }
   return $options;
diff --git a/uc_order/uc_order.order_pane.inc b/uc_order/uc_order.order_pane.inc
index b7ff98c..7b535ca 100644
--- a/uc_order/uc_order.order_pane.inc
+++ b/uc_order/uc_order.order_pane.inc
@@ -18,6 +18,8 @@ use Drupal\Core\Ajax\ReplaceCommand;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Render\Element;
 use Drupal\Core\Url;
+use Drupal\uc_order\Entity\OrderProduct;
+use Drupal\uc_order\Entity\OrderStatus;
 
 /**
  * Handles the "Print button" order pane.
@@ -667,7 +669,7 @@ function uc_order_edit_products_remove($form, FormStateInterface $form_state) {
 
   if (\Drupal::moduleHandler()->moduleExists('uc_stock')) {
     // Replace stock immediately.
-    $product = entity_load('uc_order_product', $order_product_id);
+    $product = OrderProduct::load($order_product_id);
     uc_stock_adjust($product->model, $product->qty);
   }
 
@@ -954,7 +956,7 @@ function uc_order_pane_order_comments($op, $order, &$form = NULL, FormStateInter
         '#empty' => t('This order has no comments associated with it.'),
       );
       $comments = uc_order_comments_load($order->id());
-      $statuses = entity_load_multiple('uc_order_status');
+      $statuses = OrderStatus::loadMultiple();
       foreach ($comments as $comment) {
         $icon = $comment->notified ? 'true-icon.gif' : 'false-icon.gif';
         $build['#rows'][] = array(
@@ -969,7 +971,7 @@ function uc_order_pane_order_comments($op, $order, &$form = NULL, FormStateInter
 
     case 'customer':
       $comments = uc_order_comments_load($order->id());
-      $statuses = entity_load_multiple('uc_order_status');
+      $statuses = OrderStatus::loadMultiple();
       $header = array(t('Date'), t('Status'), t('Message'));
       $rows[] = array(
         array('data' => \Drupal::service('date.formatter')->format($order->created->value, 'uc_store'), 'class' => array('date')),
diff --git a/uc_tax/uc_tax.module b/uc_tax/uc_tax.module
index 0f30d8c..ed01c7c 100644
--- a/uc_tax/uc_tax.module
+++ b/uc_tax/uc_tax.module
@@ -11,6 +11,7 @@ use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\node\Entity\NodeType;
 use Drupal\node\NodeInterface;
 use Drupal\uc_order\OrderInterface;
 
@@ -570,7 +571,7 @@ function uc_tax_apply_item_tax($item, $tax) {
     $shippable = $node->shippable->value;
   }
   else { // Use default for this node type.
-    $settings = entity_load('node_type', $type)->getModuleSettings('uc_product');
+    $settings = NodeType::load($type)->getModuleSettings('uc_product');
     $shippable = isset($settings['shippable']) ? $settings['shippable'] : TRUE;
   }