Implemented renaming, more tests pass.