Reorganizing internal namespaces