Rename - clean up.