diff --git a/entity/DistrictResponsible_entity/DistrictResponsible_entity.aod b/entity/DistrictResponsible_entity/DistrictResponsible_entity.aod
index 3709e37ff5c78d48fb269518b1224eaf6998a8b4..093b691e229e542f9da2911b98838631b23e06f1 100644
--- a/entity/DistrictResponsible_entity/DistrictResponsible_entity.aod
+++ b/entity/DistrictResponsible_entity/DistrictResponsible_entity.aod
@@ -183,18 +183,18 @@
       </children>
     </entityConsumer>
     <entityField>
-      <name>ADVISERROLE</name>
+      <name>ADVISER_ROLE</name>
       <title>Adviser role</title>
       <consumer>AdviserRoles</consumer>
-      <displayValueProcess>%aditoprj%/entity/DistrictResponsible_entity/entityfields/adviserrole/displayValueProcess.js</displayValueProcess>
+      <displayValueProcess>%aditoprj%/entity/DistrictResponsible_entity/entityfields/adviser_role/displayValueProcess.js</displayValueProcess>
     </entityField>
     <entityField>
-      <name>ADVISERSTATUS</name>
+      <name>ADVISER_STATUS</name>
       <title>Adviser status</title>
       <consumer>AdviserStates</consumer>
       <groupable v="true" />
-      <valueProcess>%aditoprj%/entity/DistrictResponsible_entity/entityfields/adviserstatus/valueProcess.js</valueProcess>
-      <displayValueProcess>%aditoprj%/entity/DistrictResponsible_entity/entityfields/adviserstatus/displayValueProcess.js</displayValueProcess>
+      <valueProcess>%aditoprj%/entity/DistrictResponsible_entity/entityfields/adviser_status/valueProcess.js</valueProcess>
+      <displayValueProcess>%aditoprj%/entity/DistrictResponsible_entity/entityfields/adviser_status/displayValueProcess.js</displayValueProcess>
     </entityField>
     <entityConsumer>
       <name>AdviserStates</name>
@@ -212,13 +212,13 @@
       </children>
     </entityConsumer>
     <entityField>
-      <name>VALIDFROM</name>
+      <name>VALID_FROM</name>
       <title>Valid from</title>
       <contentType>DATE</contentType>
       <resolution>DAY</resolution>
     </entityField>
     <entityField>
-      <name>VALIDTO</name>
+      <name>VALID_TO</name>
       <title>Valid to</title>
       <contentType>DATE</contentType>
       <resolution>DAY</resolution>
@@ -316,24 +316,24 @@
           <expression>%aditoprj%/entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/employee_contact_id.displayvalue/expression.js</expression>
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
-          <name>ADVISERROLE.value</name>
+          <name>ADVISER_ROLE.value</name>
           <recordfield>DISTRICTRESPONSIBLE.ADVISERROLE</recordfield>
           <isFilterable v="true" />
           <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
-          <name>ADVISERSTATUS.value</name>
+          <name>ADVISER_STATUS.value</name>
           <recordfield>DISTRICTRESPONSIBLE.ADVISERSTATUS</recordfield>
           <isFilterable v="true" />
           <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
-          <name>VALIDFROM.value</name>
+          <name>VALID_FROM.value</name>
           <recordfield>DISTRICTRESPONSIBLE.VALIDFROM</recordfield>
           <isFilterable v="true" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
-          <name>VALIDTO.value</name>
+          <name>VALID_TO.value</name>
           <recordfield>DISTRICTRESPONSIBLE.VALIDTO</recordfield>
           <isFilterable v="true" />
         </dbRecordFieldMapping>
diff --git a/entity/DistrictResponsible_entity/entityfields/adviserrole/displayValueProcess.js b/entity/DistrictResponsible_entity/entityfields/adviser_role/displayValueProcess.js
similarity index 80%
rename from entity/DistrictResponsible_entity/entityfields/adviserrole/displayValueProcess.js
rename to entity/DistrictResponsible_entity/entityfields/adviser_role/displayValueProcess.js
index 9a3a02b4f297bcdaf23b642ad9937f9677d27696..1c2626f024782f6d29c7b4f7fd225796acbd250a 100644
--- a/entity/DistrictResponsible_entity/entityfields/adviserrole/displayValueProcess.js
+++ b/entity/DistrictResponsible_entity/entityfields/adviser_role/displayValueProcess.js
@@ -3,4 +3,4 @@ import("system.vars");
 import("Keyword_lib");
 import("KeywordRegistry_basic");
 
-result.string(KeywordUtils.getViewValue($KeywordRegistry.adviserRole(), vars.get("$field.ADVISERROLE")));
\ No newline at end of file
+result.string(KeywordUtils.getViewValue($KeywordRegistry.adviserRole(), vars.get("$field.ADVISER_ROLE")));
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/entityfields/adviserstatus/displayValueProcess.js b/entity/DistrictResponsible_entity/entityfields/adviser_status/displayValueProcess.js
similarity index 78%
rename from entity/DistrictResponsible_entity/entityfields/adviserstatus/displayValueProcess.js
rename to entity/DistrictResponsible_entity/entityfields/adviser_status/displayValueProcess.js
index 392e8acc72cccdf821a37885860036b62198b02d..7f7c5a4b070b3d79992eb80365eb4666affe452b 100644
--- a/entity/DistrictResponsible_entity/entityfields/adviserstatus/displayValueProcess.js
+++ b/entity/DistrictResponsible_entity/entityfields/adviser_status/displayValueProcess.js
@@ -3,4 +3,4 @@ import("system.vars");
 import("Keyword_lib");
 import("KeywordRegistry_basic");
 
-result.string(KeywordUtils.getViewValue($KeywordRegistry.contactStatus(), vars.get("$field.ADVISERSTATUS")));
+result.string(KeywordUtils.getViewValue($KeywordRegistry.contactStatus(), vars.get("$field.ADVISER_STATUS")));
diff --git a/entity/DistrictResponsible_entity/entityfields/adviserstatus/valueProcess.js b/entity/DistrictResponsible_entity/entityfields/adviser_status/valueProcess.js
similarity index 100%
rename from entity/DistrictResponsible_entity/entityfields/adviserstatus/valueProcess.js
rename to entity/DistrictResponsible_entity/entityfields/adviser_status/valueProcess.js
diff --git a/neonView/DistrictResponsibleEdit_view/DistrictResponsibleEdit_view.aod b/neonView/DistrictResponsibleEdit_view/DistrictResponsibleEdit_view.aod
index da0a7f332cb6bd6802198f1873191a58744c0a64..4605998d712634afe9306b5dcfd579868819ac3a 100644
--- a/neonView/DistrictResponsibleEdit_view/DistrictResponsibleEdit_view.aod
+++ b/neonView/DistrictResponsibleEdit_view/DistrictResponsibleEdit_view.aod
@@ -18,20 +18,20 @@
           <entityField>EMPLOYEE_CONTACT_ID</entityField>
         </entityFieldLink>
         <entityFieldLink>
-          <name>713d2f8f-eeb4-4b45-a1cd-968db6b17064</name>
-          <entityField>ADVISERROLE</entityField>
+          <name>77b9ba2a-d7ee-47ba-8908-63e45dbd1db2</name>
+          <entityField>ADVISER_ROLE</entityField>
         </entityFieldLink>
         <entityFieldLink>
-          <name>94396f7a-4876-466e-85f0-2701814ea4d1</name>
-          <entityField>ADVISERSTATUS</entityField>
+          <name>6b4c7d81-48f0-4cc2-a0fd-2fbb090d35da</name>
+          <entityField>ADVISER_STATUS</entityField>
         </entityFieldLink>
         <entityFieldLink>
-          <name>a79dcf61-7bd8-45f5-9ef3-1cea0a01b1bd</name>
-          <entityField>VALIDFROM</entityField>
+          <name>14ba4841-19c5-4282-ae2c-97108e55ed14</name>
+          <entityField>VALID_FROM</entityField>
         </entityFieldLink>
         <entityFieldLink>
-          <name>48dab8ef-f95b-40bf-a16c-ffd3f5b9cb6b</name>
-          <entityField>VALIDTO</entityField>
+          <name>4bdb4191-6452-44b2-b0b2-54fc00d445cb</name>
+          <entityField>VALID_TO</entityField>
         </entityFieldLink>
       </fields>
     </genericViewTemplate>
diff --git a/neonView/DistrictResponsibleFilter_view/DistrictResponsibleFilter_view.aod b/neonView/DistrictResponsibleFilter_view/DistrictResponsibleFilter_view.aod
index 3af81ba83908ef92d05e219f9c41063752e8b760..01b6300a4b4f891470c8d5ed066a18da8960cd37 100644
--- a/neonView/DistrictResponsibleFilter_view/DistrictResponsibleFilter_view.aod
+++ b/neonView/DistrictResponsibleFilter_view/DistrictResponsibleFilter_view.aod
@@ -25,19 +25,19 @@
         </neonTableColumn>
         <neonTableColumn>
           <name>1cbd12e3-6de1-4932-afbd-0f856c030984</name>
-          <entityField>ADVISERROLE</entityField>
+          <entityField>ADVISER_ROLE</entityField>
         </neonTableColumn>
         <neonTableColumn>
           <name>f8b3b6e7-8e7c-41f1-aed9-f81e3f3d0bad</name>
-          <entityField>ADVISERSTATUS</entityField>
+          <entityField>ADVISER_STATUS</entityField>
         </neonTableColumn>
         <neonTableColumn>
           <name>9896476f-1b08-49c9-91ef-000579e52e0b</name>
-          <entityField>VALIDFROM</entityField>
+          <entityField>VALID_FROM</entityField>
         </neonTableColumn>
         <neonTableColumn>
           <name>0ff668e7-8e9a-483d-973a-d74a7a919a5a</name>
-          <entityField>VALIDTO</entityField>
+          <entityField>VALID_TO</entityField>
         </neonTableColumn>
       </columns>
     </tableViewTemplate>