First pass attempt to bring the code base under a single coding
style. Renamed numerous method and variable names.