Added the rest of the rename code.