Merge "Use canonical class name, remove unused globals."