Changed class names and concepts