More code for rename, reorganize tape utilities