Removed the hard-coded "__" from the CLI back-end.

Signed-off-by: Dimitar Dobrev <dpldobrev@yahoo.com>