Migrate to new namespace
Eliminate merge conflicts