Removed namespace from global constants