[fix] Update tests to reflect new namespace
[dev] Update docblocks to reflect new namespace

[ci skip]