Rename some more instance variables with leading underscore