fix and rename