Cleaned up more changed field names in admin