Commit 5

Bad smell = Inconsistent variable names

Renamed variables in classes to be consistent with rest of code.