Fixes for the RenameCode