Fix naming in CLI