diff --git a/resources/src/main/resources/business-model/Процессы/process-instance-list.page b/resources/src/main/resources/business-model/Процессы/process-instance-list.page
index 67f67e9..e4220e9 100644
--- a/resources/src/main/resources/business-model/Процессы/process-instance-list.page
+++ b/resources/src/main/resources/business-model/Процессы/process-instance-list.page
@@ -103,7 +103,7 @@
                             <key>service</key>
                             <value>
 <implRef type="JAVA">
-    <className>BpmnDefaultValueLoaderServiceImpl</className>
+    <className>DefaultValueLoaderServiceImpl</className>
     <packageName>service.loading</packageName>
 </implRef>
                             </value>
diff --git a/resources/src/main/resources/business-model/Процессы/process-instance.page b/resources/src/main/resources/business-model/Процессы/process-instance.page
index 3e2058a..27842dd 100644
--- a/resources/src/main/resources/business-model/Процессы/process-instance.page
+++ b/resources/src/main/resources/business-model/Процессы/process-instance.page
@@ -23,7 +23,7 @@
                     <key>service</key>
                     <value>
                         <implRef type="JAVA">
-                            <className>BpmnDefaultValueLoaderServiceImpl</className>
+                            <className>DefaultValueLoaderServiceImpl</className>
                             <packageName>service.loading</packageName>
                         </implRef>
                     </value>
@@ -60,7 +60,7 @@
                         <key>service</key>
                         <value>
                             <implRef type="JAVA">
-<className>BpmnDefaultValueLoaderServiceImpl</className>
+<className>DefaultValueLoaderServiceImpl</className>
 <packageName>service.loading</packageName>
                             </implRef>
                         </value>
@@ -83,7 +83,7 @@
                             <key>service</key>
                             <value>
 <implRef type="JAVA">
-    <className>BpmnDefaultValueLoaderServiceImpl</className>
+    <className>DefaultValueLoaderServiceImpl</className>
     <packageName>service.loading</packageName>
 </implRef>
                             </value>
@@ -106,7 +106,7 @@
 <key>service</key>
 <value>
     <implRef type="JAVA">
-        <className>BpmnDefaultValueLoaderServiceImpl</className>
+        <className>DefaultValueLoaderServiceImpl</className>
         <packageName>service.loading</packageName>
     </implRef>
 </value>
@@ -158,7 +158,7 @@
                             <key>service</key>
                             <value>
 <implRef type="JAVA">
-    <className>BpmnDefaultValueLoaderServiceImpl</className>
+    <className>DefaultValueLoaderServiceImpl</className>
     <packageName>service.loading</packageName>
 </implRef>
                             </value>
@@ -218,7 +218,7 @@
                             <key>service</key>
                             <value>
 <implRef type="JAVA">
-    <className>BpmnDefaultValueLoaderServiceImpl</className>
+    <className>DefaultValueLoaderServiceImpl</className>
     <packageName>service.loading</packageName>
 </implRef>
                             </value>
diff --git a/resources/src/main/resources/business-model/Управление пользователями/Организация редактирование(создание).page b/resources/src/main/resources/business-model/Управление пользователями/Организация редактирование(создание).page
index 9688c51..459c218 100644
--- a/resources/src/main/resources/business-model/Управление пользователями/Организация редактирование(создание).page	
+++ b/resources/src/main/resources/business-model/Управление пользователями/Организация редактирование(создание).page	
@@ -23,7 +23,7 @@
                     <key>service</key>
                     <value>
                         <implRef type="JAVA">
-                            <className>BpmnDefaultValueLoaderServiceImpl</className>
+                            <className>DefaultValueLoaderServiceImpl</className>
                             <packageName>service.loading</packageName>
                         </implRef>
                     </value>
@@ -59,7 +59,7 @@
                         <key>service</key>
                         <value>
                             <implRef type="JAVA">
-<className>BpmnDefaultValueLoaderServiceImpl</className>
+<className>DefaultValueLoaderServiceImpl</className>
 <packageName>service.loading</packageName>
                             </implRef>
                         </value>
@@ -82,7 +82,7 @@
                             <key>service</key>
                             <value>
 <implRef type="JAVA">
-    <className>BpmnDefaultValueLoaderServiceImpl</className>
+    <className>DefaultValueLoaderServiceImpl</className>
     <packageName>service.loading</packageName>
 </implRef>
                             </value>
@@ -105,7 +105,7 @@
 <key>service</key>
 <value>
     <implRef type="JAVA">
-        <className>BpmnDefaultValueLoaderServiceImpl</className>
+        <className>DefaultValueLoaderServiceImpl</className>
         <packageName>service.loading</packageName>
     </implRef>
 </value>
@@ -168,7 +168,7 @@
 <key>service</key>
 <value>
     <implRef type="JAVA">
-        <className>BpmnDefaultValueLoaderServiceImpl</className>
+        <className>DefaultValueLoaderServiceImpl</className>
         <packageName>service.loading</packageName>
     </implRef>
 </value>
@@ -194,7 +194,7 @@
                         <key>service</key>
                         <value>
                             <implRef type="JAVA">
-<className>BpmnDefaultValueLoaderServiceImpl</className>
+<className>DefaultValueLoaderServiceImpl</className>
 <packageName>service.loading</packageName>
                             </implRef>
                         </value>
diff --git a/resources/src/main/resources/business-model/Управление пользователями/Роли редактирование (создание).page b/resources/src/main/resources/business-model/Управление пользователями/Роли редактирование (создание).page
index 3c2c01e..540dbe7 100644
--- a/resources/src/main/resources/business-model/Управление пользователями/Роли редактирование (создание).page	
+++ b/resources/src/main/resources/business-model/Управление пользователями/Роли редактирование (создание).page	
@@ -23,7 +23,7 @@
                     <key>service</key>
                     <value>
                         <implRef type="JAVA">
-                            <className>BpmnDefaultValueLoaderServiceImpl</className>
+                            <className>DefaultValueLoaderServiceImpl</className>
                             <packageName>service.loading</packageName>
                         </implRef>
                     </value>
@@ -60,7 +60,7 @@
                         <key>service</key>
                         <value>
                             <implRef type="JAVA">
-<className>BpmnDefaultValueLoaderServiceImpl</className>
+<className>DefaultValueLoaderServiceImpl</className>
 <packageName>service.loading</packageName>
                             </implRef>
                         </value>
@@ -85,7 +85,7 @@
                             <key>service</key>
                             <value>
 <implRef type="JAVA">
-    <className>BpmnDefaultValueLoaderServiceImpl</className>
+    <className>DefaultValueLoaderServiceImpl</className>
     <packageName>service.loading</packageName>
 </implRef>
                             </value>
@@ -108,7 +108,7 @@
 <key>service</key>
 <value>
     <implRef type="JAVA">
-        <className>BpmnDefaultValueLoaderServiceImpl</className>
+        <className>DefaultValueLoaderServiceImpl</className>
         <packageName>service.loading</packageName>
     </implRef>
 </value>
@@ -170,7 +170,7 @@
 <key>service</key>
 <value>
     <implRef type="JAVA">
-        <className>BpmnDefaultValueLoaderServiceImpl</className>
+        <className>DefaultValueLoaderServiceImpl</className>
         <packageName>service.loading</packageName>
     </implRef>
 </value>
@@ -196,7 +196,7 @@
                         <key>service</key>
                         <value>
                             <implRef type="JAVA">
-<className>BpmnDefaultValueLoaderServiceImpl</className>
+<className>DefaultValueLoaderServiceImpl</className>
 <packageName>service.loading</packageName>
                             </implRef>
                         </value>
diff --git a/resources/src/main/resources/overrides/0f470331-dfb0-4f10-b748-c9a7f33d31d9.component.override b/resources/src/main/resources/overrides/0f470331-dfb0-4f10-b748-c9a7f33d31d9.component.override
index fce5129..52e8fd5 100644
--- a/resources/src/main/resources/overrides/0f470331-dfb0-4f10-b748-c9a7f33d31d9.component.override
+++ b/resources/src/main/resources/overrides/0f470331-dfb0-4f10-b748-c9a7f33d31d9.component.override
@@ -25,7 +25,7 @@
                     <key>service</key>
                     <value>
                         <implRef type="JAVA">
-                            <className>BpmnDefaultValueLoaderServiceImpl</className>
+                            <className>DefaultValueLoaderServiceImpl</className>
                             <packageName>service.loading</packageName>
                         </implRef>
                     </value>
@@ -102,7 +102,7 @@
                         <key>service</key>
                         <value>
                             <implRef type="JAVA">
-<className>BpmnDefaultValueLoaderServiceImpl</className>
+<className>DefaultValueLoaderServiceImpl</className>
 <packageName>service.loading</packageName>
                             </implRef>
                         </value>
@@ -145,7 +145,7 @@
                             <key>service</key>
                             <value>
 <implRef type="JAVA">
-    <className>BpmnDefaultValueLoaderServiceImpl</className>
+    <className>DefaultValueLoaderServiceImpl</className>
     <packageName>service.loading</packageName>
 </implRef>
                             </value>
@@ -177,7 +177,7 @@
 <key>service</key>
 <value>
     <implRef type="JAVA">
-        <className>BpmnDefaultValueLoaderServiceImpl</className>
+        <className>DefaultValueLoaderServiceImpl</className>
         <packageName>service.loading</packageName>
     </implRef>
 </value>
@@ -222,7 +222,7 @@
     <key>service</key>
     <value>
         <implRef type="JAVA">
-            <className>BpmnDefaultValueLoaderServiceImpl</className>
+            <className>DefaultValueLoaderServiceImpl</className>
             <packageName>service.loading</packageName>
         </implRef>
     </value>
@@ -508,7 +508,7 @@
     <key>service</key>
     <value>
         <implRef type="JAVA">
-            <className>BpmnDefaultValueLoaderServiceImpl</className>
+            <className>DefaultValueLoaderServiceImpl</className>
             <packageName>service.loading</packageName>
         </implRef>
     </value>
@@ -1004,7 +1004,7 @@
                         <key>service</key>
                         <value>
                             <implRef type="JAVA">
-<className>BpmnDefaultValueLoaderServiceImpl</className>
+<className>DefaultValueLoaderServiceImpl</className>
 <packageName>service.loading</packageName>
                             </implRef>
                         </value>
@@ -1064,7 +1064,7 @@
                             <key>service</key>
                             <value>
 <implRef type="JAVA">
-    <className>BpmnDefaultValueLoaderServiceImpl</className>
+    <className>DefaultValueLoaderServiceImpl</className>
     <packageName>service.loading</packageName>
 </implRef>
                             </value>
@@ -1109,7 +1109,7 @@
 <key>service</key>
 <value>
     <implRef type="JAVA">
-        <className>BpmnDefaultValueLoaderServiceImpl</className>
+        <className>DefaultValueLoaderServiceImpl</className>
         <packageName>service.loading</packageName>
     </implRef>
 </value>
@@ -1364,7 +1364,7 @@
 <key>service</key>
 <value>
     <implRef type="JAVA">
-        <className>BpmnDefaultValueLoaderServiceImpl</className>
+        <className>DefaultValueLoaderServiceImpl</className>
         <packageName>service.loading</packageName>
     </implRef>
 </value>
@@ -1547,7 +1547,7 @@
                         <key>service</key>
                         <value>
                             <implRef type="JAVA">
-<className>BpmnDefaultValueLoaderServiceImpl</className>
+<className>DefaultValueLoaderServiceImpl</className>
 <packageName>service.loading</packageName>
                             </implRef>
                         </value>
@@ -1592,7 +1592,7 @@
                             <key>service</key>
                             <value>
 <implRef type="JAVA">
-    <className>BpmnDefaultValueLoaderServiceImpl</className>
+    <className>DefaultValueLoaderServiceImpl</className>
     <packageName>service.loading</packageName>
 </implRef>
                             </value>
@@ -2003,7 +2003,7 @@
                             <key>service</key>
                             <value>
 <implRef type="JAVA">
-    <className>BpmnDefaultValueLoaderServiceImpl</className>
+    <className>DefaultValueLoaderServiceImpl</className>
     <packageName>service.loading</packageName>
 </implRef>
                             </value>
@@ -2545,7 +2545,7 @@
                         <key>service</key>
                         <value>
                             <implRef type="JAVA">
-<className>BpmnDefaultValueLoaderServiceImpl</className>
+<className>DefaultValueLoaderServiceImpl</className>
 <packageName>service.loading</packageName>
                             </implRef>
                         </value>
diff --git a/resources/src/main/resources/overrides/0f8d0a8b-8014-4367-8ff3-7f049c284978.component.override b/resources/src/main/resources/overrides/0f8d0a8b-8014-4367-8ff3-7f049c284978.component.override
index 4f26889..9ce1385 100644
--- a/resources/src/main/resources/overrides/0f8d0a8b-8014-4367-8ff3-7f049c284978.component.override
+++ b/resources/src/main/resources/overrides/0f8d0a8b-8014-4367-8ff3-7f049c284978.component.override
@@ -25,7 +25,7 @@
                     <key>service</key>
                     <value>
                         <implRef type="JAVA">
-                            <className>BpmnDefaultValueLoaderServiceImpl</className>
+                            <className>DefaultValueLoaderServiceImpl</className>
                             <packageName>service.loading</packageName>
                         </implRef>
                     </value>
@@ -100,7 +100,7 @@
                         <key>service</key>
                         <value>
                             <implRef type="JAVA">
-<className>BpmnDefaultValueLoaderServiceImpl</className>
+<className>DefaultValueLoaderServiceImpl</className>
 <packageName>service.loading</packageName>
                             </implRef>
                         </value>
@@ -450,7 +450,7 @@
                         <key>service</key>
                         <value>
                             <implRef type="JAVA">
-<className>BpmnDefaultValueLoaderServiceImpl</className>
+<className>DefaultValueLoaderServiceImpl</className>
 <packageName>service.loading</packageName>
                             </implRef>
                         </value>
diff --git a/resources/src/main/resources/overrides/38c2de2f-c5dd-413e-babf-ce54cb4e5279.component.override b/resources/src/main/resources/overrides/38c2de2f-c5dd-413e-babf-ce54cb4e5279.component.override
index 1425bf1..19ec62f 100644
--- a/resources/src/main/resources/overrides/38c2de2f-c5dd-413e-babf-ce54cb4e5279.component.override
+++ b/resources/src/main/resources/overrides/38c2de2f-c5dd-413e-babf-ce54cb4e5279.component.override
@@ -25,7 +25,7 @@
                     <key>service</key>
                     <value>
                         <implRef type="JAVA">
-                            <className>BpmnDefaultValueLoaderServiceImpl</className>
+                            <className>DefaultValueLoaderServiceImpl</className>
                             <packageName>service.loading</packageName>
                         </implRef>
                     </value>
@@ -100,7 +100,7 @@
                         <key>service</key>
                         <value>
                             <implRef type="JAVA">
-<className>BpmnDefaultValueLoaderServiceImpl</className>
+<className>DefaultValueLoaderServiceImpl</className>
 <packageName>service.loading</packageName>
                             </implRef>
                         </value>
@@ -447,7 +447,7 @@
                         <key>service</key>
                         <value>
                             <implRef type="JAVA">
-<className>BpmnDefaultValueLoaderServiceImpl</className>
+<className>DefaultValueLoaderServiceImpl</className>
 <packageName>service.loading</packageName>
                             </implRef>
                         </value>
diff --git a/resources/src/main/resources/overrides/4e314e88-02d6-4b0e-b7a7-15a36bdeb682.component.override b/resources/src/main/resources/overrides/4e314e88-02d6-4b0e-b7a7-15a36bdeb682.component.override
index 8b66fd0..95a6f2d 100644
--- a/resources/src/main/resources/overrides/4e314e88-02d6-4b0e-b7a7-15a36bdeb682.component.override
+++ b/resources/src/main/resources/overrides/4e314e88-02d6-4b0e-b7a7-15a36bdeb682.component.override
@@ -42,7 +42,7 @@
                     <key>service</key>
                     <value>
                         <implRef type="JAVA">
-                            <className>BpmnDefaultValueLoaderServiceImpl</className>
+                            <className>DefaultValueLoaderServiceImpl</className>
                             <packageName>service.loading</packageName>
                         </implRef>
                     </value>
@@ -215,7 +215,7 @@
                         <key>service</key>
                         <value>
                             <implRef type="JAVA">
-<className>BpmnDefaultValueLoaderServiceImpl</className>
+<className>DefaultValueLoaderServiceImpl</className>
 <packageName>service.loading</packageName>
                             </implRef>
                         </value>
@@ -269,7 +269,7 @@
                             <key>service</key>
                             <value>
 <implRef type="JAVA">
-    <className>BpmnDefaultValueLoaderServiceImpl</className>
+    <className>DefaultValueLoaderServiceImpl</className>
     <packageName>service.loading</packageName>
 </implRef>
                             </value>
@@ -427,7 +427,7 @@
 <key>service</key>
 <value>
     <implRef type="JAVA">
-        <className>BpmnDefaultValueLoaderServiceImpl</className>
+        <className>DefaultValueLoaderServiceImpl</className>
         <packageName>service.loading</packageName>
     </implRef>
 </value>
@@ -866,7 +866,7 @@
                             <key>service</key>
                             <value>
 <implRef type="JAVA">
-    <className>BpmnDefaultValueLoaderServiceImpl</className>
+    <className>DefaultValueLoaderServiceImpl</className>
     <packageName>service.loading</packageName>
 </implRef>
                             </value>
@@ -895,7 +895,7 @@
 <key>service</key>
 <value>
     <implRef type="JAVA">
-        <className>BpmnDefaultValueLoaderServiceImpl</className>
+        <className>DefaultValueLoaderServiceImpl</className>
         <packageName>service.loading</packageName>
     </implRef>
 </value>
diff --git a/resources/src/main/resources/overrides/5cc0e63d-f697-47a8-a9dc-3170f1a99721.component.override b/resources/src/main/resources/overrides/5cc0e63d-f697-47a8-a9dc-3170f1a99721.component.override
index 65018e7..3105de5 100644
--- a/resources/src/main/resources/overrides/5cc0e63d-f697-47a8-a9dc-3170f1a99721.component.override
+++ b/resources/src/main/resources/overrides/5cc0e63d-f697-47a8-a9dc-3170f1a99721.component.override
@@ -25,7 +25,7 @@
                     <key>service</key>
                     <value>
                         <implRef type="JAVA">
-                            <className>BpmnDefaultValueLoaderServiceImpl</className>
+                            <className>DefaultValueLoaderServiceImpl</className>
                             <packageName>service.loading</packageName>
                         </implRef>
                     </value>
@@ -100,7 +100,7 @@
                         <key>service</key>
                         <value>
                             <implRef type="JAVA">
-<className>BpmnDefaultValueLoaderServiceImpl</className>
+<className>DefaultValueLoaderServiceImpl</className>
 <packageName>service.loading</packageName>
                             </implRef>
                         </value>
@@ -429,7 +429,7 @@
                         <key>service</key>
                         <value>
                             <implRef type="JAVA">
-<className>BpmnDefaultValueLoaderServiceImpl</className>
+<className>DefaultValueLoaderServiceImpl</className>
 <packageName>service.loading</packageName>
                             </implRef>
                         </value>
diff --git a/resources/src/main/resources/overrides/5f9c58f8-9ee1-4df3-b93c-e48534e798db.component.override b/resources/src/main/resources/overrides/5f9c58f8-9ee1-4df3-b93c-e48534e798db.component.override
index 255a4c6..d1997ca 100644
--- a/resources/src/main/resources/overrides/5f9c58f8-9ee1-4df3-b93c-e48534e798db.component.override
+++ b/resources/src/main/resources/overrides/5f9c58f8-9ee1-4df3-b93c-e48534e798db.component.override
@@ -25,7 +25,7 @@
                     <key>service</key>
                     <value>
                         <implRef type="JAVA">
-                            <className>BpmnDefaultValueLoaderServiceImpl</className>
+                            <className>DefaultValueLoaderServiceImpl</className>
                             <packageName>service.loading</packageName>
                         </implRef>
                     </value>
@@ -94,7 +94,7 @@
                         <key>service</key>
                         <value>
                             <implRef type="JAVA">
-<className>BpmnDefaultValueLoaderServiceImpl</className>
+<className>DefaultValueLoaderServiceImpl</className>
 <packageName>service.loading</packageName>
                             </implRef>
                         </value>
@@ -128,7 +128,7 @@
                             <key>service</key>
                             <value>
 <implRef type="JAVA">
-    <className>BpmnDefaultValueLoaderServiceImpl</className>
+    <className>DefaultValueLoaderServiceImpl</className>
     <packageName>service.loading</packageName>
 </implRef>
                             </value>
@@ -186,7 +186,7 @@
 <key>service</key>
 <value>
     <implRef type="JAVA">
-        <className>BpmnDefaultValueLoaderServiceImpl</className>
+        <className>DefaultValueLoaderServiceImpl</className>
         <packageName>service.loading</packageName>
     </implRef>
 </value>
@@ -420,7 +420,7 @@
 <key>service</key>
 <value>
     <implRef type="JAVA">
-        <className>BpmnDefaultValueLoaderServiceImpl</className>
+        <className>DefaultValueLoaderServiceImpl</className>
         <packageName>service.loading</packageName>
     </implRef>
 </value>
@@ -785,7 +785,7 @@
 <key>service</key>
 <value>
     <implRef type="JAVA">
-        <className>BpmnDefaultValueLoaderServiceImpl</className>
+        <className>DefaultValueLoaderServiceImpl</className>
         <packageName>service.loading</packageName>
     </implRef>
 </value>
@@ -841,7 +841,7 @@
     <key>service</key>
     <value>
         <implRef type="JAVA">
-            <className>BpmnDefaultValueLoaderServiceImpl</className>
+            <className>DefaultValueLoaderServiceImpl</className>
             <packageName>service.loading</packageName>
         </implRef>
     </value>
@@ -1583,7 +1583,7 @@
                             <key>service</key>
                             <value>
 <implRef type="JAVA">
-    <className>BpmnDefaultValueLoaderServiceImpl</className>
+    <className>DefaultValueLoaderServiceImpl</className>
     <packageName>service.loading</packageName>
 </implRef>
                             </value>
diff --git a/resources/src/main/resources/overrides/67605d63-1081-423b-b6b5-727ecfce2ca1.component.override b/resources/src/main/resources/overrides/67605d63-1081-423b-b6b5-727ecfce2ca1.component.override
index f1e300b..22c72fc 100644
--- a/resources/src/main/resources/overrides/67605d63-1081-423b-b6b5-727ecfce2ca1.component.override
+++ b/resources/src/main/resources/overrides/67605d63-1081-423b-b6b5-727ecfce2ca1.component.override
@@ -42,7 +42,7 @@
                     <key>service</key>
                     <value>
                         <implRef type="JAVA">
-                            <className>BpmnDefaultValueLoaderServiceImpl</className>
+                            <className>DefaultValueLoaderServiceImpl</className>
                             <packageName>service.loading</packageName>
                         </implRef>
                     </value>
@@ -164,7 +164,7 @@
                         <key>service</key>
                         <value>
                             <implRef type="JAVA">
-<className>BpmnDefaultValueLoaderServiceImpl</className>
+<className>DefaultValueLoaderServiceImpl</className>
 <packageName>service.loading</packageName>
                             </implRef>
                         </value>
@@ -200,7 +200,7 @@
                             <key>service</key>
                             <value>
 <implRef type="JAVA">
-    <className>BpmnDefaultValueLoaderServiceImpl</className>
+    <className>DefaultValueLoaderServiceImpl</className>
     <packageName>service.loading</packageName>
 </implRef>
                             </value>
@@ -322,7 +322,7 @@
 <key>service</key>
 <value>
     <implRef type="JAVA">
-        <className>BpmnDefaultValueLoaderServiceImpl</className>
+        <className>DefaultValueLoaderServiceImpl</className>
         <packageName>service.loading</packageName>
     </implRef>
 </value>
@@ -582,7 +582,7 @@
                             <key>service</key>
                             <value>
 <implRef type="JAVA">
-    <className>BpmnDefaultValueLoaderServiceImpl</className>
+    <className>DefaultValueLoaderServiceImpl</className>
     <packageName>service.loading</packageName>
 </implRef>
                             </value>
@@ -605,7 +605,7 @@
 <key>service</key>
 <value>
     <implRef type="JAVA">
-        <className>BpmnDefaultValueLoaderServiceImpl</className>
+        <className>DefaultValueLoaderServiceImpl</className>
         <packageName>service.loading</packageName>
     </implRef>
 </value>
diff --git a/resources/src/main/resources/overrides/76e91ef4-d2ef-4662-96ad-84c0dae0ecff.component.override b/resources/src/main/resources/overrides/76e91ef4-d2ef-4662-96ad-84c0dae0ecff.component.override
index b54b513..0e6c023 100644
--- a/resources/src/main/resources/overrides/76e91ef4-d2ef-4662-96ad-84c0dae0ecff.component.override
+++ b/resources/src/main/resources/overrides/76e91ef4-d2ef-4662-96ad-84c0dae0ecff.component.override
@@ -178,7 +178,7 @@
                     <key>service</key>
                     <value>
                         <implRef type="JAVA">
-                            <className>BpmnDefaultValueLoaderServiceImpl</className>
+                            <className>DefaultValueLoaderServiceImpl</className>
                             <packageName>service.loading</packageName>
                         </implRef>
                     </value>
diff --git a/resources/src/main/resources/overrides/8e1d9023-42c0-4960-9c59-02f4f0c2e4dd.component.override b/resources/src/main/resources/overrides/8e1d9023-42c0-4960-9c59-02f4f0c2e4dd.component.override
index 2b10420..50c8a1a 100644
--- a/resources/src/main/resources/overrides/8e1d9023-42c0-4960-9c59-02f4f0c2e4dd.component.override
+++ b/resources/src/main/resources/overrides/8e1d9023-42c0-4960-9c59-02f4f0c2e4dd.component.override
@@ -29,7 +29,7 @@
                     <key>service</key>
                     <value>
                         <implRef type="JAVA">
-                            <className>BpmnDefaultValueLoaderServiceImpl</className>
+                            <className>DefaultValueLoaderServiceImpl</className>
                             <packageName>service.loading</packageName>
                         </implRef>
                     </value>
@@ -70,7 +70,7 @@
                         <key>service</key>
                         <value>
                             <implRef type="JAVA">
-<className>BpmnDefaultValueLoaderServiceImpl</className>
+<className>DefaultValueLoaderServiceImpl</className>
 <packageName>service.loading</packageName>
                             </implRef>
                         </value>
@@ -385,7 +385,7 @@
                         <key>service</key>
                         <value>
                             <implRef type="JAVA">
-<className>BpmnDefaultValueLoaderServiceImpl</className>
+<className>DefaultValueLoaderServiceImpl</className>
 <packageName>service.loading</packageName>
                             </implRef>
                         </value>
@@ -436,7 +436,7 @@
                             <key>service</key>
                             <value>
 <implRef type="JAVA">
-    <className>BpmnDefaultValueLoaderServiceImpl</className>
+    <className>DefaultValueLoaderServiceImpl</className>
     <packageName>service.loading</packageName>
 </implRef>
                             </value>
@@ -460,7 +460,7 @@
                             <key>service</key>
                             <value>
 <implRef type="JAVA">
-    <className>BpmnDefaultValueLoaderServiceImpl</className>
+    <className>DefaultValueLoaderServiceImpl</className>
     <packageName>service.loading</packageName>
 </implRef>
                             </value>
diff --git a/resources/src/main/resources/overrides/a4d442cf-72a8-431e-815a-490959083787.component.override b/resources/src/main/resources/overrides/a4d442cf-72a8-431e-815a-490959083787.component.override
index 0609f98..47a9525 100644
--- a/resources/src/main/resources/overrides/a4d442cf-72a8-431e-815a-490959083787.component.override
+++ b/resources/src/main/resources/overrides/a4d442cf-72a8-431e-815a-490959083787.component.override
@@ -25,7 +25,7 @@
                     <key>service</key>
                     <value>
                         <implRef type="JAVA">
-                            <className>BpmnDefaultValueLoaderServiceImpl</className>
+                            <className>DefaultValueLoaderServiceImpl</className>
                             <packageName>service.loading</packageName>
                         </implRef>
                     </value>
@@ -48,7 +48,7 @@
                         <key>service</key>
                         <value>
                             <implRef type="JAVA">
-<className>BpmnDefaultValueLoaderServiceImpl</className>
+<className>DefaultValueLoaderServiceImpl</className>
 <packageName>service.loading</packageName>
                             </implRef>
                         </value>
@@ -232,7 +232,7 @@
                         <key>service</key>
                         <value>
                             <implRef type="JAVA">
-<className>BpmnDefaultValueLoaderServiceImpl</className>
+<className>DefaultValueLoaderServiceImpl</className>
 <packageName>service.loading</packageName>
                             </implRef>
                         </value>
@@ -414,7 +414,7 @@
                             <key>service</key>
                             <value>
 <implRef type="JAVA">
-    <className>BpmnDefaultValueLoaderServiceImpl</className>
+    <className>DefaultValueLoaderServiceImpl</className>
     <packageName>service.loading</packageName>
 </implRef>
                             </value>
@@ -496,7 +496,7 @@
 <key>service</key>
 <value>
     <implRef type="JAVA">
-        <className>BpmnDefaultValueLoaderServiceImpl</className>
+        <className>DefaultValueLoaderServiceImpl</className>
         <packageName>service.loading</packageName>
     </implRef>
 </value>
@@ -577,7 +577,7 @@
     <key>service</key>
     <value>
         <implRef type="JAVA">
-            <className>BpmnDefaultValueLoaderServiceImpl</className>
+            <className>DefaultValueLoaderServiceImpl</className>
             <packageName>service.loading</packageName>
         </implRef>
     </value>
@@ -600,7 +600,7 @@
         <key>service</key>
         <value>
             <implRef type="JAVA">
-                <className>BpmnDefaultValueLoaderServiceImpl</className>
+                <className>DefaultValueLoaderServiceImpl</className>
                 <packageName>service.loading</packageName>
             </implRef>
         </value>
@@ -676,7 +676,7 @@
             <key>service</key>
             <value>
                 <implRef type="JAVA">
-                    <className>BpmnDefaultValueLoaderServiceImpl</className>
+                    <className>DefaultValueLoaderServiceImpl</className>
                     <packageName>service.loading</packageName>
                 </implRef>
             </value>
@@ -923,7 +923,7 @@
             <key>service</key>
             <value>
                 <implRef type="JAVA">
-                    <className>BpmnDefaultValueLoaderServiceImpl</className>
+                    <className>DefaultValueLoaderServiceImpl</className>
                     <packageName>service.loading</packageName>
                 </implRef>
             </value>
diff --git a/resources/src/main/resources/overrides/c4b48815-f449-48fe-9ae0-dec9b6f4c53c.component.override b/resources/src/main/resources/overrides/c4b48815-f449-48fe-9ae0-dec9b6f4c53c.component.override
index 1875ace..89b2ac5 100644
--- a/resources/src/main/resources/overrides/c4b48815-f449-48fe-9ae0-dec9b6f4c53c.component.override
+++ b/resources/src/main/resources/overrides/c4b48815-f449-48fe-9ae0-dec9b6f4c53c.component.override
@@ -25,7 +25,7 @@
                     <key>service</key>
                     <value>
                         <implRef type="JAVA">
-                            <className>BpmnDefaultValueLoaderServiceImpl</className>
+                            <className>DefaultValueLoaderServiceImpl</className>
                             <packageName>service.loading</packageName>
                         </implRef>
                     </value>
@@ -94,7 +94,7 @@
                         <key>service</key>
                         <value>
                             <implRef type="JAVA">
-<className>BpmnDefaultValueLoaderServiceImpl</className>
+<className>DefaultValueLoaderServiceImpl</className>
 <packageName>service.loading</packageName>
                             </implRef>
                         </value>
@@ -136,7 +136,7 @@
                             <key>service</key>
                             <value>
 <implRef type="JAVA">
-    <className>BpmnDefaultValueLoaderServiceImpl</className>
+    <className>DefaultValueLoaderServiceImpl</className>
     <packageName>service.loading</packageName>
 </implRef>
                             </value>
@@ -187,7 +187,7 @@
 <key>service</key>
 <value>
     <implRef type="JAVA">
-        <className>BpmnDefaultValueLoaderServiceImpl</className>
+        <className>DefaultValueLoaderServiceImpl</className>
         <packageName>service.loading</packageName>
     </implRef>
 </value>
@@ -235,7 +235,7 @@
     <key>service</key>
     <value>
         <implRef type="JAVA">
-            <className>BpmnDefaultValueLoaderServiceImpl</className>
+            <className>DefaultValueLoaderServiceImpl</className>
             <packageName>service.loading</packageName>
         </implRef>
     </value>
@@ -258,7 +258,7 @@
         <key>service</key>
         <value>
             <implRef type="JAVA">
-                <className>BpmnDefaultValueLoaderServiceImpl</className>
+                <className>DefaultValueLoaderServiceImpl</className>
                 <packageName>service.loading</packageName>
             </implRef>
         </value>
@@ -282,7 +282,7 @@
         <key>service</key>
         <value>
             <implRef type="JAVA">
-                <className>BpmnDefaultValueLoaderServiceImpl</className>
+                <className>DefaultValueLoaderServiceImpl</className>
                 <packageName>service.loading</packageName>
             </implRef>
         </value>
@@ -462,7 +462,7 @@
 <key>service</key>
 <value>
     <implRef type="JAVA">
-        <className>BpmnDefaultValueLoaderServiceImpl</className>
+        <className>DefaultValueLoaderServiceImpl</className>
         <packageName>service.loading</packageName>
     </implRef>
 </value>
@@ -511,7 +511,7 @@
     <key>service</key>
     <value>
         <implRef type="JAVA">
-            <className>BpmnDefaultValueLoaderServiceImpl</className>
+            <className>DefaultValueLoaderServiceImpl</className>
             <packageName>service.loading</packageName>
         </implRef>
     </value>
@@ -534,7 +534,7 @@
         <key>service</key>
         <value>
             <implRef type="JAVA">
-                <className>BpmnDefaultValueLoaderServiceImpl</className>
+                <className>DefaultValueLoaderServiceImpl</className>
                 <packageName>service.loading</packageName>
             </implRef>
         </value>
@@ -558,7 +558,7 @@
         <key>service</key>
         <value>
             <implRef type="JAVA">
-                <className>BpmnDefaultValueLoaderServiceImpl</className>
+                <className>DefaultValueLoaderServiceImpl</className>
                 <packageName>service.loading</packageName>
             </implRef>
         </value>
@@ -968,7 +968,7 @@
 <key>service</key>
 <value>
     <implRef type="JAVA">
-        <className>BpmnDefaultValueLoaderServiceImpl</className>
+        <className>DefaultValueLoaderServiceImpl</className>
         <packageName>service.loading</packageName>
     </implRef>
 </value>
@@ -1024,7 +1024,7 @@
     <key>service</key>
     <value>
         <implRef type="JAVA">
-            <className>BpmnDefaultValueLoaderServiceImpl</className>
+            <className>DefaultValueLoaderServiceImpl</className>
             <packageName>service.loading</packageName>
         </implRef>
     </value>
@@ -1788,7 +1788,7 @@
                             <key>service</key>
                             <value>
 <implRef type="JAVA">
-    <className>BpmnDefaultValueLoaderServiceImpl</className>
+    <className>DefaultValueLoaderServiceImpl</className>
     <packageName>service.loading</packageName>
 </implRef>
                             </value>
diff --git a/resources/src/main/resources/overrides/ca7390f1-1891-4161-b8ae-ef66de5776b7.component.override b/resources/src/main/resources/overrides/ca7390f1-1891-4161-b8ae-ef66de5776b7.component.override
index 578bb99..b80b4f2 100644
--- a/resources/src/main/resources/overrides/ca7390f1-1891-4161-b8ae-ef66de5776b7.component.override
+++ b/resources/src/main/resources/overrides/ca7390f1-1891-4161-b8ae-ef66de5776b7.component.override
@@ -25,7 +25,7 @@
                     <key>service</key>
                     <value>
                         <implRef type="JAVA">
-                            <className>BpmnDefaultValueLoaderServiceImpl</className>
+                            <className>DefaultValueLoaderServiceImpl</className>
                             <packageName>service.loading</packageName>
                         </implRef>
                     </value>
@@ -141,7 +141,7 @@
                         <key>service</key>
                         <value>
                             <implRef type="JAVA">
-<className>BpmnDefaultValueLoaderServiceImpl</className>
+<className>DefaultValueLoaderServiceImpl</className>
 <packageName>service.loading</packageName>
                             </implRef>
                         </value>
@@ -201,7 +201,7 @@
                             <key>service</key>
                             <value>
 <implRef type="JAVA">
-    <className>BpmnDefaultValueLoaderServiceImpl</className>
+    <className>DefaultValueLoaderServiceImpl</className>
     <packageName>service.loading</packageName>
 </implRef>
                             </value>
@@ -246,7 +246,7 @@
 <key>service</key>
 <value>
     <implRef type="JAVA">
-        <className>BpmnDefaultValueLoaderServiceImpl</className>
+        <className>DefaultValueLoaderServiceImpl</className>
         <packageName>service.loading</packageName>
     </implRef>
 </value>
@@ -642,7 +642,7 @@
 <key>service</key>
 <value>
     <implRef type="JAVA">
-        <className>BpmnDefaultValueLoaderServiceImpl</className>
+        <className>DefaultValueLoaderServiceImpl</className>
         <packageName>service.loading</packageName>
     </implRef>
 </value>
@@ -698,7 +698,7 @@
     <key>service</key>
     <value>
         <implRef type="JAVA">
-            <className>BpmnDefaultValueLoaderServiceImpl</className>
+            <className>DefaultValueLoaderServiceImpl</className>
             <packageName>service.loading</packageName>
         </implRef>
     </value>
@@ -1462,7 +1462,7 @@
                         <key>service</key>
                         <value>
                             <implRef type="JAVA">
-<className>BpmnDefaultValueLoaderServiceImpl</className>
+<className>DefaultValueLoaderServiceImpl</className>
 <packageName>service.loading</packageName>
                             </implRef>
                         </value>
diff --git a/resources/src/main/resources/overrides/ed47cfae-64da-4360-8f61-1087179ad78b.component.override b/resources/src/main/resources/overrides/ed47cfae-64da-4360-8f61-1087179ad78b.component.override
index 3ef4265..33539c9 100644
--- a/resources/src/main/resources/overrides/ed47cfae-64da-4360-8f61-1087179ad78b.component.override
+++ b/resources/src/main/resources/overrides/ed47cfae-64da-4360-8f61-1087179ad78b.component.override
@@ -25,7 +25,7 @@
                     <key>service</key>
                     <value>
                         <implRef type="JAVA">
-                            <className>BpmnDefaultValueLoaderServiceImpl</className>
+                            <className>DefaultValueLoaderServiceImpl</className>
                             <packageName>service.loading</packageName>
                         </implRef>
                     </value>
@@ -141,7 +141,7 @@
                         <key>service</key>
                         <value>
                             <implRef type="JAVA">
-<className>BpmnDefaultValueLoaderServiceImpl</className>
+<className>DefaultValueLoaderServiceImpl</className>
 <packageName>service.loading</packageName>
                             </implRef>
                         </value>
@@ -201,7 +201,7 @@
                             <key>service</key>
                             <value>
 <implRef type="JAVA">
-    <className>BpmnDefaultValueLoaderServiceImpl</className>
+    <className>DefaultValueLoaderServiceImpl</className>
     <packageName>service.loading</packageName>
 </implRef>
                             </value>
@@ -246,7 +246,7 @@
 <key>service</key>
 <value>
     <implRef type="JAVA">
-        <className>BpmnDefaultValueLoaderServiceImpl</className>
+        <className>DefaultValueLoaderServiceImpl</className>
         <packageName>service.loading</packageName>
     </implRef>
 </value>
@@ -642,7 +642,7 @@
 <key>service</key>
 <value>
     <implRef type="JAVA">
-        <className>BpmnDefaultValueLoaderServiceImpl</className>
+        <className>DefaultValueLoaderServiceImpl</className>
         <packageName>service.loading</packageName>
     </implRef>
 </value>
@@ -698,7 +698,7 @@
     <key>service</key>
     <value>
         <implRef type="JAVA">
-            <className>BpmnDefaultValueLoaderServiceImpl</className>
+            <className>DefaultValueLoaderServiceImpl</className>
             <packageName>service.loading</packageName>
         </implRef>
     </value>
@@ -1019,7 +1019,7 @@
         <key>service</key>
         <value>
             <implRef type="JAVA">
-                <className>BpmnDefaultValueLoaderServiceImpl</className>
+                <className>DefaultValueLoaderServiceImpl</className>
                 <packageName>service.loading</packageName>
             </implRef>
         </value>
@@ -1483,7 +1483,7 @@
                         <key>service</key>
                         <value>
                             <implRef type="JAVA">
-<className>BpmnDefaultValueLoaderServiceImpl</className>
+<className>DefaultValueLoaderServiceImpl</className>
 <packageName>service.loading</packageName>
                             </implRef>
                         </value>
diff --git a/resources/src/main/resources/overrides/fe225a1a-1c03-485e-a069-18b92ab4f7f7.component.override b/resources/src/main/resources/overrides/fe225a1a-1c03-485e-a069-18b92ab4f7f7.component.override
index af579dc..54b213f 100644
--- a/resources/src/main/resources/overrides/fe225a1a-1c03-485e-a069-18b92ab4f7f7.component.override
+++ b/resources/src/main/resources/overrides/fe225a1a-1c03-485e-a069-18b92ab4f7f7.component.override
@@ -25,7 +25,7 @@
                     <key>service</key>
                     <value>
                         <implRef type="JAVA">
-                            <className>BpmnDefaultValueLoaderServiceImpl</className>
+                            <className>DefaultValueLoaderServiceImpl</className>
                             <packageName>service.loading</packageName>
                         </implRef>
                     </value>
@@ -108,7 +108,7 @@
                         <key>service</key>
                         <value>
                             <implRef type="JAVA">
-<className>BpmnDefaultValueLoaderServiceImpl</className>
+<className>DefaultValueLoaderServiceImpl</className>
 <packageName>service.loading</packageName>
                             </implRef>
                         </value>
@@ -384,7 +384,7 @@
                             <key>service</key>
                             <value>
 <implRef type="JAVA">
-    <className>BpmnDefaultValueLoaderServiceImpl</className>
+    <className>DefaultValueLoaderServiceImpl</className>
     <packageName>service.loading</packageName>
 </implRef>
                             </value>
@@ -420,7 +420,7 @@
 <key>service</key>
 <value>
     <implRef type="JAVA">
-        <className>BpmnDefaultValueLoaderServiceImpl</className>
+        <className>DefaultValueLoaderServiceImpl</className>
         <packageName>service.loading</packageName>
     </implRef>
 </value>