Refactor and rename existing interfaces to be more specific and
self-documenting.
Signed-off-by: NMike Snitzer <snitzer@redhat.com>