diff -u b/modules/ubercart/migration_templates/d6_ubercart_order_payment.yml b/modules/ubercart/migration_templates/d6_ubercart_order_payment.yml
--- b/modules/ubercart/migration_templates/d6_ubercart_order_payment.yml
+++ b/modules/ubercart/migration_templates/d6_ubercart_order_payment.yml
@@ -1,16 +1,16 @@
-id: d6_ubercart_payments
-label: Ubercart payments
+id: d6_ubercart_payment
+label: Ubercart payment
 migration_tags:
   - Drupal 6
   - Ubercart
 source:
-  plugin: d6_ubercart_payment_receipts
+  plugin: d6_ubercart_payment_receipt
 process:
   payment_id: receipt_id
   type: 'constants/type'
-  payment_gateway: 
+  payment_gateway:
     plugin: migration
-    migration: d6_ubercart_payment_gateways
+    migration: d6_ubercart_payment_gateway
     source: method
   order_id:
     plugin: migration
reverted:
--- b/modules/ubercart/migration_templates/d6_ubercart_payment_gateways.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-id: d6_ubercart_payment_gateways
-label: Ubercart payment gateways
-migration_tags:
-  - Drupal 6
-  - Ubercart
-source:
-  plugin: d6_ubercart_payment_gateways
-process:
-  id:
-    plugin: machine_name
-    source: method
-  label: method
-  plugin: 
-    plugin: default_value
-    default_value: manual
-  configuration:
-    plugin: entity_generate
-    source: configuration
-    value_key: id
-    entity_type: commerce_payment_gateway
-    default_values: 
-      display_label: Manual
-      mode: 'n/a'
-      payment_method_types: 
-        -credit_card
-destination:
-  plugin: 'entity:commerce_payment_gateway'
\ No newline at end of file
diff -u b/modules/ubercart/src/Plugin/migrate/source/d6/OrderPayment.php b/modules/ubercart/src/Plugin/migrate/source/d6/OrderPayment.php
--- b/modules/ubercart/src/Plugin/migrate/source/d6/OrderPayment.php
+++ b/modules/ubercart/src/Plugin/migrate/source/d6/OrderPayment.php
@@ -10,7 +10,7 @@
  * Provides migration source for orders.
  *
  * @MigrateSource(
- *   id = "d6_ubercart_payment_receipts",
+ *   id = "d6_ubercart_payment_receipt",
  *   source_module = "uc_payment"
  * )
  */
@@ -60,6 +60,8 @@
       'received' => $this->t('Date/time of payment was received'),
       'modified' => $this->t('Modified time'),
       'currency' => $this->t('Currency'),
+      'state' => $this->t('State of the order'),
+      'refund_amount' => $this->t('Refunded amount'),
     ];
     return $fields;
   }
@@ -119,7 +121,6 @@
       }
 
     }
-
     $row->setSourceProperty('state', $state);
     $row->setSourceProperty('data', serialize($data));
     return parent::prepareRow($row);
diff -u b/modules/ubercart/src/Plugin/migrate/source/d6/Payment.php b/modules/ubercart/src/Plugin/migrate/source/d6/Payment.php
--- b/modules/ubercart/src/Plugin/migrate/source/d6/Payment.php
+++ b/modules/ubercart/src/Plugin/migrate/source/d6/Payment.php
@@ -9,7 +9,7 @@
  * Drupal 6 ubercart payment gateway source.
  *
  * @MigrateSource(
- *   id = "d6_ubercart_payment_gateways",
+ *   id = "d6_ubercart_payment_gateway",
  *   source_module = "uc_payment"
  * )
  */
@@ -21,7 +21,7 @@
   public function query() {
     $query = $this->select('uc_payment_receipts', 'upr')
       ->distinct()
-      ->fields('upr', ['method']);
+      ->fields('upr', ['receipt_id', 'method']);
     return $query;
   }
 
@@ -40,17 +40,9 @@
   /**
    * {@inheritdoc}
    */
-  public function prepareRow(Row $row) {
-
-    return parent::prepareRow($row);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
   public function getIds() {
     return [
-      'method' => [
+      'receipt_id' => [
         'type' => 'string',
         'alias' => 'upr',
       ],
diff -u b/modules/ubercart/tests/src/Kernel/Plugin/migrate/source/d6/PaymentTest.php b/modules/ubercart/tests/src/Kernel/Plugin/migrate/source/d6/PaymentTest.php
--- b/modules/ubercart/tests/src/Kernel/Plugin/migrate/source/d6/PaymentTest.php
+++ b/modules/ubercart/tests/src/Kernel/Plugin/migrate/source/d6/PaymentTest.php
@@ -78,16 +78,7 @@
     $tests[0]['expected_data'] = [
       [
         'receipt_id' => '1',
-        'order_id' => '1',
         'method' => 'Check',
-        'amount' => '45.23',
-        'uid' => '1',
-        'data' => 'b:0;',
-        'comment' => 'Just what I wanted',
-        'received' => '1496231540',
-        'created' => '1496230540',
-        'modified' => '1496230640',
-        'currency' => 'NZD',
       ],
     ];
 
only in patch2:
unchanged:
--- /dev/null
+++ b/modules/ubercart/migration_templates/d6_ubercart_payment_gateway.yml
@@ -0,0 +1,27 @@
+id: d6_ubercart_payment_gateway
+label: Ubercart payment gateway
+migration_tags:
+  - Drupal 6
+  - Ubercart
+source:
+  plugin: d6_ubercart_payment_gateway
+process:
+  id:
+    plugin: machine_name
+    source: method
+  label: method
+  plugin: 
+    plugin: default_value
+    default_value: manual
+  configuration:
+    plugin: entity_generate
+    source: configuration
+    value_key: id
+    entity_type: commerce_payment_gateway
+    default_values: 
+      display_label: Manual
+      mode: 'n/a'
+      payment_method_types: 
+        - credit_card
+destination:
+  plugin: 'entity:commerce_payment_gateway'