diff --git a/configobject/configsync/configsync.go b/configobject/configsync/configsync.go
index 5f7f48ae..d8071a38 100644
--- a/configobject/configsync/configsync.go
+++ b/configobject/configsync/configsync.go
@@ -16,7 +16,7 @@ import (
 
 type Checksums struct {
 	NameChecksum          string  `json:"name_checksum"`
-	PropertiesChecksum    string  `json:"properties_checksum"`
+	PropertiesChecksum    string  `json:"checksum"`
 	CustomvarsChecksum    string  `json:"customvars_checksum"`
 	GroupsChecksum        string  `json:"groups_checksum"`
 }
diff --git a/configobject/objecttypes/endpoint/endpoint.go b/configobject/objecttypes/endpoint/endpoint.go
index da7be36d..20463b79 100644
--- a/configobject/objecttypes/endpoint/endpoint.go
+++ b/configobject/objecttypes/endpoint/endpoint.go
@@ -21,9 +21,9 @@ var (
 
 type Endpoint struct {
 	Id                  string  `json:"id"`
-	EnvId               string  `json:"environment_id"`
+	EnvId               string  `json:"env_id"`
 	NameChecksum        string  `json:"name_checksum"`
-	PropertiesChecksum  string  `json:"properties_checksum"`
+	PropertiesChecksum  string  `json:"checksum"`
 	Name                string  `json:"name"`
 	NameCi              *string `json:"name_ci"`
 	ZoneId            	string  `json:"zone_id"`
diff --git a/configobject/objecttypes/host/host.go b/configobject/objecttypes/host/host.go
index 22964d3c..328ded8f 100644
--- a/configobject/objecttypes/host/host.go
+++ b/configobject/objecttypes/host/host.go
@@ -55,9 +55,9 @@ var (
 
 type Host struct {
 	Id                    string  `json:"id"`
-	EnvId                 string  `json:"environment_id"`
+	EnvId                 string  `json:"env_id"`
 	NameChecksum          string  `json:"name_checksum"`
-	PropertiesChecksum    string  `json:"properties_checksum"`
+	PropertiesChecksum    string  `json:"checksum"`
 	CustomvarsChecksum    string  `json:"customvars_checksum"`
 	GroupsChecksum        string  `json:"groups_checksum"`
 	Name                  string  `json:"name"`
diff --git a/configobject/objecttypes/hostgroup/hostgroup.go b/configobject/objecttypes/hostgroup/hostgroup.go
index 11489893..7ba7bac8 100644
--- a/configobject/objecttypes/hostgroup/hostgroup.go
+++ b/configobject/objecttypes/hostgroup/hostgroup.go
@@ -23,9 +23,9 @@ var (
 
 type Hostgroup struct {
 	Id                    string  `json:"id"`
-	EnvId                 string  `json:"environment_id"`
+	EnvId                 string  `json:"env_id"`
 	NameChecksum          string  `json:"name_checksum"`
-	PropertiesChecksum    string  `json:"properties_checksum"`
+	PropertiesChecksum    string  `json:"checksum"`
 	CustomvarsChecksum    string  `json:"customvars_checksum"`
 	Name                  string  `json:"name"`
 	NameCi                *string `json:"name_ci"`
diff --git a/configobject/objecttypes/service/service.go b/configobject/objecttypes/service/service.go
index 3201f1a5..19e878f0 100644
--- a/configobject/objecttypes/service/service.go
+++ b/configobject/objecttypes/service/service.go
@@ -52,9 +52,9 @@ var (
 
 type Service struct {
 	Id                    string  `json:"id"`
-	EnvId                 string  `json:"environment_id"`
+	EnvId                 string  `json:"env_id"`
 	NameChecksum          string  `json:"name_checksum"`
-	PropertiesChecksum    string  `json:"properties_checksum"`
+	PropertiesChecksum    string  `json:"checksum"`
 	CustomvarsChecksum    string  `json:"customvars_checksum"`
 	GroupsChecksum        string  `json:"groups_checksum"`
 	HostId                string  `json:"host_id"`
diff --git a/configobject/objecttypes/servicegroup/servicegroup.go b/configobject/objecttypes/servicegroup/servicegroup.go
index c007e020..98d34c9d 100644
--- a/configobject/objecttypes/servicegroup/servicegroup.go
+++ b/configobject/objecttypes/servicegroup/servicegroup.go
@@ -23,9 +23,9 @@ var (
 
 type Servicegroup struct {
 	Id                    string  `json:"id"`
-	EnvId                 string  `json:"environment_id"`
+	EnvId                 string  `json:"env_id"`
 	NameChecksum          string  `json:"name_checksum"`
-	PropertiesChecksum    string  `json:"properties_checksum"`
+	PropertiesChecksum    string  `json:"checksum"`
 	CustomvarsChecksum    string  `json:"customvars_checksum"`
 	Name                  string  `json:"name"`
 	NameCi                *string `json:"name_ci"`
diff --git a/configobject/objecttypes/user/user.go b/configobject/objecttypes/user/user.go
index f73f6cc8..be3831bc 100644
--- a/configobject/objecttypes/user/user.go
+++ b/configobject/objecttypes/user/user.go
@@ -30,9 +30,9 @@ var (
 
 type User struct {
 	Id						string  `json:"id"`
-	EnvId					string  `json:"environment_id"`
+	EnvId					string  `json:"env_id"`
 	NameChecksum			string  `json:"name_checksum"`
-	PropertiesChecksum  	string  `json:"properties_checksum"`
+	PropertiesChecksum  	string  `json:"checksum"`
 	CustomvarsChecksum  	string  `json:"customvars_checksum"`
 	GroupsChecksum      	string  `json:"groups_checksum"`
 	Name                	string  `json:"name"`
diff --git a/configobject/objecttypes/usergroup/usergroup.go b/configobject/objecttypes/usergroup/usergroup.go
index b95c98be..46d48c2f 100644
--- a/configobject/objecttypes/usergroup/usergroup.go
+++ b/configobject/objecttypes/usergroup/usergroup.go
@@ -23,9 +23,9 @@ var (
 
 type Usergroup struct {
 	Id                    string  `json:"id"`
-	EnvId                 string  `json:"environment_id"`
+	EnvId                 string  `json:"env_id"`
 	NameChecksum          string  `json:"name_checksum"`
-	PropertiesChecksum    string  `json:"properties_checksum"`
+	PropertiesChecksum    string  `json:"checksum"`
 	CustomvarsChecksum    string  `json:"customvars_checksum"`
 	Name                  string  `json:"name"`
 	NameCi                *string `json:"name_ci"`
diff --git a/configobject/objecttypes/zone/zone.go b/configobject/objecttypes/zone/zone.go
index 076b0762..aaaaffeb 100644
--- a/configobject/objecttypes/zone/zone.go
+++ b/configobject/objecttypes/zone/zone.go
@@ -23,9 +23,9 @@ var (
 
 type Zone struct {
 	Id                  string  `json:"id"`
-	EnvId               string  `json:"environment_id"`
+	EnvId               string  `json:"env_id"`
 	NameChecksum        string  `json:"name_checksum"`
-	PropertiesChecksum  string  `json:"properties_checksum"`
+	PropertiesChecksum  string  `json:"checksum"`
 	ParentsChecksum     string  `json:"parents_checksum"`
 	Name                string  `json:"name"`
 	NameCi              *string `json:"name_ci"`