Further class name reference changes