Scoped namespace prefix.
Refactor - and ensure keys handle hot-code push.