CXX-175 spelling and namespaces