Refactored API keys from camelCase to underscores