diff --git a/src/Utility.cc b/src/Utility.cc
index 60fd0e7..0035006 100644
--- a/src/Utility.cc
+++ b/src/Utility.cc
@@ -10,14 +10,14 @@ std::string clangmm::to_string(CXString cx_string) {
   return string;
 }
 
-clangmm::CString::CString(const CXString &cx_string) : cx_string(cx_string) {
+clangmm::String::String(const CXString &cx_string) : cx_string(cx_string) {
   if(cx_string.data!=NULL)
-    data=clang_getCString(cx_string);
+    c_str=clang_getCString(cx_string);
   else
-    data="";
+    c_str="";
 }
 
-clangmm::CString::~CString() {
+clangmm::String::~String() {
   if(cx_string.data!=NULL)
     clang_disposeString(cx_string);
 }
diff --git a/src/Utility.h b/src/Utility.h
index 2564707..2d8a3bf 100644
--- a/src/Utility.h
+++ b/src/Utility.h
@@ -6,12 +6,12 @@
 namespace clangmm {
   std::string to_string(CXString cx_string);
   
-  class CString {
+  class String {
   public:
-    CString(const CXString &cx_string);
-    ~CString();
+    String(const CXString &cx_string);
+    ~String();
     CXString cx_string;
-    const char *data;
+    const char *c_str;
   };
   
   void remove_include_guard(std::string &buffer);