diff --git a/payment/payment.classes.inc b/payment/payment.classes.inc
index 2406f65..ce6e65a 100644
--- a/payment/payment.classes.inc
+++ b/payment/payment.classes.inc
@@ -25,20 +25,20 @@ class PaymentCommon {
 class Payment extends PaymentCommon {
 
   /**
-   * The machine name of the 'context' that created this Payment, such as the
-   * webshop.
+   * The machine name of the context that created this Payment, such as the
+   * webshop module.
    *
    * @var string
    */
-  public $caller = '';
+  public $context = '';
 
   /**
-   * Information about this payment that is specific to the 'context' that
-   * created it, such as the webshop.
+   * Information about this payment that is specific to the context that
+   * created it, such as the webshop module.
    *
    * @var array
    */
-  public $caller_data = array();
+  public $context_data = array();
 
   /**
    * The Unix datetime the payment was created.
@@ -68,7 +68,7 @@ class Payment extends PaymentCommon {
    *   The Payment object.
    * The callback does not need to return anything and is free to redirect the
    * user or display something.
-   * Use Payment::caller_data to pass on arbitrary data to the finish callback.
+   * Use Payment::context_data to pass on arbitrary data to the finish callback.
    *
    * @var string
    */
diff --git a/payment/payment.install b/payment/payment.install
index 17efff8..6390332 100644
--- a/payment/payment.install
+++ b/payment/payment.install
@@ -58,11 +58,11 @@ function payment_schema() {
   );
   $schema['payment'] = array(
     'fields' => array(
-      'caller' => array(
+      'context' => array(
         'type' => 'varchar',
         'length' => 255,
       ),
-      'caller_data' => array(
+      'context_data' => array(
         'type' => 'blob',
         'size' => 'big',
         'serialize' => TRUE,
diff --git a/payment/payment.module b/payment/payment.module
index 6c62dda..8d1ea30 100644
--- a/payment/payment.module
+++ b/payment/payment.module
@@ -448,11 +448,11 @@ function payment_entity_info() {
  */
 function payment_entity_property_info() {
   // Payment.
-  $properties['payment']['properties']['caller'] = array(
-    'description' => t("The machine-readable name of the 'context' that created the payment."),
-    'label' => t('Caller'),
+  $properties['payment']['properties']['context'] = array(
+    'description' => t("The machine-readable name of the context that created the payment."),
+    'label' => t('Context'),
     'required' => TRUE,
-    'schema field' => 'caller',
+    'schema field' => 'context',
   );
   $properties['payment']['properties']['currency_code'] = array(
     'description' => t('A three-letter ISO 4217 currency code.'),
diff --git a/paymentreference/paymentreference.module b/paymentreference/paymentreference.module
index 7da8fc3..0b04314 100644
--- a/paymentreference/paymentreference.module
+++ b/paymentreference/paymentreference.module
@@ -345,8 +345,8 @@ function paymentreference_field_insert($entity_type, $entity, array $field, arra
  * Implements hook_ENTITY_TYPE_ACTION().
  */
 function paymentreference_payment_insert(Payment $payment) {
-  if (!empty($payment->caller_data['paymentreference'])) {
-    paymentreference_insert($payment->caller_data['entity_type'], $payment->caller_data['bundle'], $payment->caller_data['field_name'], $payment->pid);
+  if (!empty($payment->context_data['paymentreference'])) {
+    paymentreference_insert($payment->context_data['entity_type'], $payment->context_data['bundle'], $payment->context_data['field_name'], $payment->pid);
   }
 }
 
@@ -460,7 +460,7 @@ function paymentreference_instance_title(array $instance) {
  */
 function paymentreference_page(array $instance) {
   $payment = new Payment(array(
-    'caller_data' => array(
+    'context_data' => array(
       'paymentreference' => TRUE,
       'entity_type' => $instance['entity_type'],
       'bundle' => $instance['bundle'],