Refactor to generalize the Scope and ensure CamelCase for constant-like values