refactor command name spaces