Change variable names to be more consistent

Only passed method parameters should start with _ for consistency.