Issue 3066: Classes using TextConstants as a common Dictionary

Issue 3067: TextConstants used in different ways