improve of handling of gemset rename, update #2130