Clarify namespaces to help out doxygen.
Fix capitalization.