refactored, rename OK
add and rename done, need delete