Changed class names to follow official conventions.