Cleanup Model names for better intent