modify and rename