Moved logic to Abstract Factory

Logic for making default class/relationship name was improperly placed
in controller vs abstract factory