Minor changes in namespace