Merge "Use canonical class name."