diff --git a/Civi/DataProcessor/FieldOutputHandler/CaseRolesFieldOutputHandler.php b/Civi/DataProcessor/FieldOutputHandler/CaseRolesFieldOutputHandler.php
index 2f9b9d330ad5f295abfd5cd14fe1ecdf20fd3b06..5f051529d7bc8ff729eaaa7f88d346bd23394866 100644
--- a/Civi/DataProcessor/FieldOutputHandler/CaseRolesFieldOutputHandler.php
+++ b/Civi/DataProcessor/FieldOutputHandler/CaseRolesFieldOutputHandler.php
@@ -74,7 +74,10 @@ class CaseRolesFieldOutputHandler extends AbstractFieldOutputHandler {
     $this->outputFieldSpecification = new FieldSpecification($this->caseIdField->name, 'String', $title, null, $alias);
 
     if (isset($configuration['relationship_types']) && is_array($configuration['relationship_types'])) {
-      $this->relationship_type_ids = $configuration['relationship_types'];
+      $this->relationship_type_ids = array();
+      foreach($configuration['relationship_types'] as $rel_type) {
+        $this->relationship_type_ids[] = civicrm_api3('RelationshipType', 'getvalue', array('return' => 'id', 'name_a_b' => $rel_type));
+      };
     }
     if (isset($configuration['show_label'])) {
       $this->show_label = $configuration['show_label'];
@@ -148,7 +151,7 @@ class CaseRolesFieldOutputHandler extends AbstractFieldOutputHandler {
     $relationshipTypeApi = civicrm_api3('RelationshipType', 'get', array('is_active' => 1, 'options' => array('limit' => 0)));
     $relationshipTypes = array();
     foreach($relationshipTypeApi['values'] as $relationship_type) {
-      $relationshipTypes[$relationship_type['id']] = $relationship_type['label_a_b'];
+      $relationshipTypes[$relationship_type['name_a_b']] = $relationship_type['label_a_b'];
     }
 
     $form->add('select', 'case_id_field', E::ts('Case ID Field'), $fieldSelect, true, array(
diff --git a/Civi/DataProcessor/FilterHandler/CaseRoleFilter.php b/Civi/DataProcessor/FilterHandler/CaseRoleFilter.php
index a0877d7b6aa961be84320266d65b507c96893cab..ec3fc3e11104447ad50da4aabbf7365d5b7eb463 100644
--- a/Civi/DataProcessor/FilterHandler/CaseRoleFilter.php
+++ b/Civi/DataProcessor/FilterHandler/CaseRoleFilter.php
@@ -60,7 +60,10 @@ class CaseRoleFilter extends AbstractFilterHandler {
     }
 
     if (isset($configuration['relationship_types']) && is_array($configuration['relationship_types'])) {
-      $this->relationship_type_ids = $configuration['relationship_types'];
+      $this->relationship_type_ids = array();
+      foreach($configuration['relationship_types'] as $rel_type) {
+        $this->relationship_type_ids[] = civicrm_api3('RelationshipType', 'getvalue', array('return' => 'id', 'name_a_b' => $rel_type));
+      };
     }
   }
 
@@ -128,7 +131,7 @@ class CaseRoleFilter extends AbstractFilterHandler {
     $relationshipTypeApi = civicrm_api3('RelationshipType', 'get', array('is_active' => 1, 'options' => array('limit' => 0)));
     $relationshipTypes = array();
     foreach($relationshipTypeApi['values'] as $relationship_type) {
-      $relationshipTypes[$relationship_type['id']] = $relationship_type['label_a_b'];
+      $relationshipTypes[$relationship_type['name_a_b']] = $relationship_type['label_a_b'];
     }
 
     $form->add('select', 'case_id_field', E::ts('Case ID Field'), $fieldSelect, true, array(