cleanup: namespace adjustments, spelling