Fix many/some name swap