Fixing the replaced CLI commands and thier options.