Revert "Update naming scope"

This reverts commit 351115afda1fce39e2312364754e595568d5bfdb.