Adapted some class names for naming conventions.