Convert some more variable names to FOO_CMD, for consistency