Refactor namespaces and command names.
Doc & typos