Namespacing changes complete.