Fix stale references to functions that have been renamed and fix typo.
Signed-off-by: Mike Snitzer <snitzer@redhat.com>