cli: Fix left-over ANN/PROTO names.