Fixed all commands and variables to be static and not tied to a
particular CLI.