Fix for generic renaming error