Continued namespace renaming