Rearrange CLI command names