Fixed field names that were not using the bundle constant