Changed class names.