Switched C++ namespace back to "cljp"