diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index eeb6ed9..8383bb5 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -43,6 +43,7 @@ Ubercart 4.x
     * uc_order_update_status() => $order->setStatusId()->save()
     * uc_order_status_list() => OrderStatus::loadMultiple()
     * uc_order_status_data() removed
+    * uc_order_status_options_list() converted to OrderStatus::getOptionsList()
     * uc_order_state_list() converted to uc_order_state_options_list()
     * Order state scopes removed, replaced with order status weights.
 * Payment methods are plugins
diff --git a/uc_order/src/Entity/OrderStatus.php b/uc_order/src/Entity/OrderStatus.php
index 8d5faa2..9e0c3e4 100644
--- a/uc_order/src/Entity/OrderStatus.php
+++ b/uc_order/src/Entity/OrderStatus.php
@@ -132,4 +132,18 @@ class OrderStatus extends ConfigEntityBase implements OrderStatusInterface {
     uasort($entities, 'static::sort');
   }
 
+  /**
+   * Returns an option list of order statuses.
+   *
+   * @return string[]
+   *   An array of status names, keyed by status ID.
+   */
+  public static function getOptionsList() {
+    $options = [];
+    foreach (static::loadMultiple() as $status) {
+      $options[$status->id()] = $status->getName();
+    }
+    return $options;
+  }
+
 }
diff --git a/uc_order/src/Form/OrderUpdateForm.php b/uc_order/src/Form/OrderUpdateForm.php
index 1c1228d..838f196 100644
--- a/uc_order/src/Form/OrderUpdateForm.php
+++ b/uc_order/src/Form/OrderUpdateForm.php
@@ -10,6 +10,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;
 
 /**
@@ -65,7 +66,7 @@ class OrderUpdateForm extends FormBase {
       '#type' => 'select',
       '#title' => t('Order status'),
       '#default_value' => $order->getStatusId(),
-      '#options' => uc_order_status_options_list(),
+      '#options' => OrderStatus::getOptionsList(),
     );
     $form['controls']['notify'] = array(
       '#type' => 'checkbox',
diff --git a/uc_order/src/Plugin/Action/SetOrderStatusAction.php b/uc_order/src/Plugin/Action/SetOrderStatusAction.php
index 46a90d2..fbe6547 100644
--- a/uc_order/src/Plugin/Action/SetOrderStatusAction.php
+++ b/uc_order/src/Plugin/Action/SetOrderStatusAction.php
@@ -9,6 +9,7 @@ namespace Drupal\uc_order\Plugin\Action;
 
 use Drupal\Core\Action\ConfigurableActionBase;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\uc_order\Entity\OrderStatus;
 
 /**
  * Sets the status of an order.
@@ -49,7 +50,7 @@ class SetOrderStatusAction extends ConfigurableActionBase {
       '#type' => 'select',
       '#title' => t('Order status'),
       '#default_value' => $this->configuration['status'],
-      '#options' => uc_order_status_options_list(),
+      '#options' => OrderStatus::getOptionsList(),
     );
     $form['notify'] = array(
       '#type' => 'checkbox',
diff --git a/uc_order/src/Plugin/views/filter/Status.php b/uc_order/src/Plugin/views/filter/Status.php
index d0feb92..6700bdc 100644
--- a/uc_order/src/Plugin/views/filter/Status.php
+++ b/uc_order/src/Plugin/views/filter/Status.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\uc_order\Plugin\views\filter;
 
+use Drupal\uc_order\Entity\OrderStatus;
 use Drupal\views\Plugin\views\filter\InOperator;
 
 /**
@@ -24,7 +25,7 @@ class Status extends InOperator {
   public function getValueOptions() {
     if (!isset($this->valueOptions)) {
       $this->valueTitle = t('Order status');
-      $this->valueOptions = array_merge(array('_active' => t('Active')), uc_order_status_options_list());
+      $this->valueOptions = array_merge(['_active' => t('Active')], OrderStatus::getOptionsList());
     }
   }
 
diff --git a/uc_order/uc_order.module b/uc_order/uc_order.module
index b6fc9e0..000f7cb 100644
--- a/uc_order/uc_order.module
+++ b/uc_order/uc_order.module
@@ -737,17 +737,6 @@ function uc_order_state_default($state_id) {
 }
 
 /**
- * Returns an option list of order statuses.
- */
-function uc_order_status_options_list() {
-  $options = array();
-  foreach (OrderStatus::loadMultiple() as $status) {
-    $options[$status->id()] = $status->getName();
-  }
-  return $options;
-}
-
-/**
  * Returns the actions a user may perform on an order.
  *
  * @param $order
diff --git a/uc_order/uc_order.rules.inc b/uc_order/uc_order.rules.inc
index 1279b9f..d79314b 100644
--- a/uc_order/uc_order.rules.inc
+++ b/uc_order/uc_order.rules.inc
@@ -276,7 +276,7 @@ function uc_order_rules_action_info() {
       'order_status' => array(
         'type' => 'text',
         'label' => t('Status'),
-        'options list' => 'uc_order_status_options_list',
+        'options list' => 'Drupal\uc_order\Entity\OrderStatus::getOptionsList',
       ),
     ),
   );
diff --git a/uc_report/src/Form/CustomProductReport.php b/uc_report/src/Form/CustomProductReport.php
index af2120e..6669620 100644
--- a/uc_report/src/Form/CustomProductReport.php
+++ b/uc_report/src/Form/CustomProductReport.php
@@ -9,6 +9,7 @@ namespace Drupal\uc_report\Form;
 
 use Drupal\Core\Form\FormBase;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\uc_order\Entity\OrderStatus;
 
 class CustomProductReport extends FormBase {
 
@@ -45,7 +46,7 @@ class CustomProductReport extends FormBase {
       '#type' => 'checkboxes',
       '#title' => t('Order statuses'),
       '#description' => t('Only orders with selected statuses will be included in the report.'),
-      '#options' => uc_order_status_options_list(),
+      '#options' => OrderStatus::getOptionsList(),
       '#default_value' => $values['status'],
     );
 
diff --git a/uc_report/src/Form/CustomSalesReport.php b/uc_report/src/Form/CustomSalesReport.php
index a31a145..9597b07 100644
--- a/uc_report/src/Form/CustomSalesReport.php
+++ b/uc_report/src/Form/CustomSalesReport.php
@@ -9,6 +9,7 @@ namespace Drupal\uc_report\Form;
 
 use Drupal\Core\Form\FormBase;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\uc_order\Entity\OrderStatus;
 
 class CustomSalesReport extends FormBase {
 
@@ -62,7 +63,7 @@ class CustomSalesReport extends FormBase {
       '#type' => 'checkboxes',
       '#title' => t('Order statuses'),
       '#description' => t('Only orders with selected statuses will be included in the report.'),
-      '#options' => uc_order_status_options_list(),
+      '#options' => OrderStatus::getOptionsList(),
       '#default_value' => $statuses,
     );
 
diff --git a/uc_report/uc_report.module b/uc_report/uc_report.module
index fc18a78..08c16db 100644
--- a/uc_report/uc_report.module
+++ b/uc_report/uc_report.module
@@ -12,6 +12,7 @@
 
 use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\uc_order\Entity\OrderStatus;
 
 /**
  * The maximum number of records.
@@ -79,7 +80,7 @@ function uc_report_help($path, RouteMatchInterface $route_match) {
     if ($include_statuses) {
       $statuses = array();
       foreach (uc_report_order_statuses() as $status) {
-        $statuses[] = SafeMarkup::checkPlain(\Drupal\uc_order\Entity\OrderStatus::load($status)->name);
+        $statuses[] = SafeMarkup::checkPlain(OrderStatus::load($status)->name);
       }
       $order_statuses = t('<b>Order statuses used:</b> @statuses', array('@statuses' => implode(', ', array_filter($statuses))));
 
@@ -276,7 +277,7 @@ function uc_report_form_uc_store_settings_form_alter(&$form, &$form_state) {
     '#type' => 'checkboxes',
     '#title' => t('Reported statuses'),
     '#description' => t('Only orders with selected statuses will be included in reports.'),
-    '#options' => uc_order_status_options_list(),
+    '#options' => OrderStatus::getOptionsList(),
     '#default_value' => variable_get('uc_report_reported_statuses', array('completed')),
     '#multiple' => TRUE,
   );
@@ -287,7 +288,7 @@ function uc_report_form_uc_store_settings_form_alter(&$form, &$form_state) {
  */
 function uc_report_order_statuses() {
   $statuses = array();
-  foreach (\Drupal\uc_order\Entity\OrderStatus::loadMultiple() as $status) {
+  foreach (OrderStatus::loadMultiple() as $status) {
     $statuses[$status->id] = $status->name;
   }
   return $statuses;
diff --git a/uc_tax_report/src/Form/ParametersForm.php b/uc_tax_report/src/Form/ParametersForm.php
index fddb8a7..917c02b 100644
--- a/uc_tax_report/src/Form/ParametersForm.php
+++ b/uc_tax_report/src/Form/ParametersForm.php
@@ -10,7 +10,7 @@ namespace Drupal\uc_tax_report\Form;
 use Drupal\Core\Form\FormBase;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Url;
-
+use Drupal\uc_order\Entity\OrderStatus;
 
 /**
  * Form to customize parameters on the tax report.
@@ -62,7 +62,7 @@ class ParametersForm extends FormBase {
       '#type' => 'select',
       '#title' => t('Order statuses'),
       '#description' => t('Only orders with selected statuses will be included in the report.') . '<br />' . t('Hold Ctrl + click to select multiple statuses.'),
-      '#options' => uc_order_status_options_list(),
+      '#options' => OrderStatus::getOptionsList(),
       '#default_value' => $stat,
       '#multiple' => TRUE,
       '#size' => 5,