Issue #843: Fixed constant names with correct values this time