fixed associations and alias names