more namespace renaming