Rejigged all models for new naming convention