diff --git a/cql3/ColumnSpecification.java b/cql3/column_specification.hh
similarity index 88%
rename from cql3/ColumnSpecification.java
rename to cql3/column_specification.hh
index cc54375574..3c68affc7f 100644
--- a/cql3/ColumnSpecification.java
+++ b/cql3/column_specification.hh
@@ -15,13 +15,27 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+/*
+ * Copyright 2014 Cloudius Systems
+ *
+ * Modified by Cloudius Systems
+ */
+
+#ifndef CQL3_COLUMN_SPECIFICATION_HH
+#define CQL3_COLUMN_SPECIFICATION_HH
+
+namespace cql3 {
+
+#if 0
 package org.apache.cassandra.cql3;
 
 import org.apache.cassandra.db.marshal.AbstractType;
 import org.apache.cassandra.db.marshal.ReversedType;
+#endif
 
-public class ColumnSpecification
-{
+class column_specification {
+#if 0
     public final String ksName;
     public final String cfName;
     public final ColumnIdentifier name;
@@ -50,4 +64,9 @@ public class ColumnSpecification
     {
         return type instanceof ReversedType;
     }
+#endif
+};
+
 }
+
+#endif
diff --git a/cql3/cql3.cc b/cql3/cql3.cc
index 9512a492ca..2cf5d534a9 100644
--- a/cql3/cql3.cc
+++ b/cql3/cql3.cc
@@ -18,3 +18,4 @@
 
 #include "variable_specifications.hh"
 #include "column_identifier.hh"
+#include "column_specification.hh"