GH-18 Renaming constants and bugfix-remove labels

when entering new scope