Change class names to make more consistent.