Clean syntax

rubofvilrequested to merge
3.x-dev-clean-code into 3.x

There isn't new functionality, only use one convention naming CamelCase, clean syntax.

Merge request reports