change some member properties to follow new underscore convention
remove Playground strings
Merge remote-tracking branch 'ba/master'