Development to master merge.

First of all, prefixes and postfixes are used only for private fields of the class.
The second, we used to use postfix_ instead of mPrefix.