Deprecate group names in constants