diff --git a/neonContext/Organisation/Organisation.aod b/neonContext/Organisation/Organisation.aod
index 968ccbfe817a9cc274763fca03626b25ece07bfa..26e9b98ce2551670cd108cf2ad6cc54f7486eed9 100644
--- a/neonContext/Organisation/Organisation.aod
+++ b/neonContext/Organisation/Organisation.aod
@@ -31,13 +31,13 @@
       <name>bb592f88-fa9f-4ecc-98cc-51a7903dc970</name>
       <view>OrganisationAttr_view</view>
     </neonViewReference>
-    <neonViewReference>
-      <name>b1634a51-b3f3-47b7-aea0-b9e8fba851da</name>
-      <view>OrganisationEditDefaults_view</view>
-    </neonViewReference>
     <neonViewReference>
       <name>27c1cd03-506a-4e1e-a080-79b9dca6eefd</name>
       <view>OrganisationLookup_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>0e8f983b-0ff6-431c-9118-fecd9563c742</name>
+      <view>OrganisationEditDefaults_view</view>
+    </neonViewReference>
   </references>
 </neonContext>
diff --git a/neonView/OrgEditDefaults_view/OrgEditDefaults_view.aod b/neonView/OrganisationEditDefaults_view/OrganisationEditDefaults_view.aod
similarity index 84%
rename from neonView/OrgEditDefaults_view/OrgEditDefaults_view.aod
rename to neonView/OrganisationEditDefaults_view/OrganisationEditDefaults_view.aod
index 725872a478b159d9f03a1f8c15b2d05b135b373f..4c660f02d48e4fce4c8af45f2f21198c2cc3fd55 100644
--- a/neonView/OrgEditDefaults_view/OrgEditDefaults_view.aod
+++ b/neonView/OrganisationEditDefaults_view/OrganisationEditDefaults_view.aod
@@ -14,15 +14,15 @@
       <entityField>#ENTITY</entityField>
       <fields>
         <entityFieldLink>
-          <name>08c00d5b-fc5e-451b-8341-0e5c5172faa8</name>
+          <name>ccc421c9-3943-4668-a6c7-960753c38562</name>
           <entityField>ADDRESS_ID</entityField>
         </entityFieldLink>
         <entityFieldLink>
-          <name>8fac75ad-cde5-411c-b0ad-744b5aab0c5d</name>
+          <name>8625fb63-550c-4ad3-9b39-3091762e3f29</name>
           <entityField>STANDARD_EMAIL_COMMUNICATION</entityField>
         </entityFieldLink>
         <entityFieldLink>
-          <name>48722352-b85f-47d4-a6b1-dc87f9e9e6fc</name>
+          <name>a984c913-54e8-492e-928a-3553a1e76726</name>
           <entityField>STANDARD_PHONE_COMMUNICATION</entityField>
         </entityFieldLink>
       </fields>