#33: Improve public fields definition.
Merge branch '7.x-1.x' into 31
Rename files.