adding cli and removing underscore