diff --git a/src/oca/go/src/goca/cluster.go b/src/oca/go/src/goca/cluster.go
index b9c8e025e8..3056c3773f 100644
--- a/src/oca/go/src/goca/cluster.go
+++ b/src/oca/go/src/goca/cluster.go
@@ -39,7 +39,7 @@ type Cluster struct {
 type clusterTemplate struct {
 	// Example of reservation: https://github.com/OpenNebula/addon-storpool/blob/ba9dd3462b369440cf618c4396c266f02e50f36f/misc/reserved.sh
 	ReservedMem string             `xml:"RESERVED_MEM"`
-	ReservedCpu string             `xml:"RESERVED_CPU"`
+	ReservedCPU string             `xml:"RESERVED_CPU"`
 	Dynamic     unmatchedTagsSlice `xml:",any"`
 }
 
diff --git a/src/oca/go/src/goca/host.go b/src/oca/go/src/goca/host.go
index 3667bc699c..10b7e4f0bd 100644
--- a/src/oca/go/src/goca/host.go
+++ b/src/oca/go/src/goca/host.go
@@ -80,7 +80,7 @@ type hostDS struct {
 type hostTemplate struct {
 	// Example of reservation: https://github.com/OpenNebula/addon-storpool/blob/ba9dd3462b369440cf618c4396c266f02e50f36f/misc/reserved.sh
 	ReservedMem int                `xml:"RESERVED_MEM"`
-	ReservedCpu int                `xml:"RESERVED_CPU"`
+	ReservedCPU int                `xml:"RESERVED_CPU"`
 	Dynamic     unmatchedTagsSlice `xml:",any"`
 }
 
diff --git a/src/oca/go/src/goca/marketplaceapp.go b/src/oca/go/src/goca/marketplaceapp.go
index aa8aef15c6..783e776fb8 100644
--- a/src/oca/go/src/goca/marketplaceapp.go
+++ b/src/oca/go/src/goca/marketplaceapp.go
@@ -37,8 +37,8 @@ type MarketPlaceApp struct {
 	Permissions   *Permissions           `xml:"PERMISSIONS"`
 	RegTime       int                    `xml:"REGTIME"`
 	Name          string                 `xml:"NAME"`
-	ZoneId        string                 `xml:"ZONE_ID"`
-	OriginId      string                 `xml:"ORIGIN_ID"`
+	ZoneID        string                 `xml:"ZONE_ID"`
+	OriginID      string                 `xml:"ORIGIN_ID"`
 	Source        string                 `xml:"SOURCE"`
 	MD5           string                 `xml:"MD5"`
 	Size          int                    `xml:"SIZE"`
diff --git a/src/oca/go/src/goca/quota.go b/src/oca/go/src/goca/quota.go
index e9116693e4..6249c0a3f7 100644
--- a/src/oca/go/src/goca/quota.go
+++ b/src/oca/go/src/goca/quota.go
@@ -47,8 +47,8 @@ type vmQuota struct {
 	CPUUsed            string `xml:"CPU_USED"`
 	Memory             string `xml:"MEMORY"`
 	MemoryUsed         string `xml:"MEMORY_USED"`
-	RunningCpu         string `xml:"RUNNING_CPU"`
-	RunningCpuUsed     string `xml:"RUNNING_CPU_USED"`
+	RunningCPU         string `xml:"RUNNING_CPU"`
+	RunningCPUUsed     string `xml:"RUNNING_CPU_USED"`
 	RunningMemory      string `xml:"RUNNING_MEMORY"`
 	RunningMemoryUsed  string `xml:"RUNNING_MEMORY_USED"`
 	RunningVMs         string `xml:"RUNNING_VMS"`
diff --git a/src/oca/go/src/goca/template.go b/src/oca/go/src/goca/template.go
index 6e584c3496..8d8ee0ef32 100644
--- a/src/oca/go/src/goca/template.go
+++ b/src/oca/go/src/goca/template.go
@@ -54,7 +54,7 @@ type templateTemplate struct {
 }
 
 type templateContext struct {
-	Dynamic unmatchedTagsSlice `xml:",any"`
+	Dynamic unmatchedTagsMap `xml:",any"`
 }
 
 type templateDisk struct {
diff --git a/src/oca/go/src/goca/virtualnetwork.go b/src/oca/go/src/goca/virtualnetwork.go
index 0f912f0ad9..6b73799771 100644
--- a/src/oca/go/src/goca/virtualnetwork.go
+++ b/src/oca/go/src/goca/virtualnetwork.go
@@ -59,7 +59,7 @@ type virtualNetworkTemplate struct {
 }
 
 type virtualNetworkAR struct {
-	ARID              string  `xml:"AR_ID"`
+	ID                string  `xml:"AR_ID"`
 	GlobalPrefix      string  `xml:"GLOBAL_PREFIX"` // minOccurs=0
 	IP                string  `xml:"IP"`            // minOccurs=0
 	MAC               string  `xml:"MAC"`
diff --git a/src/oca/go/src/goca/vm.go b/src/oca/go/src/goca/vm.go
index 642b4713be..ffbb749fad 100644
--- a/src/oca/go/src/goca/vm.go
+++ b/src/oca/go/src/goca/vm.go
@@ -98,17 +98,17 @@ type vmUserTemplate struct {
 }
 
 type vmTemplate struct {
-	CPU               float64               `xml:"CPU"`
-	Memory            int                   `xml:"MEMORY"`
-	NIC               []vmNic               `xml:"NIC"`
-	NICAlias          []vmNicAlias          `xml:"NIC_ALIAS"`
-	Context           *vmContext            `xml:"CONTEXT"`
-	Disk              []vmDisk              `xml:"DISK"`
-	Graphics          *vmGraphics           `xml:"GRAPHICS"`
-	OS                *vmOS                 `xml:"OS"`
-	Snapshot          []VMSnapshot          `xml:"SNAPSHOT"`
-	SecurityGroupRule []vmSecurityGroupRule `xml:"SECURITY_GROUP_RULE"`
-	Dynamic           unmatchedTagsSlice    `xml:",any"`
+	CPU                float64               `xml:"CPU"`
+	Memory             int                   `xml:"MEMORY"`
+	NICs               []vmNic               `xml:"NIC"`
+	NICAliases         []vmNicAlias          `xml:"NIC_ALIAS"`
+	Context            *vmContext            `xml:"CONTEXT"`
+	Disks              []vmDisk              `xml:"DISK"`
+	Graphics           *vmGraphics           `xml:"GRAPHICS"`
+	OS                 *vmOS                 `xml:"OS"`
+	Snapshots          []VMSnapshot          `xml:"SNAPSHOT"`
+	SecurityGroupRules []vmSecurityGroupRule `xml:"SECURITY_GROUP_RULE"`
+	Dynamic            unmatchedTagsSlice    `xml:",any"`
 }
 
 type vmContext struct {
@@ -127,7 +127,7 @@ type vmNic struct {
 type vmNicAlias struct {
 	ID       int    `xml:"NIC_ID"`    // minOccurs=1
 	Parent   string `xml:"PARENT"`    // minOccurs=1
-	ParentId string `xml:"PARENT_ID"` // minOccurs=1
+	ParentID string `xml:"PARENT_ID"` // minOccurs=1
 }
 
 type vmGraphics struct {