Tidy up the model naming.