Changed class names slightly