Rename some variables from FOO to FOO_CMD