Some renaming leftovers.