Merge "Revert "Mechanism for renaming/aliasing classes""