Fixes #2242 #2243
Setting name replaced by constant
Merge pull request #231 from micrarior/3.3_2242_2243

Fixes #2242 #2243