diff --git a/dictionary.json b/dictionary.json
index 843280838..13ba01c4b 100644
--- a/dictionary.json
+++ b/dictionary.json
@@ -2059,12 +2059,12 @@
       "type": "string_t",
       "description": "Name of the Active Directory Forest."
     },
-    "force_change_password_next_sign_in": {
+    "force_pw_change": {
       "caption": "Force Change Password Next SignIn",
       "description": "Specifies if the user has to change the password in the next sign in. true if the user must change their password on the next sign-in; otherwise false. If not set, default is false",
       "type": "boolean_t"
     },
-    "force_change_password_next_sign_in_with_mfa": {
+    "force_pw_change_with_mfa": {
       "caption": "Force Change Password Next SignIn With Mfa",
       "description": "Specifies if the user has to change the password in the next sign in with MFA.If true, at next sign-in, the user must perform a multifactor authentication (MFA) before being forced to change their password.",
       "type": "boolean_t"
@@ -3090,7 +3090,7 @@
       "description": "The primary office location associated with the user. This could be any string and isn't a specific address. For example, <code>South East Virtual</code>.",
       "type": "string_t"
     },
-    "on_premises_distinguished_name": {
+    "on_prem_dn": {
       "caption": "On Premises Distinguished Name",
       "description": "The distinguished name of the user in the on-premises Active Directory.",
       "type": "string_t"
@@ -4747,7 +4747,7 @@
       "description": "The result of the user account change. It should contain the new values of the changed attributes.",
       "type": "user"
     },
-    "user_password_expiry_computed_time": {
+    "pw_expiry": {
       "caption": "User Password Expiry Time",
       "type": "timestamp_t",
       "description": "The expiry time for the user's current password."
@@ -4854,37 +4854,6 @@
       "description": "The version that pertains to the event or object. See specific usage.",
       "type": "string_t"
     },
-    "visibility": {
-      "caption": "Visibility",
-      "description": "Specifies the group join policy and group content visibility for groups. Possible values are: Private, Public, or HiddenMembership.",
-      "type": "string_t"
-    },
-    "visibility_id": {
-      "caption": "Visibility ID",
-      "description": "The identifier of the normalized visibility id.",
-      "type": "integer_t",
-      "sibling": "visibility",
-      "enum": {
-        "0": {
-          "caption": "Unknown"
-        },
-        "1": {
-          "caption": "Private",
-          "description": "The group is private."
-        },
-        "2": {
-          "caption": "Public",
-          "description": "The group is public."
-        },
-        "3": {
-          "caption": "HiddenMembership",
-          "description": "The group is hidden."
-        },
-        "99": {
-          "caption": "Other"
-        }
-      }
-    },
     "vlan_uid": {
       "caption": "VLAN",
       "description": "The Virtual LAN identifier.",
diff --git a/objects/ldap_person.json b/objects/ldap_person.json
index ad7f24929..7d0db31ca 100644
--- a/objects/ldap_person.json
+++ b/objects/ldap_person.json
@@ -53,10 +53,10 @@
       "description": "Timestamp of when the group is set to expire",
       "type": "timestamp_t"
     },
-    "force_change_password_next_sign_in": {
+    "force_pw_change": {
       "requirement": "optional"
     },
-    "force_change_password_next_sign_in_with_mfa": {
+    "force_pw_change_with_mfa": {
         "requirement": "optional"
     },
     "given_name": {
@@ -155,13 +155,7 @@
     "user_account_control": {
       "requirement": "recommended"
     },
-    "user_password_expiry_computed_time": {
-      "requirement": "optional"
-    },
-    "visibility": {
-      "requirement": "optional"
-    },
-    "visibility_id": {
+    "pw_expiry": {
       "requirement": "optional"
     }
   }
diff --git a/profiles/active_directory.json b/profiles/active_directory.json
index 499097d43..6ca19513c 100644
--- a/profiles/active_directory.json
+++ b/profiles/active_directory.json
@@ -32,7 +32,7 @@
     "object_sid": {
       "requirement": "recommended"
     },
-    "on_premises_distinguished_name": {
+    "on_prem_dn": {
       "requirement": "optional"
     },
     "on_premises_domain_name": {