Changed a few class names