Update associations for specific class names

This updates all the associations so we can specify a specific class name when needed