cleaning up model name changes