New and deprecated class names