This makes it easier to transition everything.

- a couple of function renames for collisions
Signed-off-by: NBen Skeggs <bskeggs@redhat.com>
Reviewed-by: NLyude Paul <lyude@redhat.com>