Update to new namespace