Various namespace cleanup/rename operations
Various namespace cleanup/rename operations