Also this gets little bit cleaned IMHO; before we used to create classes with bad names, changing them afterwards. I think it will be easier to understand when we pass the requested class name and use it always (not changing it afterwards).