More work for rename.