Fixing oversights in renaming private vars...