Rationalize class names