Let me do an audit about the different ways `command_mode` and `edit_mode` are called to see which makes more sense. I agree that consistency makes sense here.