Fix and rename