diff --git a/modules/opencase_cases/opencase_cases.module b/modules/opencase_cases/opencase_cases.module
index f614ef5..bf0837b 100644
--- a/modules/opencase_cases/opencase_cases.module
+++ b/modules/opencase_cases/opencase_cases.module
@@ -40,6 +40,16 @@ function opencase_cases_theme() {
       'render element' => 'content',
       'variables' => ['content' => NULL],
       'file' => 'oc_case.page.inc',
+    ],
+    'oc_actor_case_relation' => [
+      'render element' => 'elements',
+      'file' => 'oc_actor_case_relation.page.inc',
+      'template' => 'oc_actor_case_relation',
+    ],
+    'oc_actor_case_relation_content_add_list' => [
+      'render element' => 'content',
+      'variables' => ['content' => NULL],
+      'file' => 'oc_actor_case_relation.page.inc',
     ]
   ];
 }
@@ -138,24 +148,6 @@ function opencase_query_oc_activity_access_alter($query) {
   $query->condition('access_filter.actors_involved_target_id', $linked_actor_id);
 }
 
-/**
- * Implements hook_theme().
- */
-function opencase_cases_theme() {
-  $theme = [];
-  $theme['oc_actor_case_relation'] = [
-    'render element' => 'elements',
-    'file' => 'oc_actor_case_relation.page.inc',
-    'template' => 'oc_actor_case_relation',
-  ];
-  $theme['oc_actor_case_relation_content_add_list'] = [
-    'render element' => 'content',
-    'variables' => ['content' => NULL],
-    'file' => 'oc_actor_case_relation.page.inc',
-  ];
-  return $theme;
-}
-
 /**
  * Implements hook_theme_suggestions_HOOK().
  */
diff --git a/modules/opencase_entities/src/Entity/OCActor.php b/modules/opencase_entities/src/Entity/OCActor.php
index 7310bde..4e56686 100644
--- a/modules/opencase_entities/src/Entity/OCActor.php
+++ b/modules/opencase_entities/src/Entity/OCActor.php
@@ -122,7 +122,6 @@ class OCActor extends RevisionableContentEntityBase implements OCActorInterface
       if ($this->get('middle_names')->value) $name .= $this->get('middle_names')->value . ' ';
       $name .= $this->get('last_name')->value . ' ';
     }
-    $name .= '(' . $this->type->entity->label() . ')';
   
     $this->setName($name);