Renamed functions and variables with leading single underscore to have a
double underscore.  Renamed some functions to have better names.  Folded
functions that were split out without reason.
Signed-off-by: NMike Snitzer <snitzer@redhat.com>