diff --git a/pkg/icingadb/v1/command.go b/pkg/icingadb/v1/command.go
index 83ee7c86..d3d47bb9 100644
--- a/pkg/icingadb/v1/command.go
+++ b/pkg/icingadb/v1/command.go
@@ -57,7 +57,7 @@ type CommandEnvvar struct {
 
 type CommandCustomvar struct {
 	CustomvarMeta `json:",inline"`
-	CommandId     types.Binary `json:"object_id"`
+	CommandId     types.Binary `json:"command_id"`
 }
 
 type Checkcommand struct {
diff --git a/pkg/icingadb/v1/host.go b/pkg/icingadb/v1/host.go
index b4cf86a0..fbab47c1 100644
--- a/pkg/icingadb/v1/host.go
+++ b/pkg/icingadb/v1/host.go
@@ -66,12 +66,12 @@ func (ab Address6Bin) Value() (driver.Value, error) {
 
 type HostCustomvar struct {
 	CustomvarMeta `json:",inline"`
-	HostId        types.Binary `json:"object_id"`
+	HostId        types.Binary `json:"host_id"`
 }
 
 type HostState struct {
 	State  `json:",inline"`
-	HostId types.Binary `json:"object_id"`
+	HostId types.Binary `json:"host_id"`
 }
 
 type Hostgroup struct {
@@ -80,13 +80,13 @@ type Hostgroup struct {
 
 type HostgroupCustomvar struct {
 	CustomvarMeta `json:",inline"`
-	HostgroupId   types.Binary `json:"object_id"`
+	HostgroupId   types.Binary `json:"hostgroup_id"`
 }
 
 type HostgroupMember struct {
 	MemberMeta  `json:",inline"`
-	HostId      types.Binary `json:"object_id"`
-	HostgroupId types.Binary `json:"group_id"`
+	HostId      types.Binary `json:"host_id"`
+	HostgroupId types.Binary `json:"hostgroup_id"`
 }
 
 func NewHost() contracts.Entity {
diff --git a/pkg/icingadb/v1/notification.go b/pkg/icingadb/v1/notification.go
index a733605b..42c6cc86 100644
--- a/pkg/icingadb/v1/notification.go
+++ b/pkg/icingadb/v1/notification.go
@@ -42,7 +42,7 @@ type NotificationRecipient struct {
 
 type NotificationCustomvar struct {
 	CustomvarMeta  `json:",inline"`
-	NotificationId types.Binary `json:"object_id"`
+	NotificationId types.Binary `json:"notification_id"`
 }
 
 func NewNotification() contracts.Entity {
diff --git a/pkg/icingadb/v1/service.go b/pkg/icingadb/v1/service.go
index 66ff3d17..4d013027 100644
--- a/pkg/icingadb/v1/service.go
+++ b/pkg/icingadb/v1/service.go
@@ -12,12 +12,12 @@ type Service struct {
 
 type ServiceCustomvar struct {
 	CustomvarMeta `json:",inline"`
-	ServiceId     types.Binary `json:"object_id"`
+	ServiceId     types.Binary `json:"service_id"`
 }
 
 type ServiceState struct {
 	State     `json:",inline"`
-	ServiceId types.Binary `json:"object_id"`
+	ServiceId types.Binary `json:"service_id"`
 }
 
 type Servicegroup struct {
@@ -26,13 +26,13 @@ type Servicegroup struct {
 
 type ServicegroupCustomvar struct {
 	CustomvarMeta  `json:",inline"`
-	ServicegroupId types.Binary `json:"object_id"`
+	ServicegroupId types.Binary `json:"servicegroup_id"`
 }
 
 type ServicegroupMember struct {
 	MemberMeta     `json:",inline"`
-	ServiceId      types.Binary `json:"object_id"`
-	ServicegroupId types.Binary `json:"group_id"`
+	ServiceId      types.Binary `json:"service_id"`
+	ServicegroupId types.Binary `json:"servicegroup_id"`
 }
 
 func NewService() contracts.Entity {
diff --git a/pkg/icingadb/v1/timeperiod.go b/pkg/icingadb/v1/timeperiod.go
index ad741b9a..06a3bd29 100644
--- a/pkg/icingadb/v1/timeperiod.go
+++ b/pkg/icingadb/v1/timeperiod.go
@@ -38,7 +38,7 @@ type TimeperiodOverrideExclude struct {
 
 type TimeperiodCustomvar struct {
 	CustomvarMeta `json:",inline"`
-	TimeperiodId  types.Binary `json:"object_id"`
+	TimeperiodId  types.Binary `json:"timeperiod_id"`
 }
 
 func NewTimeperiod() contracts.Entity {
diff --git a/pkg/icingadb/v1/user.go b/pkg/icingadb/v1/user.go
index 378da2ae..6a440500 100644
--- a/pkg/icingadb/v1/user.go
+++ b/pkg/icingadb/v1/user.go
@@ -21,7 +21,7 @@ type User struct {
 
 type UserCustomvar struct {
 	CustomvarMeta `json:",inline"`
-	UserId        types.Binary `json:"object_id"`
+	UserId        types.Binary `json:"user_id"`
 }
 
 type Usergroup struct {
@@ -30,13 +30,13 @@ type Usergroup struct {
 
 type UsergroupCustomvar struct {
 	CustomvarMeta `json:",inline"`
-	UsergroupId   types.Binary `json:"object_id"`
+	UsergroupId   types.Binary `json:"usergroup_id"`
 }
 
 type UsergroupMember struct {
 	MemberMeta  `json:",inline"`
 	UserId      types.Binary `json:"user_id"`
-	UsergroupId types.Binary `json:"group_id"`
+	UsergroupId types.Binary `json:"usergroup_id"`
 }
 
 func NewUser() contracts.Entity {