CString: few renames, javadoc