diff --git a/mapper/creator.go b/mapper/creator.go
index ca58f3fd..6d5ac964 100644
--- a/mapper/creator.go
+++ b/mapper/creator.go
@@ -24,7 +24,8 @@ func (c *Creator) ToInternal(data map[string]interface{}) {
 func (c *Creator) ModifySchema(schema *types.Schema, schemas *types.Schemas) error {
 	if schema.CanList() && schema.CanCreate() {
 		schema.ResourceFields["creatorId"] = types.Field{
-			Type: "reference[user]",
+			Type:     "reference[user]",
+			CodeName: "CreatorID",
 		}
 		c.m = &mapper.AnnotationField{Field: "creatorId"}
 		return c.m.ModifySchema(schema, schemas)
diff --git a/mapper/node_address.go b/mapper/node_address.go
index 8348e1bb..2cf19f1e 100644
--- a/mapper/node_address.go
+++ b/mapper/node_address.go
@@ -14,7 +14,7 @@ func (n NodeAddressMapper) FromInternal(data map[string]interface{}) {
 		t := address["type"]
 		a := address["address"]
 		if t == "InternalIP" {
-			data["IpAddress"] = a
+			data["ipAddress"] = a
 		} else if t == "Hostname" {
 			data["hostname"] = a
 		}