diff --git a/robosystems_client/graphql/queries/ledger/__init__.py b/robosystems_client/graphql/queries/ledger/__init__.py
index 1216b56..a9d2444 100644
--- a/robosystems_client/graphql/queries/ledger/__init__.py
+++ b/robosystems_client/graphql/queries/ledger/__init__.py
@@ -137,7 +137,7 @@ def parse_summary(data: dict[str, Any]) -> dict[str, Any] | None:
       code
       name
       description
-      classification
+      trait
       subClassification
       balanceType
       parentId
@@ -165,13 +165,13 @@ def parse_accounts(data: dict[str, Any]) -> dict[str, Any] | None:
   accountTree {
     totalAccounts
     roots {
-      id code name classification accountType balanceType depth isActive
+      id code name trait accountType balanceType depth isActive
       children {
-        id code name classification accountType balanceType depth isActive
+        id code name trait accountType balanceType depth isActive
         children {
-          id code name classification accountType balanceType depth isActive
+          id code name trait accountType balanceType depth isActive
           children {
-            id code name classification accountType balanceType depth isActive
+            id code name trait accountType balanceType depth isActive
           }
         }
       }
@@ -205,7 +205,7 @@ def parse_account_tree(data: dict[str, Any]) -> dict[str, Any] | None:
       reportingElementId
       reportingName
       reportingQname
-      classification
+      trait
       balanceType
       total
       accounts {
@@ -238,7 +238,7 @@ def parse_account_rollups(data: dict[str, Any]) -> dict[str, Any] | None:
       accountId
       accountCode
       accountName
-      classification
+      trait
       accountType
       totalDebits
       totalCredits
@@ -270,7 +270,7 @@ def parse_trial_balance(data: dict[str, Any]) -> dict[str, Any] | None:
       reportingElementId
       qname
       reportingName
-      classification
+      trait
       balanceType
       totalDebits
       totalCredits
@@ -395,7 +395,7 @@ def parse_taxonomies(data: dict[str, Any]) -> list[dict[str, Any]]:
   ) {
     elements {
       id code name description qname namespace
-      classification subClassification balanceType periodType
+      trait subClassification balanceType periodType
       isAbstract elementType source taxonomyId parentId depth
       isActive externalId externalSource
     }
@@ -413,7 +413,7 @@ def parse_elements(data: dict[str, Any]) -> dict[str, Any] | None:
 LIST_UNMAPPED_ELEMENTS_QUERY = """
 query ListLedgerUnmappedElements($mappingId: String) {
   unmappedElements(mappingId: $mappingId) {
-    id code name classification balanceType externalSource
+    id code name trait balanceType externalSource
     suggestedTargets { elementId qname name confidence }
   }
 }
@@ -697,7 +697,7 @@ def parse_report(data: dict[str, Any]) -> dict[str, Any] | None:
     reportId structureId structureName structureType unmappedCount
     periods { start end label }
     rows {
-      elementId elementQname elementName classification
+      elementId elementQname elementName trait
       values isSubtotal depth
     }
     validation { passed checks failures warnings }
diff --git a/robosystems_client/graphql/queries/library/__init__.py b/robosystems_client/graphql/queries/library/__init__.py
index 8db714c..1013178 100644
--- a/robosystems_client/graphql/queries/library/__init__.py
+++ b/robosystems_client/graphql/queries/library/__init__.py
@@ -108,7 +108,7 @@ def parse_library_taxonomy(data: dict[str, Any]) -> dict[str, Any] | None:
     qname
     namespace
     name
-    classification
+    trait
     statementContext
     derivationRole
     balanceType
@@ -146,7 +146,7 @@ def parse_library_elements(data: dict[str, Any]) -> list[dict[str, Any]]:
     qname
     namespace
     name
-    classification
+    trait
     statementContext
     derivationRole
     balanceType
@@ -184,7 +184,7 @@ def parse_library_search_results(data: dict[str, Any]) -> list[dict[str, Any]]:
     qname
     namespace
     name
-    classification
+    trait
     statementContext
     derivationRole
     balanceType
@@ -272,7 +272,7 @@ def parse_library_taxonomy_arcs(data: dict[str, Any]) -> dict[str, Any]:
       id
       qname
       name
-      classification
+      trait
       statementContext
       derivationRole
       source
@@ -294,7 +294,7 @@ def parse_library_element_arcs(data: dict[str, Any]) -> list[dict[str, Any]]:
       id
       qname
       name
-      classification
+      trait
       statementContext
       derivationRole
       source
@@ -303,7 +303,7 @@ def parse_library_element_arcs(data: dict[str, Any]) -> list[dict[str, Any]]:
       id
       qname
       name
-      classification
+      trait
       statementContext
       derivationRole
       source