Changeda  few class names to match git repo