Completed namespacing changes