polish: renaming