Associations names refactor