Ensure everything has a name

Make sure everything has a name and that it matches expectations in the models, etc.