diff --git a/src/Plugin/ServiceDefinition/UnitIndex.php b/src/Plugin/ServiceDefinition/UnitIndex.php
index 8f1d874e0b7801e69af92559be44a126c20f6222..b919369c7105809f6d4801260eae2794a3189a1c 100644
--- a/src/Plugin/ServiceDefinition/UnitIndex.php
+++ b/src/Plugin/ServiceDefinition/UnitIndex.php
@@ -123,7 +123,7 @@ class UnitIndex extends ServiceDefinitionBase implements ContainerFactoryPluginI
       $types = [];
 
       foreach (bat_unit_get_types() as $type) {
-        $type_bundle = bat_type_bundle_load($type->bundle());
+        $type_bundle = bat_unit_type_bundle_load($type->bundle());
 
         if (isset($type_bundle->default_event_value_field_ids[$event_type]) &&
             !empty($type_bundle->default_event_value_field_ids[$event_type])) {
@@ -155,7 +155,7 @@ class UnitIndex extends ServiceDefinitionBase implements ContainerFactoryPluginI
       }
 
       foreach ($childrens as $type_id => $children) {
-        $unit_type = bat_type_load($type_id);
+        $unit_type = bat_unit_type_load($type_id);
 
         $units[] = [
           'id' => $unit_type->id(),