minimizing diff by renaming