Changed fields to remove leading underscore in templates