Start the work of bringing variable names in line with coding style guid...

...elines