Name changes
added associations