Removed underscores from field names