made key names for global state more concise/consistent