Use class constants instead private variables that can be changed...
Merge branch 'move-to-using-constants'

* move-to-using-constants:
  Use class constants instead private variables that can be changed...