Use cn() for class names throughout

Use cn() for class names throughout #4639