Some commands and constants have been renamed; adjust the code
accordingly.
Signed-off-by: NBen Hutchings <bhutchings@solarflare.com>