Added command_ prefix to CLI commands to fix import problems.