Move to using named commands