Pass rename correctly in moveSwitch()