Upped cli version and cleaned up some further renaming problems