Changed how the different name types are handled.
Merge branch 'master' of https://github.com/CantTouchDis/GenericFactory