Merge "Mechanism for renaming/aliasing classes"