changing class name to suit name forming logic