Rename functions and variables for consistency, and move some functions

around for readability, prior to forthcoming functional changes.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@491729 13f79535-47bb-0310-9956-ffa450edef68