Changed class names etc