diff --git a/src/controllers/OrganizationController.ts b/src/controllers/OrganizationController.ts
index c8b12c07..fa652688 100644
--- a/src/controllers/OrganizationController.ts
+++ b/src/controllers/OrganizationController.ts
@@ -398,76 +398,76 @@ export class OrganizationController extends Controller {
 
       const formattedData = orgRootData.map((orgRoot) => {
         return {
-          orgRootId: orgRoot.id,
+          orgTreeId: orgRoot.id,
           orgLevel: 0,
-          orgRootName: orgRoot.orgRootName,
-          orgRootShortName: orgRoot.orgRootShortName,
-          orgRootCode: orgRoot.orgRootCode,
+          orgTreeName: orgRoot.orgRootName,
+          orgTreeShortName: orgRoot.orgRootShortName,
+          orgTreeCode: orgRoot.orgRootCode,
           orgCode: orgRoot.orgRootCode + "00",
-          orgRootOrder: orgRoot.orgRootOrder,
-          orgRootPhoneEx: orgRoot.orgRootPhoneEx,
-          orgRootPhoneIn: orgRoot.orgRootPhoneIn,
-          orgRootFax: orgRoot.orgRootFax,
+          orgTreeOrder: orgRoot.orgRootOrder,
+          orgTreePhoneEx: orgRoot.orgRootPhoneEx,
+          orgTreePhoneIn: orgRoot.orgRootPhoneIn,
+          orgTreeFax: orgRoot.orgRootFax,
           orgRevisionId: orgRoot.orgRevisionId,
           orgChild1: orgChild1Data
             .filter((orgChild1) => orgChild1.orgRootId === orgRoot.id)
             .map((orgChild1) => ({
-              orgChild1Id: orgChild1.id,
+              orgTreeId: orgChild1.id,
               orgLevel: 1,
-              orgChild1Name: orgChild1.orgChild1Name,
-              orgChild1ShortName: orgChild1.orgChild1ShortName,
-              orgChild1Code: orgChild1.orgChild1Code,
+              orgTreeName: orgChild1.orgChild1Name,
+              orgTreeShortName: orgChild1.orgChild1ShortName,
+              orgTreeCode: orgChild1.orgChild1Code,
               orgCode: orgRoot.orgRootCode + orgChild1.orgChild1Code,
-              orgChild1Order: orgChild1.orgChild1Order,
+              orgTreeOrder: orgChild1.orgChild1Order,
               orgRootCode: orgRoot.orgRootCode,
-              orgChild1PhoneEx: orgChild1.orgChild1PhoneEx,
-              orgChild1PhoneIn: orgChild1.orgChild1PhoneIn,
-              orgChild1Fax: orgChild1.orgChild1Fax,
+              orgTreePhoneEx: orgChild1.orgChild1PhoneEx,
+              orgTreePhoneIn: orgChild1.orgChild1PhoneIn,
+              orgTreeFax: orgChild1.orgChild1Fax,
               orgRevisionId: orgRoot.orgRevisionId,
               orgChild2: orgChild2Data
                 .filter((orgChild2) => orgChild2.orgChild1Id === orgChild1.id)
                 .map((orgChild2) => ({
-                  orgChild2Id: orgChild2.id,
+                  orgTreeId: orgChild2.id,
                   orgLevel: 2,
-                  orgChild2Name: orgChild2.orgChild2Name,
-                  orgChild2ShortName: orgChild2.orgChild2ShortName,
-                  orgChild2Code: orgChild2.orgChild2Code,
+                  orgTreeName: orgChild2.orgChild2Name,
+                  orgTreeShortName: orgChild2.orgChild2ShortName,
+                  orgTreeCode: orgChild2.orgChild2Code,
                   orgCode: orgRoot.orgRootCode + orgChild2.orgChild2Code,
-                  orgChild2Order: orgChild2.orgChild2Order,
+                  orgTreeOrder: orgChild2.orgChild2Order,
                   orgRootCode: orgRoot.orgRootCode,
-                  orgChild2PhoneEx: orgChild2.orgChild2PhoneEx,
-                  orgChild2PhoneIn: orgChild2.orgChild2PhoneIn,
-                  orgChild2Fax: orgChild2.orgChild2Fax,
+                  orgTreePhoneEx: orgChild2.orgChild2PhoneEx,
+                  orgTreePhoneIn: orgChild2.orgChild2PhoneIn,
+                  orgTreeFax: orgChild2.orgChild2Fax,
                   orgRevisionId: orgRoot.orgRevisionId,
                   orgChild3: orgChild3Data
                     .filter((orgChild3) => orgChild3.orgChild2Id === orgChild2.id)
                     .map((orgChild3) => ({
-                      orgChild3Id: orgChild3.id,
+                      orgTreeId: orgChild3.id,
                       orgLevel: 3,
-                      orgChild3Name: orgChild3.orgChild3Name,
-                      orgChild3ShortName: orgChild3.orgChild3ShortName,
-                      orgChild3Code: orgChild3.orgChild3Code,
+                      orgTreeName: orgChild3.orgChild3Name,
+                      orgTreeShortName: orgChild3.orgChild3ShortName,
+                      orgTreeCode: orgChild3.orgChild3Code,
                       orgCode: orgRoot.orgRootCode + orgChild3.orgChild3Code,
-                      orgChild3Order: orgChild3.orgChild3Order,
+                      orgTreeOrder: orgChild3.orgChild3Order,
                       orgRootCode: orgRoot.orgRootCode,
-                      orgChild3PhoneEx: orgChild3.orgChild3PhoneEx,
-                      orgChild3PhoneIn: orgChild3.orgChild3PhoneIn,
-                      orgChild3Fax: orgChild3.orgChild3Fax,
+                      orgTreePhoneEx: orgChild3.orgChild3PhoneEx,
+                      orgTreePhoneIn: orgChild3.orgChild3PhoneIn,
+                      orgTreeFax: orgChild3.orgChild3Fax,
                       orgRevisionId: orgRoot.orgRevisionId,
                       orgChild4: orgChild4Data
                         .filter((orgChild4) => orgChild4.orgChild3Id === orgChild3.id)
                         .map((orgChild4) => ({
-                          orgChild4Id: orgChild4.id,
+                          orgTreeId: orgChild4.id,
                           orgLevel: 4,
-                          orgChild4Name: orgChild4.orgChild4Name,
-                          orgChild4ShortName: orgChild4.orgChild4ShortName,
-                          orgChild4Code: orgChild4.orgChild4Code,
+                          orgTreeName: orgChild4.orgChild4Name,
+                          orgTreeShortName: orgChild4.orgChild4ShortName,
+                          orgTreeCode: orgChild4.orgChild4Code,
                           orgCode: orgRoot.orgRootCode + orgChild4.orgChild4Code,
-                          orgChild4Order: orgChild4.orgChild4Order,
+                          orgTreeOrder: orgChild4.orgChild4Order,
                           orgRootCode: orgRoot.orgRootCode,
-                          orgChild4PhoneEx: orgChild4.orgChild4PhoneEx,
-                          orgChild4PhoneIn: orgChild4.orgChild4PhoneIn,
-                          orgChild4Fax: orgChild4.orgChild4Fax,
+                          orgTreePhoneEx: orgChild4.orgChild4PhoneEx,
+                          orgTreePhoneIn: orgChild4.orgChild4PhoneIn,
+                          orgTreeFax: orgChild4.orgChild4Fax,
                           orgRevisionId: orgRoot.orgRevisionId,
                         })),
                     })),