Merge "Fix class name handling in DeprecationHelper"