Rename some private methods/attributes to align with what they do

No functional changes, just a s///