When renaming return id map as well