Being a little more consistant and renamiong CLI to Cli