Improve the naming of cli stuff
Don't use use statement when using sub-namespace of current