#4137 namespace cleanup

avoid namespace and type name collisions
#4137 namespace cleanup