Created method to get the unqualified class name. Changed the templates ...

...to use this method.