Revert "Revert "Update naming scope""

This reverts commit 471f6d5beb3b417a60ed87bfae294caf5ced6cfc.