fixes #3021 - introduce named constants
Merge pull request #3047 from marco-jacob/introduceConstants

fixes #3021 - introduce named constants