diff --git a/include/bcc/bcc.h b/include/bcc/bcc.h
index fc1140b..134ebc0 100644
--- a/include/bcc/bcc.h
+++ b/include/bcc/bcc.h
@@ -30,17 +30,14 @@
 #if !defined(__cplusplus)
 
 typedef struct BCCscript            BCCscript;
-typedef struct BCCtype              BCCtype;
 
 #else
 
 namespace bcc {
-  class BCCscript;
-  class BCCtype;
+  class Script;
 }
 
-typedef bcc::BCCscript              BCCscript;
-typedef bcc::BCCtype                BCCtype;
+typedef bcc::Script                 BCCscript;
 
 #endif
 
diff --git a/lib/bcc/Script.h b/lib/bcc/Script.h
index 5307f07..21ecf4c 100644
--- a/lib/bcc/Script.h
+++ b/lib/bcc/Script.h
@@ -23,7 +23,7 @@
 
 namespace bcc {
 
-  class BCCscript {
+  class Script {
   public:
     //////////////////////////////////////////////////////////////////////////
     // Part I. Compiler
@@ -37,11 +37,11 @@
     //////////////////////////////////////////////////////////////////////////
     // Part II. Logistics & Error handling
     //////////////////////////////////////////////////////////////////////////
-    BCCscript() {
+    Script() {
       bccError = BCC_NO_ERROR;
     }
 
-    ~BCCscript() {
+    ~Script() {
     }
 
     void setError(BCCenum error) {