diff --git a/views/relation.views.inc b/views/relation.views.inc
index 7cac26d..47b74d1 100644
--- a/views/relation.views.inc
+++ b/views/relation.views.inc
@@ -227,111 +227,111 @@ function relation_views_data_alter(&$data) {
     $target_index = $relation_type->directional ? 'target_bundles' : 'source_bundles';
     foreach ($relation_type->source_bundles as $source_bundle) {
       $source_bundle = explode(':', $source_bundle, 2);
-      $entity_type_left = $source_bundle[0];
-      $base_table_left = $entity_tables[$entity_type_left];
+      $entity_type_source = $source_bundle[0];
+      $base_table_source = $entity_tables[$entity_type_source];
       $t_arguments = array(
-        '@left' => $entity_type_left,
+        '@source' => $entity_type_source,
         '@relation_type_label' => $relation_type->label,
         '@relation_type_reverse_label' => $relation_type->reverse_label,
         '@arrow' => $relation_type->directional ? '→' : '↔',
       );
-      $data[$base_table_left]['relation_base_left_' . $type] = array(
-        'title' => t('Relation: @relation_type_label (@left → relation)', $t_arguments),
-        'help' => t('Provides a relationship from @left to the relation table via the relation @relation_type_label', $t_arguments),
+      $data[$base_table_source]['relation_base_source_' . $type] = array(
+        'title' => t('Relation: @relation_type_label (@source → relation)', $t_arguments),
+        'help' => t('Provides a relationship from @source to the relation table via the relation @relation_type_label', $t_arguments),
         'relationship' => array(
           // relation_handler_relationship::options_form() relies on this check_plain().
           'label' => check_plain($relation_type->label),
           'base' => 'relation',
           'base field' => 'rid',
-          'relationship field' => $entity_infos[$entity_type_left]['entity keys']['id'],
+          'relationship field' => $entity_infos[$entity_type_source]['entity keys']['id'],
           'handler' => 'relation_handler_relationship',
           'relation_type' => $type,
-          'entity_type_left' => $entity_type_left,
+          'entity_type_left' => $entity_type_source,
           'directional' => $relation_type->directional,
         ),
       );
       foreach ($relation_type->$target_index as $target_bundle) {
         $target_bundle = explode(':', $target_bundle, 2);
-        $entity_type_right = $target_bundle[0];
-        $base_table_right = $entity_tables[$entity_type_right];
-        $t_arguments['@right'] = $entity_type_right;
+        $entity_type_target = $target_bundle[0];
+        $base_table_target = $entity_tables[$entity_type_target];
+        $t_arguments['@target'] = $entity_type_target;
         // Provide forward relationships
-        $data[$base_table_left]['relation_' . $type . '_' . $entity_type_right] = array(
-          'title' => t('Relation: @relation_type_label (@left @arrow @right)', $t_arguments),
-          'help' => t('Provides a relationship from @left to @right via the relation @relation_type_label', $t_arguments),
+        $data[$base_table_source]['relation_' . $type . '_' . $entity_type_target] = array(
+          'title' => t('Relation: @relation_type_label (@source @arrow @target)', $t_arguments),
+          'help' => t('Provides a relationship from @source to @target via the relation @relation_type_label', $t_arguments),
           'relationship' => array(
             // relation_handler_relationship::options_form() relies on this check_plain().
             'label' => check_plain($relation_type->label),
-            'base' => $base_table_right,
-            'base field' => $entity_infos[$entity_type_right]['entity keys']['id'],
-            'relationship field' => $entity_infos[$entity_type_left]['entity keys']['id'],
+            'base' => $base_table_target,
+            'base field' => $entity_infos[$entity_type_target]['entity keys']['id'],
+            'relationship field' => $entity_infos[$entity_type_source]['entity keys']['id'],
             'handler' => 'relation_handler_relationship',
             'relation_type' => $type,
-            'entity_type_left' => $entity_type_left,
-            'entity_type_right' => $entity_type_right,
+            'entity_type_left' => $entity_type_source,
+            'entity_type_right' => $entity_type_target,
             'directional' => $relation_type->directional,
           ),
         );
-        $data['relation']['relation_base_' . $type . '_' . $entity_type_right] = array(
-          'title' => t('Relation: @relation_type_label (relation → @right)', $t_arguments),
-          'help' => t('Provides a relationship from the relation table to @right via the relation @relation_type_label', $t_arguments),
+        $data['relation']['relation_base_' . $type . '_' . $entity_type_target] = array(
+          'title' => t('Relation: @relation_type_label (relation → @target)', $t_arguments),
+          'help' => t('Provides a relationship from the relation table to @target via the relation @relation_type_label', $t_arguments),
           'relationship' => array(
             // relation_handler_relationship::options_form() relies on this check_plain().
             'label' => check_plain($relation_type->label),
-            'base' => $base_table_right,
-            'base field' => $entity_infos[$entity_type_right]['entity keys']['id'],
+            'base' => $base_table_target,
+            'base field' => $entity_infos[$entity_type_target]['entity keys']['id'],
             'relationship field' => 'rid',
             'handler' => 'relation_handler_relationship',
             'relation_type' => $type,
-            'entity_type_right' => $entity_type_right,
+            'entity_type_right' => $entity_type_target,
             'directional' => $relation_type->directional,
           ),
         );
         // Provide reverse relationships
-        if ($entity_type_right != $entity_type_left) {
-          $data[$base_table_right]['relation_' . $type . '_' . $entity_type_left] = array(
-            'title' => t('Relation: @relation_type_reverse_label (@right @arrow @left)', $t_arguments),
-            'help' => t('Provides a relationship from @right to @left via the relation @relation_type_reverse_label', $t_arguments),
+        if ($entity_type_target != $entity_type_source) {
+          $data[$base_table_target]['relation_' . $type . '_' . $entity_type_source] = array(
+            'title' => t('Relation: @relation_type_reverse_label (@target @arrow @source)', $t_arguments),
+            'help' => t('Provides a relationship from @target to @source via the relation @relation_type_reverse_label', $t_arguments),
             'relationship' => array(
               // relation_handler_relationship::options_form() relies on this check_plain().
               'label' => check_plain($relation_type->reverse_label),
-              'base' => $base_table_left,
-              'base field' => $entity_infos[$entity_type_left]['entity keys']['id'],
-              'relationship field' => $entity_infos[$entity_type_right]['entity keys']['id'],
+              'base' => $base_table_source,
+              'base field' => $entity_infos[$entity_type_source]['entity keys']['id'],
+              'relationship field' => $entity_infos[$entity_type_target]['entity keys']['id'],
               'handler' => 'relation_handler_relationship',
               'relation_type' => $type,
-              'entity_type_left' => $entity_type_right,
-              'entity_type_right' => $entity_type_left,
+              'entity_type_left' => $entity_type_target,
+              'entity_type_right' => $entity_type_source,
               'directional' => $relation_type->directional,
             ),
           );
-          $data[$base_table_right]['relation_base_right_' . $type] = array(
-            'title' => t('Relation: @relation_type_reverse_label (@right → relation)', $t_arguments),
-            'help' => t('Provides a relationship from @right to the relation table via the relation @relation_type_reverse_label. Usually only needed to access the fields of the relation itself.', $t_arguments),
+          $data[$base_table_target]['relation_base_target_' . $type] = array(
+            'title' => t('Relation: @relation_type_reverse_label (@target → relation)', $t_arguments),
+            'help' => t('Provides a relationship from @target to the relation table via the relation @relation_type_reverse_label. Usually only needed to access the fields of the relation itself.', $t_arguments),
             'relationship' => array(
               // relation_handler_relationship::options_form() relies on this check_plain().
               'label' => check_plain($relation_type->reverse_label),
               'base' => 'relation',
               'base field' => 'rid',
-              'relationship field' => $entity_infos[$entity_type_right]['entity keys']['id'],
+              'relationship field' => $entity_infos[$entity_type_target]['entity keys']['id'],
               'handler' => 'relation_handler_relationship',
               'relation_type' => $type,
-              'entity_type_right' => $entity_type_right,
+              'entity_type_left' => $entity_type_target,
               'directional' => $relation_type->directional,
             ),
           );
-          $data['relation']['relation_base_' . $type . '_' . $entity_type_left] = array(
-            'title' => t('Relation: @relation_type_reverse_label (relation → @left)', $t_arguments),
-            'help' => t('Provides a relationship from the relation table to @left via the relation @relation_type_reverse_label', $t_arguments),
+          $data['relation']['relation_base_' . $type . '_' . $entity_type_source] = array(
+            'title' => t('Relation: @relation_type_reverse_label (relation → @source)', $t_arguments),
+            'help' => t('Provides a relationship from the relation table to @source via the relation @relation_type_reverse_label', $t_arguments),
             'relationship' => array(
               // relation_handler_relationship::options_form() relies on this check_plain().
               'label' => check_plain($relation_type->reverse_label),
-              'base' => $base_table_left,
-              'base field' => $entity_infos[$entity_type_left]['entity keys']['id'],
+              'base' => $base_table_source,
+              'base field' => $entity_infos[$entity_type_source]['entity keys']['id'],
               'relationship field' => 'rid',
               'handler' => 'relation_handler_relationship',
               'relation_type' => $type,
-              'entity_type_left' => $entity_type_left,
+              'entity_type_right' => $entity_type_source,
               'directional' => $relation_type->directional,
             ),
           );