Improved the naming system.

Instead of using the class name, now uses the new getName method