Base lib private members style

Continuing replacement of private member variable underscore placement. See !2920 (merged)

I've separated formatting (second commit) from the actual change (first commit).