Updated MARK II class names.