Start the work of bringing variable names in line with coding style guidelines
Merge pull request #463 from fahadhatib/develop

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