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