Updated naming conventions and relationships between the models.