diff --git a/id/organization.go b/id/organization.go
index 5aedfb709ef6ff5bde9fd7f06bcba49f07fbd643..a3a9d7e8031d467e6594bc8f7629fba2bec7220c 100644
--- a/id/organization.go
+++ b/id/organization.go
@@ -35,13 +35,13 @@ func (id *OrganizationId) FromParts(parts []string) error {
 
 func (id *OrganizationId) Map() map[string]any {
 	return map[string]any{
-		"organization_id": id.OrganizationID,
-		"type":            id.Type(),
+		"org_id": id.OrganizationID,
+		"type":   id.Type(),
 	}
 }
 
 func (id *OrganizationId) FromMap(m map[string]any) error {
-	id.OrganizationID, _ = m["organization_id"].(string)
+	id.OrganizationID, _ = m["org_id"].(string)
 	if id.OrganizationID == "" {
 		return fmt.Errorf("%w: OrganizationId required", ErrInvalidID)
 	}
diff --git a/id/test/object_id_test.go b/id/test/object_id_test.go
index f97e50e49068173b5aa1968de33abc4d8a44817b..ec2cd931d54b47696b9b3a4d76218e27448f3c64 100644
--- a/id/test/object_id_test.go
+++ b/id/test/object_id_test.go
@@ -38,7 +38,7 @@ func Test_OrganizationId(t *testing.T) {
 		},
 		{
 			name:   "valid map",
-			in:     map[string]any{"type": "organization", "organization_id": "<org_id>"},
+			in:     map[string]any{"type": "organization", "org_id": "<org_id>"},
 			out:    "/orgs/<org_id>",
 			result: &id.ObjectId{Descriptor: &id.OrganizationId{OrganizationID: "<org_id>"}},
 		},