diff --git a/commerce_reports.plugin_type.yml b/commerce_reports.plugin_type.yml
index ee03901..775a53c 100644
--- a/commerce_reports.plugin_type.yml
+++ b/commerce_reports.plugin_type.yml
@@ -1,5 +1,5 @@
-commerce_reports.commerce_order_report_type:
+commerce_reports.commerce_report_type:
   label: Order report type
   provider: commerce_reports
-  plugin_manager_service_id: plugin.manager.commerce_order_report_type
+  plugin_manager_service_id: plugin.manager.commerce_report_type
   plugin_definition_decorator_class: Drupal\plugin\PluginDefinition\ArrayPluginDefinitionDecorator
\ No newline at end of file
diff --git a/commerce_reports.services.yml b/commerce_reports.services.yml
index d223128..3346383 100644
--- a/commerce_reports.services.yml
+++ b/commerce_reports.services.yml
@@ -1,10 +1,10 @@
 services:
   commerce_reports.order_placed_subscriber:
     class: Drupal\commerce_reports\EventSubscriber\OrderPlacedEventSubscriber
-    arguments: ['@entity_type.manager', '@state', '@plugin.manager.commerce_order_report_type']
+    arguments: ['@entity_type.manager', '@state', '@plugin.manager.commerce_report_type']
     tags:
       - { name: event_subscriber }
 
-  plugin.manager.commerce_order_report_type:
-      class: Drupal\commerce_reports\OrderReportTypeManager
+  plugin.manager.commerce_report_type:
+      class: Drupal\commerce_reports\ReportTypeManager
       parent: default_plugin_manager
\ No newline at end of file
diff --git a/src/Annotation/CommerceOrderReportType.php b/src/Annotation/CommerceOrderReportType.php
deleted file mode 100644
index df2403b..0000000
--- a/src/Annotation/CommerceOrderReportType.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-namespace Drupal\commerce_reports\Annotation;
-
-use Drupal\Component\Annotation\Plugin;
-
-/**
- * Defines the order report type plugin annotation object.
- *
- * Plugin namespace: Plugin\Commerce\OrderReportType.
- *
- * @see plugin_api
- *
- * @Annotation
- */
-class CommerceOrderReportType extends Plugin {
-
-  /**
-   * The plugin ID.
-   *
-   * @var string
-   */
-  public $id;
-
-  /**
-   * The order report type label.
-   *
-   * @ingroup plugin_translatable
-   *
-   * @var \Drupal\Core\Annotation\Translation
-   */
-  public $label;
-
-  /**
-   * The order report type create label.
-   *
-   * @ingroup plugin_translatable
-   *
-   * @var \Drupal\Core\Annotation\Translation
-   */
-  public $create_label;
-
-}
diff --git a/src/Entity/OrderReport.php b/src/Entity/OrderReport.php
index 0b93b44..3e4810a 100644
--- a/src/Entity/OrderReport.php
+++ b/src/Entity/OrderReport.php
@@ -22,11 +22,11 @@
  *     plural = "@count order reports",
  *   ),
  *   bundle_label = @Translation("Order report type"),
- *   bundle_plugin_type = "commerce_order_report_type",
+ *   bundle_plugin_type = "commerce_report_type",
  *   handlers = {
  *     "access" = "Drupal\commerce\EntityAccessControlHandler",
  *     "permission_provider" = "Drupal\commerce\EntityPermissionProvider",
- *     "list_builder" = "Drupal\commerce_reports\OrderReportsListBuilder",
+ *     "list_builder" = "Drupal\commerce_reports\ReportsListBuilder",
  *     "storage" = "Drupal\Core\Entity\Sql\SqlContentEntityStorage",
  *     "views_data" = "Drupal\views\EntityViewsData",
  *     "route_provider" = {
diff --git a/src/EventSubscriber/OrderPlacedEventSubscriber.php b/src/EventSubscriber/OrderPlacedEventSubscriber.php
index f3073a8..f4ef55a 100644
--- a/src/EventSubscriber/OrderPlacedEventSubscriber.php
+++ b/src/EventSubscriber/OrderPlacedEventSubscriber.php
@@ -2,8 +2,8 @@
 
 namespace Drupal\commerce_reports\EventSubscriber;
 
-use Drupal\commerce_reports\Plugin\Commerce\OrderReportType\OrderReportTypeInterface;
-use Drupal\commerce_reports\OrderReportTypeManager;
+use Drupal\commerce_reports\Plugin\Commerce\ReportType\OrderReportTypeInterface;
+use Drupal\commerce_reports\ReportTypeManager;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\State\StateInterface;
 use Drupal\state_machine\Event\WorkflowTransitionEvent;
@@ -45,7 +45,7 @@ class OrderPlacedEventSubscriber implements EventSubscriberInterface {
    * @param \Drupal\commerce_payment\OrderReportTypeManager
    *   The order report type manager.
    */
-  public function __construct(EntityTypeManagerInterface $entity_type_manager, StateInterface $state, OrderReportTypeManager $orderReportTypeManager) {
+  public function __construct(EntityTypeManagerInterface $entity_type_manager, StateInterface $state, ReportTypeManager $orderReportTypeManager) {
     $this->orderStorage = $entity_type_manager->getStorage('commerce_order');
     $this->state = $state;
     $this->orderReportTypeManager = $orderReportTypeManager;
diff --git a/src/ReportsListBuilder.php b/src/ReportsListBuilder.php
index 8829f08..32384b7 100644
--- a/src/ReportsListBuilder.php
+++ b/src/ReportsListBuilder.php
@@ -8,7 +8,7 @@
 /**
  * Builds a listing of the order report entities.
  */
-class OrderReportsListBuilder extends EntityListBuilder {
+class ReportsListBuilder extends EntityListBuilder {
 
   /**
    * {@inheritdoc}