Consistent variable names

As the rest of the code here uses camel casing, then these last few cases should also do so.

Whether camel casing is the best way to name variables is a different question.