modified all class names to suit code convention