[Coding style] do not use leading underscore for names
Merge remote-tracking branch 'upstream/next' into next
Merge pull request #138 from alexander-zimmermann/next

No leading underscore for names