move around things to match the change in action names