Removed "Code" from field names