do some renaming