diff --git a/entity/AttributeUsage_entity/AttributeUsage_entity.aod b/entity/AttributeUsage_entity/AttributeUsage_entity.aod
index 4d2a7d0dacffaa7ab4e7c61f52ec92f7b0d16cfc..c9546a60c8d34762e11514679ac561d7888c5951 100644
--- a/entity/AttributeUsage_entity/AttributeUsage_entity.aod
+++ b/entity/AttributeUsage_entity/AttributeUsage_entity.aod
@@ -47,7 +47,7 @@
<entityDependency>
<name>47ac9f95-8879-43fd-92a9-86079e735e58</name>
<entityName>Attribute_entity</entityName>
- <fieldName>AttributeUsage_dfo</fieldName>
+ <fieldName>AttributeUsages</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
diff --git a/entity/Attribute_entity/Attribute_entity.aod b/entity/Attribute_entity/Attribute_entity.aod
index e9e08ea81546d62cfee5236feaf4b4f498c296e6..8d44fb4031d510abffd2c46b3d82857ec7628c37 100644
--- a/entity/Attribute_entity/Attribute_entity.aod
+++ b/entity/Attribute_entity/Attribute_entity.aod
@@ -53,7 +53,7 @@
<title>{$USER_EDIT}</title>
</entityField>
<entityConsumer>
- <name>AttributeChild_dfo</name>
+ <name>AttributeChildren</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -61,7 +61,7 @@
</dependency>
</entityConsumer>
<entityProvider>
- <name>AttributeParent_dfi</name>
+ <name>AttributeParent</name>
<fieldType>DEPENDENCY_IN</fieldType>
<recordContainer>db</recordContainer>
</entityProvider>
@@ -71,7 +71,7 @@
<description>PARAMETER</description>
</entityParameter>
<entityConsumer>
- <name>AttributeUsage_dfo</name>
+ <name>AttributeUsages</name>
<title>Usage</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
@@ -82,7 +82,7 @@
<children>
<entityParameter>
<name>attributeId_param</name>
- <code>%aditoprj%/entity/Attribute_entity/entityfields/attributeusage_dfo/children/attributeid_param/code.js</code>
+ <code>%aditoprj%/entity/Attribute_entity/entityfields/attributeusages/children/attributeid_param/code.js</code>
<triggerRecalculation v="true" />
</entityParameter>
</children>
diff --git a/entity/Attribute_entity/entityfields/attributeusage_dfo/children/attributeid_param/code.js b/entity/Attribute_entity/entityfields/attributeusages/children/attributeid_param/code.js
similarity index 97%
rename from entity/Attribute_entity/entityfields/attributeusage_dfo/children/attributeid_param/code.js
rename to entity/Attribute_entity/entityfields/attributeusages/children/attributeid_param/code.js
index 033bf9a666c5254c8945077776b2834560164e56..c9a3d90e33382c689b93d232411e2a788f71c0e9 100644
--- a/entity/Attribute_entity/entityfields/attributeusage_dfo/children/attributeid_param/code.js
+++ b/entity/Attribute_entity/entityfields/attributeusages/children/attributeid_param/code.js
@@ -1,4 +1,4 @@
-import("system.vars");
-import("system.result");
-
+import("system.vars");
+import("system.result");
+
result.string(vars.get("$field.AB_ATTRIBUTEID"));
\ No newline at end of file
diff --git a/neonView/AttributeEdit_view/AttributeEdit_view.aod b/neonView/AttributeEdit_view/AttributeEdit_view.aod
index 5409c8302b77e6c2062b0f7065aa7ea4978de2fd..6662e966bccccb1b1e1f04cd2cb9fd4d81595ad9 100644
--- a/neonView/AttributeEdit_view/AttributeEdit_view.aod
+++ b/neonView/AttributeEdit_view/AttributeEdit_view.aod
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1">
- <name>AttributeEdit_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <genericViewTemplate>
- <name>AttrEdit_template</name>
- <editMode v="true" />
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>0c6cd7c6-cced-4719-b0c5-08f8e3d13f2f</name>
- <entityField>ATTRIBUTE_NAME</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>8cbc6049-2530-4960-b45f-830f3220889e</name>
- <entityField>ATTRIBUTE_TYPE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>d26696ac-199c-45f0-9147-b75dee3f4b65</name>
- <entityField>ATTRIBUTE_ACTIVE</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- <neonViewReference>
- <name>8387ef27-9565-400f-a0d5-ef1d2019b722</name>
- <entityField>AttributeUsage_dfo</entityField>
- <view>AttributeUsageMultiEdit_view</view>
- </neonViewReference>
- </children>
-</neonView>
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1">
+ <name>AttributeEdit_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>AttrEdit_template</name>
+ <editMode v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>0c6cd7c6-cced-4719-b0c5-08f8e3d13f2f</name>
+ <entityField>ATTRIBUTE_NAME</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>8cbc6049-2530-4960-b45f-830f3220889e</name>
+ <entityField>ATTRIBUTE_TYPE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>d26696ac-199c-45f0-9147-b75dee3f4b65</name>
+ <entityField>ATTRIBUTE_ACTIVE</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ <neonViewReference>
+ <name>8387ef27-9565-400f-a0d5-ef1d2019b722</name>
+ <entityField>AttributeUsages</entityField>
+ <view>AttributeUsageMultiEdit_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/neonView/AttributeMain_view/AttributeMain_view.aod b/neonView/AttributeMain_view/AttributeMain_view.aod
index 38b0c466d6f319a0bc156fac223aa1eacaba6884..3e3b69fbba6fa6eb521067884c38357530389024 100644
--- a/neonView/AttributeMain_view/AttributeMain_view.aod
+++ b/neonView/AttributeMain_view/AttributeMain_view.aod
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1">
- <name>AttributeMain_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <masterSlaveLayout>
- <name>layout</name>
- <master>b8e5b606-4fbb-4a74-b7c4-ac612a9797f2</master>
- </masterSlaveLayout>
- </layout>
- <children>
- <neonViewReference>
- <name>b8e5b606-4fbb-4a74-b7c4-ac612a9797f2</name>
- <entityField>#ENTITY</entityField>
- <view>AttributePreview_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>d8009eea-f473-4f65-8796-a1ab48ef3b49</name>
- <entityField>#ENTITY</entityField>
- <view>AttributeFilter_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>5dee1c0b-c670-4eb9-bd95-6f6474709aa2</name>
- <entityField>AttributeUsage_dfo</entityField>
- <view>AttributeUsageFilter_view</view>
- </neonViewReference>
- </children>
-</neonView>
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.1">
+ <name>AttributeMain_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <masterSlaveLayout>
+ <name>layout</name>
+ <master>b8e5b606-4fbb-4a74-b7c4-ac612a9797f2</master>
+ </masterSlaveLayout>
+ </layout>
+ <children>
+ <neonViewReference>
+ <name>b8e5b606-4fbb-4a74-b7c4-ac612a9797f2</name>
+ <entityField>#ENTITY</entityField>
+ <view>AttributePreview_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>d8009eea-f473-4f65-8796-a1ab48ef3b49</name>
+ <entityField>#ENTITY</entityField>
+ <view>AttributeFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>5dee1c0b-c670-4eb9-bd95-6f6474709aa2</name>
+ <entityField>AttributeUsages</entityField>
+ <view>AttributeUsageFilter_view</view>
+ </neonViewReference>
+ </children>
+</neonView>