Re-work names to be consistent with the new models.