Prepare for namespacing changes