Renaming private fields to keep code-style consistent