diff --git a/conf/storage-conf.xml b/conf/storage-conf.xml
index 1115255542..52ba1c0cfa 100644
--- a/conf/storage-conf.xml
+++ b/conf/storage-conf.xml
@@ -25,19 +25,20 @@
          one logical cluster from joining any other cluster. -->
     <ClusterName>Test Cluster</ClusterName>
 
-    <!-- Tables and ColumnFamilies                                            
-         Think of a table as a namespace, not a relational table.
-         (ColumnFamilies are closer in meaning to those.)
+    <!-- Keyspaces and ColumnFamilies                                            
+         A ColumnFamily is the Cassandra concept closest to a relational table.
+         Keyspaces are separate groups of ColumnFamilies.  Except in very
+         unusual circumstances you will have one Keyspace per application.
 
-         There is an implicit table named 'system' for Cassandra internals.
+         There is an implicit keyspace named 'system' for Cassandra internals.
 
          The default ColumnSort is Time for standard column families.
          For super column families, specifying ColumnSort is not supported;
          the supercolumns themselves are always name-sorted and their subcolumns
          are always time-sorted.
     -->
-    <Tables>
-        <Table Name="Table1">
+    <Keyspaces>
+        <Keyspace Name="Keyspace1">
             <!-- The fraction of keys per sstable whose locations we
                  keep in memory in "mostly LRU" order.  (JUST the key
                  locations, NOT any column values.)
@@ -72,8 +73,8 @@
             <ColumnFamily CompareWith="UTF8Type" Name="Standard2"/>
             <ColumnFamily CompareWith="UUIDType" Name="StandardByUUID1"/>
             <ColumnFamily ColumnType="Super" CompareWith="UTF8Type" CompareSubcolumnsWith="UTF8Type" Name="Super1"/>
-        </Table>
-    </Tables>
+        </Keyspace>
+    </Keyspaces>
 
     <!-- Partitioner: any IPartitioner may be used, including your own
          as long as it is on the classpath.  Out of the box,
diff --git a/interface/cassandra.thrift b/interface/cassandra.thrift
index bc2136063f..43cfd03cfa 100644
--- a/interface/cassandra.thrift
+++ b/interface/cassandra.thrift
@@ -72,7 +72,7 @@ struct CqlResult {
 exception NotFoundException {
 }
 
-# invalid request (table / CF does not exist, etc.)
+# invalid request (keyspace / CF does not exist, etc.)
 exception InvalidRequestException {
     1: string why
 }
@@ -119,41 +119,41 @@ struct ColumnPathOrParent {
 
 
 service Cassandra {
-  list<Column> get_slice_by_names(1:string table, 2:string key, 3:ColumnParent column_parent, 4:list<binary> column_names, 5:ConsistencyLevel consistency_level=1)
+  list<Column> get_slice_by_names(1:string keyspace, 2:string key, 3:ColumnParent column_parent, 4:list<binary> column_names, 5:ConsistencyLevel consistency_level=1)
   throws (1: InvalidRequestException ire, 2: NotFoundException nfe),
   
-  list<Column> get_slice(1:string table, 2:string key, 3:ColumnParent column_parent, 4:binary start, 5:binary finish, 6:bool is_ascending, 7:i32 count=100, 8:ConsistencyLevel consistency_level=1)
+  list<Column> get_slice(1:string keyspace, 2:string key, 3:ColumnParent column_parent, 4:binary start, 5:binary finish, 6:bool is_ascending, 7:i32 count=100, 8:ConsistencyLevel consistency_level=1)
   throws (1: InvalidRequestException ire, 2: NotFoundException nfe),
 
-  Column       get_column(1:string table, 2:string key, 3:ColumnPath column_path, 4:ConsistencyLevel consistency_level=1)
+  Column       get_column(1:string keyspace, 2:string key, 3:ColumnPath column_path, 4:ConsistencyLevel consistency_level=1)
   throws (1: InvalidRequestException ire, 2: NotFoundException nfe),
 
-  i32            get_column_count(1:string table, 2:string key, 3:ColumnParent column_parent, 5:ConsistencyLevel consistency_level=1)
+  i32            get_column_count(1:string keyspace, 2:string key, 3:ColumnParent column_parent, 5:ConsistencyLevel consistency_level=1)
   throws (1: InvalidRequestException ire),
 
-  void     insert(1:string table, 2:string key, 3:ColumnPath column_path, 4:binary value, 5:i64 timestamp, 6:ConsistencyLevel consistency_level=0)
+  void     insert(1:string keyspace, 2:string key, 3:ColumnPath column_path, 4:binary value, 5:i64 timestamp, 6:ConsistencyLevel consistency_level=0)
   throws (1: InvalidRequestException ire, 2: UnavailableException ue),
 
-  void     batch_insert(1:string table, 2:BatchMutation batch_mutation, 3:ConsistencyLevel consistency_level=0)
+  void     batch_insert(1:string keyspace, 2:BatchMutation batch_mutation, 3:ConsistencyLevel consistency_level=0)
   throws (1: InvalidRequestException ire, 2: UnavailableException ue),
 
-  void           remove(1:string table, 2:string key, 3:ColumnPathOrParent column_path_or_parent, 4:i64 timestamp, 5:ConsistencyLevel consistency_level=0)
+  void           remove(1:string keyspace, 2:string key, 3:ColumnPathOrParent column_path_or_parent, 4:i64 timestamp, 5:ConsistencyLevel consistency_level=0)
   throws (1: InvalidRequestException ire, 2: UnavailableException ue),
 
-  list<SuperColumn> get_slice_super(1:string table, 2:string key, 3:string column_family, 4:binary start, 5:binary finish, 6:bool is_ascending, 7:i32 count=100, 8:ConsistencyLevel consistency_level=1)
+  list<SuperColumn> get_slice_super(1:string keyspace, 2:string key, 3:string column_family, 4:binary start, 5:binary finish, 6:bool is_ascending, 7:i32 count=100, 8:ConsistencyLevel consistency_level=1)
   throws (1: InvalidRequestException ire),
 
-  list<SuperColumn> get_slice_super_by_names(1:string table, 2:string key, 3:string column_family, 4:list<binary> super_column_names, 5:ConsistencyLevel consistency_level=1)
+  list<SuperColumn> get_slice_super_by_names(1:string keyspace, 2:string key, 3:string column_family, 4:list<binary> super_column_names, 5:ConsistencyLevel consistency_level=1)
   throws (1: InvalidRequestException ire),
 
-  SuperColumn  get_super_column(1:string table, 2:string key, 3:SuperColumnPath super_column_path, 4:ConsistencyLevel consistency_level=1)
+  SuperColumn  get_super_column(1:string keyspace, 2:string key, 3:SuperColumnPath super_column_path, 4:ConsistencyLevel consistency_level=1)
   throws (1: InvalidRequestException ire, 2: NotFoundException nfe),
 
-  void     batch_insert_super_column(1:string table, 2:BatchMutationSuper batch_mutation_super, 3:ConsistencyLevel consistency_level=0)
+  void     batch_insert_super_column(1:string keyspace, 2:BatchMutationSuper batch_mutation_super, 3:ConsistencyLevel consistency_level=0)
   throws (1: InvalidRequestException ire, 2: UnavailableException ue),
 
   # range query: returns matching keys
-  list<string>   get_key_range(1:string table, 2:string column_family, 3:string start="", 4:string finish="", 5:i32 count=100) 
+  list<string>   get_key_range(1:string keyspace, 2:string column_family, 3:string start="", 4:string finish="", 5:i32 count=100) 
   throws (1: InvalidRequestException ire),
 
   /////////////////////////////////////////////////////////////////////////////////////
@@ -167,8 +167,8 @@ service Cassandra {
   // get property whose value is list of "strings"
   list<string>   get_string_list_property(1:string property),
 
-  // describe specified table
-  map<string, map<string, string>>  describe_table(1:string table)
+  // describe specified keyspace
+  map<string, map<string, string>>  describe_keyspace(1:string keyspace)
   throws (1: NotFoundException nfe),
 
   // execute a CQL query
diff --git a/interface/gen-java/org/apache/cassandra/service/Cassandra.java b/interface/gen-java/org/apache/cassandra/service/Cassandra.java
index 1a37da04c5..c424231703 100644
--- a/interface/gen-java/org/apache/cassandra/service/Cassandra.java
+++ b/interface/gen-java/org/apache/cassandra/service/Cassandra.java
@@ -22,35 +22,35 @@ public class Cassandra {
 
   public interface Iface {
 
-    public List<Column> get_slice_by_names(String table, String key, ColumnParent column_parent, List<byte[]> column_names, int consistency_level) throws InvalidRequestException, NotFoundException, TException;
+    public List<Column> get_slice_by_names(String keyspace, String key, ColumnParent column_parent, List<byte[]> column_names, int consistency_level) throws InvalidRequestException, NotFoundException, TException;
 
-    public List<Column> get_slice(String table, String key, ColumnParent column_parent, byte[] start, byte[] finish, boolean is_ascending, int count, int consistency_level) throws InvalidRequestException, NotFoundException, TException;
+    public List<Column> get_slice(String keyspace, String key, ColumnParent column_parent, byte[] start, byte[] finish, boolean is_ascending, int count, int consistency_level) throws InvalidRequestException, NotFoundException, TException;
 
-    public Column get_column(String table, String key, ColumnPath column_path, int consistency_level) throws InvalidRequestException, NotFoundException, TException;
+    public Column get_column(String keyspace, String key, ColumnPath column_path, int consistency_level) throws InvalidRequestException, NotFoundException, TException;
 
-    public int get_column_count(String table, String key, ColumnParent column_parent, int consistency_level) throws InvalidRequestException, TException;
+    public int get_column_count(String keyspace, String key, ColumnParent column_parent, int consistency_level) throws InvalidRequestException, TException;
 
-    public void insert(String table, String key, ColumnPath column_path, byte[] value, long timestamp, int consistency_level) throws InvalidRequestException, UnavailableException, TException;
+    public void insert(String keyspace, String key, ColumnPath column_path, byte[] value, long timestamp, int consistency_level) throws InvalidRequestException, UnavailableException, TException;
 
-    public void batch_insert(String table, BatchMutation batch_mutation, int consistency_level) throws InvalidRequestException, UnavailableException, TException;
+    public void batch_insert(String keyspace, BatchMutation batch_mutation, int consistency_level) throws InvalidRequestException, UnavailableException, TException;
 
-    public void remove(String table, String key, ColumnPathOrParent column_path_or_parent, long timestamp, int consistency_level) throws InvalidRequestException, UnavailableException, TException;
+    public void remove(String keyspace, String key, ColumnPathOrParent column_path_or_parent, long timestamp, int consistency_level) throws InvalidRequestException, UnavailableException, TException;
 
-    public List<SuperColumn> get_slice_super(String table, String key, String column_family, byte[] start, byte[] finish, boolean is_ascending, int count, int consistency_level) throws InvalidRequestException, TException;
+    public List<SuperColumn> get_slice_super(String keyspace, String key, String column_family, byte[] start, byte[] finish, boolean is_ascending, int count, int consistency_level) throws InvalidRequestException, TException;
 
-    public List<SuperColumn> get_slice_super_by_names(String table, String key, String column_family, List<byte[]> super_column_names, int consistency_level) throws InvalidRequestException, TException;
+    public List<SuperColumn> get_slice_super_by_names(String keyspace, String key, String column_family, List<byte[]> super_column_names, int consistency_level) throws InvalidRequestException, TException;
 
-    public SuperColumn get_super_column(String table, String key, SuperColumnPath super_column_path, int consistency_level) throws InvalidRequestException, NotFoundException, TException;
+    public SuperColumn get_super_column(String keyspace, String key, SuperColumnPath super_column_path, int consistency_level) throws InvalidRequestException, NotFoundException, TException;
 
-    public void batch_insert_super_column(String table, BatchMutationSuper batch_mutation_super, int consistency_level) throws InvalidRequestException, UnavailableException, TException;
+    public void batch_insert_super_column(String keyspace, BatchMutationSuper batch_mutation_super, int consistency_level) throws InvalidRequestException, UnavailableException, TException;
 
-    public List<String> get_key_range(String table, String column_family, String start, String finish, int count) throws InvalidRequestException, TException;
+    public List<String> get_key_range(String keyspace, String column_family, String start, String finish, int count) throws InvalidRequestException, TException;
 
     public String get_string_property(String property) throws TException;
 
     public List<String> get_string_list_property(String property) throws TException;
 
-    public Map<String,Map<String,String>> describe_table(String table) throws NotFoundException, TException;
+    public Map<String,Map<String,String>> describe_keyspace(String keyspace) throws NotFoundException, TException;
 
     public CqlResult execute_query(String query) throws TException;
 
@@ -83,17 +83,17 @@ public class Cassandra {
       return this.oprot_;
     }
 
-    public List<Column> get_slice_by_names(String table, String key, ColumnParent column_parent, List<byte[]> column_names, int consistency_level) throws InvalidRequestException, NotFoundException, TException
+    public List<Column> get_slice_by_names(String keyspace, String key, ColumnParent column_parent, List<byte[]> column_names, int consistency_level) throws InvalidRequestException, NotFoundException, TException
     {
-      send_get_slice_by_names(table, key, column_parent, column_names, consistency_level);
+      send_get_slice_by_names(keyspace, key, column_parent, column_names, consistency_level);
       return recv_get_slice_by_names();
     }
 
-    public void send_get_slice_by_names(String table, String key, ColumnParent column_parent, List<byte[]> column_names, int consistency_level) throws TException
+    public void send_get_slice_by_names(String keyspace, String key, ColumnParent column_parent, List<byte[]> column_names, int consistency_level) throws TException
     {
       oprot_.writeMessageBegin(new TMessage("get_slice_by_names", TMessageType.CALL, seqid_));
       get_slice_by_names_args args = new get_slice_by_names_args();
-      args.table = table;
+      args.keyspace = keyspace;
       args.key = key;
       args.column_parent = column_parent;
       args.column_names = column_names;
@@ -126,17 +126,17 @@ public class Cassandra {
       throw new TApplicationException(TApplicationException.MISSING_RESULT, "get_slice_by_names failed: unknown result");
     }
 
-    public List<Column> get_slice(String table, String key, ColumnParent column_parent, byte[] start, byte[] finish, boolean is_ascending, int count, int consistency_level) throws InvalidRequestException, NotFoundException, TException
+    public List<Column> get_slice(String keyspace, String key, ColumnParent column_parent, byte[] start, byte[] finish, boolean is_ascending, int count, int consistency_level) throws InvalidRequestException, NotFoundException, TException
     {
-      send_get_slice(table, key, column_parent, start, finish, is_ascending, count, consistency_level);
+      send_get_slice(keyspace, key, column_parent, start, finish, is_ascending, count, consistency_level);
       return recv_get_slice();
     }
 
-    public void send_get_slice(String table, String key, ColumnParent column_parent, byte[] start, byte[] finish, boolean is_ascending, int count, int consistency_level) throws TException
+    public void send_get_slice(String keyspace, String key, ColumnParent column_parent, byte[] start, byte[] finish, boolean is_ascending, int count, int consistency_level) throws TException
     {
       oprot_.writeMessageBegin(new TMessage("get_slice", TMessageType.CALL, seqid_));
       get_slice_args args = new get_slice_args();
-      args.table = table;
+      args.keyspace = keyspace;
       args.key = key;
       args.column_parent = column_parent;
       args.start = start;
@@ -172,17 +172,17 @@ public class Cassandra {
       throw new TApplicationException(TApplicationException.MISSING_RESULT, "get_slice failed: unknown result");
     }
 
-    public Column get_column(String table, String key, ColumnPath column_path, int consistency_level) throws InvalidRequestException, NotFoundException, TException
+    public Column get_column(String keyspace, String key, ColumnPath column_path, int consistency_level) throws InvalidRequestException, NotFoundException, TException
     {
-      send_get_column(table, key, column_path, consistency_level);
+      send_get_column(keyspace, key, column_path, consistency_level);
       return recv_get_column();
     }
 
-    public void send_get_column(String table, String key, ColumnPath column_path, int consistency_level) throws TException
+    public void send_get_column(String keyspace, String key, ColumnPath column_path, int consistency_level) throws TException
     {
       oprot_.writeMessageBegin(new TMessage("get_column", TMessageType.CALL, seqid_));
       get_column_args args = new get_column_args();
-      args.table = table;
+      args.keyspace = keyspace;
       args.key = key;
       args.column_path = column_path;
       args.consistency_level = consistency_level;
@@ -214,17 +214,17 @@ public class Cassandra {
       throw new TApplicationException(TApplicationException.MISSING_RESULT, "get_column failed: unknown result");
     }
 
-    public int get_column_count(String table, String key, ColumnParent column_parent, int consistency_level) throws InvalidRequestException, TException
+    public int get_column_count(String keyspace, String key, ColumnParent column_parent, int consistency_level) throws InvalidRequestException, TException
     {
-      send_get_column_count(table, key, column_parent, consistency_level);
+      send_get_column_count(keyspace, key, column_parent, consistency_level);
       return recv_get_column_count();
     }
 
-    public void send_get_column_count(String table, String key, ColumnParent column_parent, int consistency_level) throws TException
+    public void send_get_column_count(String keyspace, String key, ColumnParent column_parent, int consistency_level) throws TException
     {
       oprot_.writeMessageBegin(new TMessage("get_column_count", TMessageType.CALL, seqid_));
       get_column_count_args args = new get_column_count_args();
-      args.table = table;
+      args.keyspace = keyspace;
       args.key = key;
       args.column_parent = column_parent;
       args.consistency_level = consistency_level;
@@ -253,17 +253,17 @@ public class Cassandra {
       throw new TApplicationException(TApplicationException.MISSING_RESULT, "get_column_count failed: unknown result");
     }
 
-    public void insert(String table, String key, ColumnPath column_path, byte[] value, long timestamp, int consistency_level) throws InvalidRequestException, UnavailableException, TException
+    public void insert(String keyspace, String key, ColumnPath column_path, byte[] value, long timestamp, int consistency_level) throws InvalidRequestException, UnavailableException, TException
     {
-      send_insert(table, key, column_path, value, timestamp, consistency_level);
+      send_insert(keyspace, key, column_path, value, timestamp, consistency_level);
       recv_insert();
     }
 
-    public void send_insert(String table, String key, ColumnPath column_path, byte[] value, long timestamp, int consistency_level) throws TException
+    public void send_insert(String keyspace, String key, ColumnPath column_path, byte[] value, long timestamp, int consistency_level) throws TException
     {
       oprot_.writeMessageBegin(new TMessage("insert", TMessageType.CALL, seqid_));
       insert_args args = new insert_args();
-      args.table = table;
+      args.keyspace = keyspace;
       args.key = key;
       args.column_path = column_path;
       args.value = value;
@@ -294,17 +294,17 @@ public class Cassandra {
       return;
     }
 
-    public void batch_insert(String table, BatchMutation batch_mutation, int consistency_level) throws InvalidRequestException, UnavailableException, TException
+    public void batch_insert(String keyspace, BatchMutation batch_mutation, int consistency_level) throws InvalidRequestException, UnavailableException, TException
     {
-      send_batch_insert(table, batch_mutation, consistency_level);
+      send_batch_insert(keyspace, batch_mutation, consistency_level);
       recv_batch_insert();
     }
 
-    public void send_batch_insert(String table, BatchMutation batch_mutation, int consistency_level) throws TException
+    public void send_batch_insert(String keyspace, BatchMutation batch_mutation, int consistency_level) throws TException
     {
       oprot_.writeMessageBegin(new TMessage("batch_insert", TMessageType.CALL, seqid_));
       batch_insert_args args = new batch_insert_args();
-      args.table = table;
+      args.keyspace = keyspace;
       args.batch_mutation = batch_mutation;
       args.consistency_level = consistency_level;
       args.write(oprot_);
@@ -332,17 +332,17 @@ public class Cassandra {
       return;
     }
 
-    public void remove(String table, String key, ColumnPathOrParent column_path_or_parent, long timestamp, int consistency_level) throws InvalidRequestException, UnavailableException, TException
+    public void remove(String keyspace, String key, ColumnPathOrParent column_path_or_parent, long timestamp, int consistency_level) throws InvalidRequestException, UnavailableException, TException
     {
-      send_remove(table, key, column_path_or_parent, timestamp, consistency_level);
+      send_remove(keyspace, key, column_path_or_parent, timestamp, consistency_level);
       recv_remove();
     }
 
-    public void send_remove(String table, String key, ColumnPathOrParent column_path_or_parent, long timestamp, int consistency_level) throws TException
+    public void send_remove(String keyspace, String key, ColumnPathOrParent column_path_or_parent, long timestamp, int consistency_level) throws TException
     {
       oprot_.writeMessageBegin(new TMessage("remove", TMessageType.CALL, seqid_));
       remove_args args = new remove_args();
-      args.table = table;
+      args.keyspace = keyspace;
       args.key = key;
       args.column_path_or_parent = column_path_or_parent;
       args.timestamp = timestamp;
@@ -372,17 +372,17 @@ public class Cassandra {
       return;
     }
 
-    public List<SuperColumn> get_slice_super(String table, String key, String column_family, byte[] start, byte[] finish, boolean is_ascending, int count, int consistency_level) throws InvalidRequestException, TException
+    public List<SuperColumn> get_slice_super(String keyspace, String key, String column_family, byte[] start, byte[] finish, boolean is_ascending, int count, int consistency_level) throws InvalidRequestException, TException
     {
-      send_get_slice_super(table, key, column_family, start, finish, is_ascending, count, consistency_level);
+      send_get_slice_super(keyspace, key, column_family, start, finish, is_ascending, count, consistency_level);
       return recv_get_slice_super();
     }
 
-    public void send_get_slice_super(String table, String key, String column_family, byte[] start, byte[] finish, boolean is_ascending, int count, int consistency_level) throws TException
+    public void send_get_slice_super(String keyspace, String key, String column_family, byte[] start, byte[] finish, boolean is_ascending, int count, int consistency_level) throws TException
     {
       oprot_.writeMessageBegin(new TMessage("get_slice_super", TMessageType.CALL, seqid_));
       get_slice_super_args args = new get_slice_super_args();
-      args.table = table;
+      args.keyspace = keyspace;
       args.key = key;
       args.column_family = column_family;
       args.start = start;
@@ -415,17 +415,17 @@ public class Cassandra {
       throw new TApplicationException(TApplicationException.MISSING_RESULT, "get_slice_super failed: unknown result");
     }
 
-    public List<SuperColumn> get_slice_super_by_names(String table, String key, String column_family, List<byte[]> super_column_names, int consistency_level) throws InvalidRequestException, TException
+    public List<SuperColumn> get_slice_super_by_names(String keyspace, String key, String column_family, List<byte[]> super_column_names, int consistency_level) throws InvalidRequestException, TException
     {
-      send_get_slice_super_by_names(table, key, column_family, super_column_names, consistency_level);
+      send_get_slice_super_by_names(keyspace, key, column_family, super_column_names, consistency_level);
       return recv_get_slice_super_by_names();
     }
 
-    public void send_get_slice_super_by_names(String table, String key, String column_family, List<byte[]> super_column_names, int consistency_level) throws TException
+    public void send_get_slice_super_by_names(String keyspace, String key, String column_family, List<byte[]> super_column_names, int consistency_level) throws TException
     {
       oprot_.writeMessageBegin(new TMessage("get_slice_super_by_names", TMessageType.CALL, seqid_));
       get_slice_super_by_names_args args = new get_slice_super_by_names_args();
-      args.table = table;
+      args.keyspace = keyspace;
       args.key = key;
       args.column_family = column_family;
       args.super_column_names = super_column_names;
@@ -455,17 +455,17 @@ public class Cassandra {
       throw new TApplicationException(TApplicationException.MISSING_RESULT, "get_slice_super_by_names failed: unknown result");
     }
 
-    public SuperColumn get_super_column(String table, String key, SuperColumnPath super_column_path, int consistency_level) throws InvalidRequestException, NotFoundException, TException
+    public SuperColumn get_super_column(String keyspace, String key, SuperColumnPath super_column_path, int consistency_level) throws InvalidRequestException, NotFoundException, TException
     {
-      send_get_super_column(table, key, super_column_path, consistency_level);
+      send_get_super_column(keyspace, key, super_column_path, consistency_level);
       return recv_get_super_column();
     }
 
-    public void send_get_super_column(String table, String key, SuperColumnPath super_column_path, int consistency_level) throws TException
+    public void send_get_super_column(String keyspace, String key, SuperColumnPath super_column_path, int consistency_level) throws TException
     {
       oprot_.writeMessageBegin(new TMessage("get_super_column", TMessageType.CALL, seqid_));
       get_super_column_args args = new get_super_column_args();
-      args.table = table;
+      args.keyspace = keyspace;
       args.key = key;
       args.super_column_path = super_column_path;
       args.consistency_level = consistency_level;
@@ -497,17 +497,17 @@ public class Cassandra {
       throw new TApplicationException(TApplicationException.MISSING_RESULT, "get_super_column failed: unknown result");
     }
 
-    public void batch_insert_super_column(String table, BatchMutationSuper batch_mutation_super, int consistency_level) throws InvalidRequestException, UnavailableException, TException
+    public void batch_insert_super_column(String keyspace, BatchMutationSuper batch_mutation_super, int consistency_level) throws InvalidRequestException, UnavailableException, TException
     {
-      send_batch_insert_super_column(table, batch_mutation_super, consistency_level);
+      send_batch_insert_super_column(keyspace, batch_mutation_super, consistency_level);
       recv_batch_insert_super_column();
     }
 
-    public void send_batch_insert_super_column(String table, BatchMutationSuper batch_mutation_super, int consistency_level) throws TException
+    public void send_batch_insert_super_column(String keyspace, BatchMutationSuper batch_mutation_super, int consistency_level) throws TException
     {
       oprot_.writeMessageBegin(new TMessage("batch_insert_super_column", TMessageType.CALL, seqid_));
       batch_insert_super_column_args args = new batch_insert_super_column_args();
-      args.table = table;
+      args.keyspace = keyspace;
       args.batch_mutation_super = batch_mutation_super;
       args.consistency_level = consistency_level;
       args.write(oprot_);
@@ -535,17 +535,17 @@ public class Cassandra {
       return;
     }
 
-    public List<String> get_key_range(String table, String column_family, String start, String finish, int count) throws InvalidRequestException, TException
+    public List<String> get_key_range(String keyspace, String column_family, String start, String finish, int count) throws InvalidRequestException, TException
     {
-      send_get_key_range(table, column_family, start, finish, count);
+      send_get_key_range(keyspace, column_family, start, finish, count);
       return recv_get_key_range();
     }
 
-    public void send_get_key_range(String table, String column_family, String start, String finish, int count) throws TException
+    public void send_get_key_range(String keyspace, String column_family, String start, String finish, int count) throws TException
     {
       oprot_.writeMessageBegin(new TMessage("get_key_range", TMessageType.CALL, seqid_));
       get_key_range_args args = new get_key_range_args();
-      args.table = table;
+      args.keyspace = keyspace;
       args.column_family = column_family;
       args.start = start;
       args.finish = finish;
@@ -641,23 +641,23 @@ public class Cassandra {
       throw new TApplicationException(TApplicationException.MISSING_RESULT, "get_string_list_property failed: unknown result");
     }
 
-    public Map<String,Map<String,String>> describe_table(String table) throws NotFoundException, TException
+    public Map<String,Map<String,String>> describe_keyspace(String keyspace) throws NotFoundException, TException
     {
-      send_describe_table(table);
-      return recv_describe_table();
+      send_describe_keyspace(keyspace);
+      return recv_describe_keyspace();
     }
 
-    public void send_describe_table(String table) throws TException
+    public void send_describe_keyspace(String keyspace) throws TException
     {
-      oprot_.writeMessageBegin(new TMessage("describe_table", TMessageType.CALL, seqid_));
-      describe_table_args args = new describe_table_args();
-      args.table = table;
+      oprot_.writeMessageBegin(new TMessage("describe_keyspace", TMessageType.CALL, seqid_));
+      describe_keyspace_args args = new describe_keyspace_args();
+      args.keyspace = keyspace;
       args.write(oprot_);
       oprot_.writeMessageEnd();
       oprot_.getTransport().flush();
     }
 
-    public Map<String,Map<String,String>> recv_describe_table() throws NotFoundException, TException
+    public Map<String,Map<String,String>> recv_describe_keyspace() throws NotFoundException, TException
     {
       TMessage msg = iprot_.readMessageBegin();
       if (msg.type == TMessageType.EXCEPTION) {
@@ -665,7 +665,7 @@ public class Cassandra {
         iprot_.readMessageEnd();
         throw x;
       }
-      describe_table_result result = new describe_table_result();
+      describe_keyspace_result result = new describe_keyspace_result();
       result.read(iprot_);
       iprot_.readMessageEnd();
       if (result.isSetSuccess()) {
@@ -674,7 +674,7 @@ public class Cassandra {
       if (result.nfe != null) {
         throw result.nfe;
       }
-      throw new TApplicationException(TApplicationException.MISSING_RESULT, "describe_table failed: unknown result");
+      throw new TApplicationException(TApplicationException.MISSING_RESULT, "describe_keyspace failed: unknown result");
     }
 
     public CqlResult execute_query(String query) throws TException
@@ -730,7 +730,7 @@ public class Cassandra {
       processMap_.put("get_key_range", new get_key_range());
       processMap_.put("get_string_property", new get_string_property());
       processMap_.put("get_string_list_property", new get_string_list_property());
-      processMap_.put("describe_table", new describe_table());
+      processMap_.put("describe_keyspace", new describe_keyspace());
       processMap_.put("execute_query", new execute_query());
     }
 
@@ -767,7 +767,7 @@ public class Cassandra {
         iprot.readMessageEnd();
         get_slice_by_names_result result = new get_slice_by_names_result();
         try {
-          result.success = iface_.get_slice_by_names(args.table, args.key, args.column_parent, args.column_names, args.consistency_level);
+          result.success = iface_.get_slice_by_names(args.keyspace, args.key, args.column_parent, args.column_names, args.consistency_level);
         } catch (InvalidRequestException ire) {
           result.ire = ire;
         } catch (NotFoundException nfe) {
@@ -797,7 +797,7 @@ public class Cassandra {
         iprot.readMessageEnd();
         get_slice_result result = new get_slice_result();
         try {
-          result.success = iface_.get_slice(args.table, args.key, args.column_parent, args.start, args.finish, args.is_ascending, args.count, args.consistency_level);
+          result.success = iface_.get_slice(args.keyspace, args.key, args.column_parent, args.start, args.finish, args.is_ascending, args.count, args.consistency_level);
         } catch (InvalidRequestException ire) {
           result.ire = ire;
         } catch (NotFoundException nfe) {
@@ -827,7 +827,7 @@ public class Cassandra {
         iprot.readMessageEnd();
         get_column_result result = new get_column_result();
         try {
-          result.success = iface_.get_column(args.table, args.key, args.column_path, args.consistency_level);
+          result.success = iface_.get_column(args.keyspace, args.key, args.column_path, args.consistency_level);
         } catch (InvalidRequestException ire) {
           result.ire = ire;
         } catch (NotFoundException nfe) {
@@ -857,7 +857,7 @@ public class Cassandra {
         iprot.readMessageEnd();
         get_column_count_result result = new get_column_count_result();
         try {
-          result.success = iface_.get_column_count(args.table, args.key, args.column_parent, args.consistency_level);
+          result.success = iface_.get_column_count(args.keyspace, args.key, args.column_parent, args.consistency_level);
           result.__isset.success = true;
         } catch (InvalidRequestException ire) {
           result.ire = ire;
@@ -886,7 +886,7 @@ public class Cassandra {
         iprot.readMessageEnd();
         insert_result result = new insert_result();
         try {
-          iface_.insert(args.table, args.key, args.column_path, args.value, args.timestamp, args.consistency_level);
+          iface_.insert(args.keyspace, args.key, args.column_path, args.value, args.timestamp, args.consistency_level);
         } catch (InvalidRequestException ire) {
           result.ire = ire;
         } catch (UnavailableException ue) {
@@ -916,7 +916,7 @@ public class Cassandra {
         iprot.readMessageEnd();
         batch_insert_result result = new batch_insert_result();
         try {
-          iface_.batch_insert(args.table, args.batch_mutation, args.consistency_level);
+          iface_.batch_insert(args.keyspace, args.batch_mutation, args.consistency_level);
         } catch (InvalidRequestException ire) {
           result.ire = ire;
         } catch (UnavailableException ue) {
@@ -946,7 +946,7 @@ public class Cassandra {
         iprot.readMessageEnd();
         remove_result result = new remove_result();
         try {
-          iface_.remove(args.table, args.key, args.column_path_or_parent, args.timestamp, args.consistency_level);
+          iface_.remove(args.keyspace, args.key, args.column_path_or_parent, args.timestamp, args.consistency_level);
         } catch (InvalidRequestException ire) {
           result.ire = ire;
         } catch (UnavailableException ue) {
@@ -976,7 +976,7 @@ public class Cassandra {
         iprot.readMessageEnd();
         get_slice_super_result result = new get_slice_super_result();
         try {
-          result.success = iface_.get_slice_super(args.table, args.key, args.column_family, args.start, args.finish, args.is_ascending, args.count, args.consistency_level);
+          result.success = iface_.get_slice_super(args.keyspace, args.key, args.column_family, args.start, args.finish, args.is_ascending, args.count, args.consistency_level);
         } catch (InvalidRequestException ire) {
           result.ire = ire;
         } catch (Throwable th) {
@@ -1004,7 +1004,7 @@ public class Cassandra {
         iprot.readMessageEnd();
         get_slice_super_by_names_result result = new get_slice_super_by_names_result();
         try {
-          result.success = iface_.get_slice_super_by_names(args.table, args.key, args.column_family, args.super_column_names, args.consistency_level);
+          result.success = iface_.get_slice_super_by_names(args.keyspace, args.key, args.column_family, args.super_column_names, args.consistency_level);
         } catch (InvalidRequestException ire) {
           result.ire = ire;
         } catch (Throwable th) {
@@ -1032,7 +1032,7 @@ public class Cassandra {
         iprot.readMessageEnd();
         get_super_column_result result = new get_super_column_result();
         try {
-          result.success = iface_.get_super_column(args.table, args.key, args.super_column_path, args.consistency_level);
+          result.success = iface_.get_super_column(args.keyspace, args.key, args.super_column_path, args.consistency_level);
         } catch (InvalidRequestException ire) {
           result.ire = ire;
         } catch (NotFoundException nfe) {
@@ -1062,7 +1062,7 @@ public class Cassandra {
         iprot.readMessageEnd();
         batch_insert_super_column_result result = new batch_insert_super_column_result();
         try {
-          iface_.batch_insert_super_column(args.table, args.batch_mutation_super, args.consistency_level);
+          iface_.batch_insert_super_column(args.keyspace, args.batch_mutation_super, args.consistency_level);
         } catch (InvalidRequestException ire) {
           result.ire = ire;
         } catch (UnavailableException ue) {
@@ -1092,7 +1092,7 @@ public class Cassandra {
         iprot.readMessageEnd();
         get_key_range_result result = new get_key_range_result();
         try {
-          result.success = iface_.get_key_range(args.table, args.column_family, args.start, args.finish, args.count);
+          result.success = iface_.get_key_range(args.keyspace, args.column_family, args.start, args.finish, args.count);
         } catch (InvalidRequestException ire) {
           result.ire = ire;
         } catch (Throwable th) {
@@ -1144,27 +1144,27 @@ public class Cassandra {
 
     }
 
-    private class describe_table implements ProcessFunction {
+    private class describe_keyspace implements ProcessFunction {
       public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException
       {
-        describe_table_args args = new describe_table_args();
+        describe_keyspace_args args = new describe_keyspace_args();
         args.read(iprot);
         iprot.readMessageEnd();
-        describe_table_result result = new describe_table_result();
+        describe_keyspace_result result = new describe_keyspace_result();
         try {
-          result.success = iface_.describe_table(args.table);
+          result.success = iface_.describe_keyspace(args.keyspace);
         } catch (NotFoundException nfe) {
           result.nfe = nfe;
         } catch (Throwable th) {
-          LOGGER.error("Internal error processing describe_table", th);
-          TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing describe_table");
-          oprot.writeMessageBegin(new TMessage("describe_table", TMessageType.EXCEPTION, seqid));
+          LOGGER.error("Internal error processing describe_keyspace", th);
+          TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing describe_keyspace");
+          oprot.writeMessageBegin(new TMessage("describe_keyspace", TMessageType.EXCEPTION, seqid));
           x.write(oprot);
           oprot.writeMessageEnd();
           oprot.getTransport().flush();
           return;
         }
-        oprot.writeMessageBegin(new TMessage("describe_table", TMessageType.REPLY, seqid));
+        oprot.writeMessageBegin(new TMessage("describe_keyspace", TMessageType.REPLY, seqid));
         result.write(oprot);
         oprot.writeMessageEnd();
         oprot.getTransport().flush();
@@ -1192,14 +1192,14 @@ public class Cassandra {
 
   public static class get_slice_by_names_args implements TBase, java.io.Serializable, Cloneable   {
     private static final TStruct STRUCT_DESC = new TStruct("get_slice_by_names_args");
-    private static final TField TABLE_FIELD_DESC = new TField("table", TType.STRING, (short)1);
+    private static final TField KEYSPACE_FIELD_DESC = new TField("keyspace", TType.STRING, (short)1);
     private static final TField KEY_FIELD_DESC = new TField("key", TType.STRING, (short)2);
     private static final TField COLUMN_PARENT_FIELD_DESC = new TField("column_parent", TType.STRUCT, (short)3);
     private static final TField COLUMN_NAMES_FIELD_DESC = new TField("column_names", TType.LIST, (short)4);
     private static final TField CONSISTENCY_LEVEL_FIELD_DESC = new TField("consistency_level", TType.I32, (short)5);
 
-    public String table;
-    public static final int TABLE = 1;
+    public String keyspace;
+    public static final int KEYSPACE = 1;
     public String key;
     public static final int KEY = 2;
     public ColumnParent column_parent;
@@ -1215,7 +1215,7 @@ public class Cassandra {
     }
 
     public static final Map<Integer, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new HashMap<Integer, FieldMetaData>() {{
-      put(TABLE, new FieldMetaData("table", TFieldRequirementType.DEFAULT, 
+      put(KEYSPACE, new FieldMetaData("keyspace", TFieldRequirementType.DEFAULT, 
           new FieldValueMetaData(TType.STRING)));
       put(KEY, new FieldMetaData("key", TFieldRequirementType.DEFAULT, 
           new FieldValueMetaData(TType.STRING)));
@@ -1238,14 +1238,14 @@ public class Cassandra {
     }
 
     public get_slice_by_names_args(
-      String table,
+      String keyspace,
       String key,
       ColumnParent column_parent,
       List<byte[]> column_names,
       int consistency_level)
     {
       this();
-      this.table = table;
+      this.keyspace = keyspace;
       this.key = key;
       this.column_parent = column_parent;
       this.column_names = column_names;
@@ -1257,8 +1257,8 @@ public class Cassandra {
      * Performs a deep copy on <i>other</i>.
      */
     public get_slice_by_names_args(get_slice_by_names_args other) {
-      if (other.isSetTable()) {
-        this.table = other.table;
+      if (other.isSetKeyspace()) {
+        this.keyspace = other.keyspace;
       }
       if (other.isSetKey()) {
         this.key = other.key;
@@ -1284,26 +1284,26 @@ public class Cassandra {
       return new get_slice_by_names_args(this);
     }
 
-    public String getTable() {
-      return this.table;
+    public String getKeyspace() {
+      return this.keyspace;
     }
 
-    public void setTable(String table) {
-      this.table = table;
+    public void setKeyspace(String keyspace) {
+      this.keyspace = keyspace;
     }
 
-    public void unsetTable() {
-      this.table = null;
+    public void unsetKeyspace() {
+      this.keyspace = null;
     }
 
-    // Returns true if field table is set (has been asigned a value) and false otherwise
-    public boolean isSetTable() {
-      return this.table != null;
+    // Returns true if field keyspace is set (has been asigned a value) and false otherwise
+    public boolean isSetKeyspace() {
+      return this.keyspace != null;
     }
 
-    public void setTableIsSet(boolean value) {
+    public void setKeyspaceIsSet(boolean value) {
       if (!value) {
-        this.table = null;
+        this.keyspace = null;
       }
     }
 
@@ -1415,11 +1415,11 @@ public class Cassandra {
 
     public void setFieldValue(int fieldID, Object value) {
       switch (fieldID) {
-      case TABLE:
+      case KEYSPACE:
         if (value == null) {
-          unsetTable();
+          unsetKeyspace();
         } else {
-          setTable((String)value);
+          setKeyspace((String)value);
         }
         break;
 
@@ -1462,8 +1462,8 @@ public class Cassandra {
 
     public Object getFieldValue(int fieldID) {
       switch (fieldID) {
-      case TABLE:
-        return getTable();
+      case KEYSPACE:
+        return getKeyspace();
 
       case KEY:
         return getKey();
@@ -1485,8 +1485,8 @@ public class Cassandra {
     // Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise
     public boolean isSet(int fieldID) {
       switch (fieldID) {
-      case TABLE:
-        return isSetTable();
+      case KEYSPACE:
+        return isSetKeyspace();
       case KEY:
         return isSetKey();
       case COLUMN_PARENT:
@@ -1513,12 +1513,12 @@ public class Cassandra {
       if (that == null)
         return false;
 
-      boolean this_present_table = true && this.isSetTable();
-      boolean that_present_table = true && that.isSetTable();
-      if (this_present_table || that_present_table) {
-        if (!(this_present_table && that_present_table))
+      boolean this_present_keyspace = true && this.isSetKeyspace();
+      boolean that_present_keyspace = true && that.isSetKeyspace();
+      if (this_present_keyspace || that_present_keyspace) {
+        if (!(this_present_keyspace && that_present_keyspace))
           return false;
-        if (!this.table.equals(that.table))
+        if (!this.keyspace.equals(that.keyspace))
           return false;
       }
 
@@ -1577,9 +1577,9 @@ public class Cassandra {
         }
         switch (field.id)
         {
-          case TABLE:
+          case KEYSPACE:
             if (field.type == TType.STRING) {
-              this.table = iprot.readString();
+              this.keyspace = iprot.readString();
             } else { 
               TProtocolUtil.skip(iprot, field.type);
             }
@@ -1641,9 +1641,9 @@ public class Cassandra {
       validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
-      if (this.table != null) {
-        oprot.writeFieldBegin(TABLE_FIELD_DESC);
-        oprot.writeString(this.table);
+      if (this.keyspace != null) {
+        oprot.writeFieldBegin(KEYSPACE_FIELD_DESC);
+        oprot.writeString(this.keyspace);
         oprot.writeFieldEnd();
       }
       if (this.key != null) {
@@ -1679,11 +1679,11 @@ public class Cassandra {
       StringBuilder sb = new StringBuilder("get_slice_by_names_args(");
       boolean first = true;
 
-      sb.append("table:");
-      if (this.table == null) {
+      sb.append("keyspace:");
+      if (this.keyspace == null) {
         sb.append("null");
       } else {
-        sb.append(this.table);
+        sb.append(this.keyspace);
       }
       first = false;
       if (!first) sb.append(", ");
@@ -2123,7 +2123,7 @@ public class Cassandra {
 
   public static class get_slice_args implements TBase, java.io.Serializable, Cloneable   {
     private static final TStruct STRUCT_DESC = new TStruct("get_slice_args");
-    private static final TField TABLE_FIELD_DESC = new TField("table", TType.STRING, (short)1);
+    private static final TField KEYSPACE_FIELD_DESC = new TField("keyspace", TType.STRING, (short)1);
     private static final TField KEY_FIELD_DESC = new TField("key", TType.STRING, (short)2);
     private static final TField COLUMN_PARENT_FIELD_DESC = new TField("column_parent", TType.STRUCT, (short)3);
     private static final TField START_FIELD_DESC = new TField("start", TType.STRING, (short)4);
@@ -2132,8 +2132,8 @@ public class Cassandra {
     private static final TField COUNT_FIELD_DESC = new TField("count", TType.I32, (short)7);
     private static final TField CONSISTENCY_LEVEL_FIELD_DESC = new TField("consistency_level", TType.I32, (short)8);
 
-    public String table;
-    public static final int TABLE = 1;
+    public String keyspace;
+    public static final int KEYSPACE = 1;
     public String key;
     public static final int KEY = 2;
     public ColumnParent column_parent;
@@ -2157,7 +2157,7 @@ public class Cassandra {
     }
 
     public static final Map<Integer, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new HashMap<Integer, FieldMetaData>() {{
-      put(TABLE, new FieldMetaData("table", TFieldRequirementType.DEFAULT, 
+      put(KEYSPACE, new FieldMetaData("keyspace", TFieldRequirementType.DEFAULT, 
           new FieldValueMetaData(TType.STRING)));
       put(KEY, new FieldMetaData("key", TFieldRequirementType.DEFAULT, 
           new FieldValueMetaData(TType.STRING)));
@@ -2187,7 +2187,7 @@ public class Cassandra {
     }
 
     public get_slice_args(
-      String table,
+      String keyspace,
       String key,
       ColumnParent column_parent,
       byte[] start,
@@ -2197,7 +2197,7 @@ public class Cassandra {
       int consistency_level)
     {
       this();
-      this.table = table;
+      this.keyspace = keyspace;
       this.key = key;
       this.column_parent = column_parent;
       this.start = start;
@@ -2214,8 +2214,8 @@ public class Cassandra {
      * Performs a deep copy on <i>other</i>.
      */
     public get_slice_args(get_slice_args other) {
-      if (other.isSetTable()) {
-        this.table = other.table;
+      if (other.isSetKeyspace()) {
+        this.keyspace = other.keyspace;
       }
       if (other.isSetKey()) {
         this.key = other.key;
@@ -2244,26 +2244,26 @@ public class Cassandra {
       return new get_slice_args(this);
     }
 
-    public String getTable() {
-      return this.table;
+    public String getKeyspace() {
+      return this.keyspace;
     }
 
-    public void setTable(String table) {
-      this.table = table;
+    public void setKeyspace(String keyspace) {
+      this.keyspace = keyspace;
     }
 
-    public void unsetTable() {
-      this.table = null;
+    public void unsetKeyspace() {
+      this.keyspace = null;
     }
 
-    // Returns true if field table is set (has been asigned a value) and false otherwise
-    public boolean isSetTable() {
-      return this.table != null;
+    // Returns true if field keyspace is set (has been asigned a value) and false otherwise
+    public boolean isSetKeyspace() {
+      return this.keyspace != null;
     }
 
-    public void setTableIsSet(boolean value) {
+    public void setKeyspaceIsSet(boolean value) {
       if (!value) {
-        this.table = null;
+        this.keyspace = null;
       }
     }
 
@@ -2427,11 +2427,11 @@ public class Cassandra {
 
     public void setFieldValue(int fieldID, Object value) {
       switch (fieldID) {
-      case TABLE:
+      case KEYSPACE:
         if (value == null) {
-          unsetTable();
+          unsetKeyspace();
         } else {
-          setTable((String)value);
+          setKeyspace((String)value);
         }
         break;
 
@@ -2498,8 +2498,8 @@ public class Cassandra {
 
     public Object getFieldValue(int fieldID) {
       switch (fieldID) {
-      case TABLE:
-        return getTable();
+      case KEYSPACE:
+        return getKeyspace();
 
       case KEY:
         return getKey();
@@ -2530,8 +2530,8 @@ public class Cassandra {
     // Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise
     public boolean isSet(int fieldID) {
       switch (fieldID) {
-      case TABLE:
-        return isSetTable();
+      case KEYSPACE:
+        return isSetKeyspace();
       case KEY:
         return isSetKey();
       case COLUMN_PARENT:
@@ -2564,12 +2564,12 @@ public class Cassandra {
       if (that == null)
         return false;
 
-      boolean this_present_table = true && this.isSetTable();
-      boolean that_present_table = true && that.isSetTable();
-      if (this_present_table || that_present_table) {
-        if (!(this_present_table && that_present_table))
+      boolean this_present_keyspace = true && this.isSetKeyspace();
+      boolean that_present_keyspace = true && that.isSetKeyspace();
+      if (this_present_keyspace || that_present_keyspace) {
+        if (!(this_present_keyspace && that_present_keyspace))
           return false;
-        if (!this.table.equals(that.table))
+        if (!this.keyspace.equals(that.keyspace))
           return false;
       }
 
@@ -2655,9 +2655,9 @@ public class Cassandra {
         }
         switch (field.id)
         {
-          case TABLE:
+          case KEYSPACE:
             if (field.type == TType.STRING) {
-              this.table = iprot.readString();
+              this.keyspace = iprot.readString();
             } else { 
               TProtocolUtil.skip(iprot, field.type);
             }
@@ -2732,9 +2732,9 @@ public class Cassandra {
       validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
-      if (this.table != null) {
-        oprot.writeFieldBegin(TABLE_FIELD_DESC);
-        oprot.writeString(this.table);
+      if (this.keyspace != null) {
+        oprot.writeFieldBegin(KEYSPACE_FIELD_DESC);
+        oprot.writeString(this.keyspace);
         oprot.writeFieldEnd();
       }
       if (this.key != null) {
@@ -2775,11 +2775,11 @@ public class Cassandra {
       StringBuilder sb = new StringBuilder("get_slice_args(");
       boolean first = true;
 
-      sb.append("table:");
-      if (this.table == null) {
+      sb.append("keyspace:");
+      if (this.keyspace == null) {
         sb.append("null");
       } else {
-        sb.append(this.table);
+        sb.append(this.keyspace);
       }
       first = false;
       if (!first) sb.append(", ");
@@ -3245,13 +3245,13 @@ public class Cassandra {
 
   public static class get_column_args implements TBase, java.io.Serializable, Cloneable   {
     private static final TStruct STRUCT_DESC = new TStruct("get_column_args");
-    private static final TField TABLE_FIELD_DESC = new TField("table", TType.STRING, (short)1);
+    private static final TField KEYSPACE_FIELD_DESC = new TField("keyspace", TType.STRING, (short)1);
     private static final TField KEY_FIELD_DESC = new TField("key", TType.STRING, (short)2);
     private static final TField COLUMN_PATH_FIELD_DESC = new TField("column_path", TType.STRUCT, (short)3);
     private static final TField CONSISTENCY_LEVEL_FIELD_DESC = new TField("consistency_level", TType.I32, (short)4);
 
-    public String table;
-    public static final int TABLE = 1;
+    public String keyspace;
+    public static final int KEYSPACE = 1;
     public String key;
     public static final int KEY = 2;
     public ColumnPath column_path;
@@ -3265,7 +3265,7 @@ public class Cassandra {
     }
 
     public static final Map<Integer, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new HashMap<Integer, FieldMetaData>() {{
-      put(TABLE, new FieldMetaData("table", TFieldRequirementType.DEFAULT, 
+      put(KEYSPACE, new FieldMetaData("keyspace", TFieldRequirementType.DEFAULT, 
           new FieldValueMetaData(TType.STRING)));
       put(KEY, new FieldMetaData("key", TFieldRequirementType.DEFAULT, 
           new FieldValueMetaData(TType.STRING)));
@@ -3285,13 +3285,13 @@ public class Cassandra {
     }
 
     public get_column_args(
-      String table,
+      String keyspace,
       String key,
       ColumnPath column_path,
       int consistency_level)
     {
       this();
-      this.table = table;
+      this.keyspace = keyspace;
       this.key = key;
       this.column_path = column_path;
       this.consistency_level = consistency_level;
@@ -3302,8 +3302,8 @@ public class Cassandra {
      * Performs a deep copy on <i>other</i>.
      */
     public get_column_args(get_column_args other) {
-      if (other.isSetTable()) {
-        this.table = other.table;
+      if (other.isSetKeyspace()) {
+        this.keyspace = other.keyspace;
       }
       if (other.isSetKey()) {
         this.key = other.key;
@@ -3320,26 +3320,26 @@ public class Cassandra {
       return new get_column_args(this);
     }
 
-    public String getTable() {
-      return this.table;
+    public String getKeyspace() {
+      return this.keyspace;
     }
 
-    public void setTable(String table) {
-      this.table = table;
+    public void setKeyspace(String keyspace) {
+      this.keyspace = keyspace;
     }
 
-    public void unsetTable() {
-      this.table = null;
+    public void unsetKeyspace() {
+      this.keyspace = null;
     }
 
-    // Returns true if field table is set (has been asigned a value) and false otherwise
-    public boolean isSetTable() {
-      return this.table != null;
+    // Returns true if field keyspace is set (has been asigned a value) and false otherwise
+    public boolean isSetKeyspace() {
+      return this.keyspace != null;
     }
 
-    public void setTableIsSet(boolean value) {
+    public void setKeyspaceIsSet(boolean value) {
       if (!value) {
-        this.table = null;
+        this.keyspace = null;
       }
     }
 
@@ -3413,11 +3413,11 @@ public class Cassandra {
 
     public void setFieldValue(int fieldID, Object value) {
       switch (fieldID) {
-      case TABLE:
+      case KEYSPACE:
         if (value == null) {
-          unsetTable();
+          unsetKeyspace();
         } else {
-          setTable((String)value);
+          setKeyspace((String)value);
         }
         break;
 
@@ -3452,8 +3452,8 @@ public class Cassandra {
 
     public Object getFieldValue(int fieldID) {
       switch (fieldID) {
-      case TABLE:
-        return getTable();
+      case KEYSPACE:
+        return getKeyspace();
 
       case KEY:
         return getKey();
@@ -3472,8 +3472,8 @@ public class Cassandra {
     // Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise
     public boolean isSet(int fieldID) {
       switch (fieldID) {
-      case TABLE:
-        return isSetTable();
+      case KEYSPACE:
+        return isSetKeyspace();
       case KEY:
         return isSetKey();
       case COLUMN_PATH:
@@ -3498,12 +3498,12 @@ public class Cassandra {
       if (that == null)
         return false;
 
-      boolean this_present_table = true && this.isSetTable();
-      boolean that_present_table = true && that.isSetTable();
-      if (this_present_table || that_present_table) {
-        if (!(this_present_table && that_present_table))
+      boolean this_present_keyspace = true && this.isSetKeyspace();
+      boolean that_present_keyspace = true && that.isSetKeyspace();
+      if (this_present_keyspace || that_present_keyspace) {
+        if (!(this_present_keyspace && that_present_keyspace))
           return false;
-        if (!this.table.equals(that.table))
+        if (!this.keyspace.equals(that.keyspace))
           return false;
       }
 
@@ -3553,9 +3553,9 @@ public class Cassandra {
         }
         switch (field.id)
         {
-          case TABLE:
+          case KEYSPACE:
             if (field.type == TType.STRING) {
-              this.table = iprot.readString();
+              this.keyspace = iprot.readString();
             } else { 
               TProtocolUtil.skip(iprot, field.type);
             }
@@ -3600,9 +3600,9 @@ public class Cassandra {
       validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
-      if (this.table != null) {
-        oprot.writeFieldBegin(TABLE_FIELD_DESC);
-        oprot.writeString(this.table);
+      if (this.keyspace != null) {
+        oprot.writeFieldBegin(KEYSPACE_FIELD_DESC);
+        oprot.writeString(this.keyspace);
         oprot.writeFieldEnd();
       }
       if (this.key != null) {
@@ -3627,11 +3627,11 @@ public class Cassandra {
       StringBuilder sb = new StringBuilder("get_column_args(");
       boolean first = true;
 
-      sb.append("table:");
-      if (this.table == null) {
+      sb.append("keyspace:");
+      if (this.keyspace == null) {
         sb.append("null");
       } else {
-        sb.append(this.table);
+        sb.append(this.keyspace);
       }
       first = false;
       if (!first) sb.append(", ");
@@ -4027,13 +4027,13 @@ public class Cassandra {
 
   public static class get_column_count_args implements TBase, java.io.Serializable, Cloneable   {
     private static final TStruct STRUCT_DESC = new TStruct("get_column_count_args");
-    private static final TField TABLE_FIELD_DESC = new TField("table", TType.STRING, (short)1);
+    private static final TField KEYSPACE_FIELD_DESC = new TField("keyspace", TType.STRING, (short)1);
     private static final TField KEY_FIELD_DESC = new TField("key", TType.STRING, (short)2);
     private static final TField COLUMN_PARENT_FIELD_DESC = new TField("column_parent", TType.STRUCT, (short)3);
     private static final TField CONSISTENCY_LEVEL_FIELD_DESC = new TField("consistency_level", TType.I32, (short)5);
 
-    public String table;
-    public static final int TABLE = 1;
+    public String keyspace;
+    public static final int KEYSPACE = 1;
     public String key;
     public static final int KEY = 2;
     public ColumnParent column_parent;
@@ -4047,7 +4047,7 @@ public class Cassandra {
     }
 
     public static final Map<Integer, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new HashMap<Integer, FieldMetaData>() {{
-      put(TABLE, new FieldMetaData("table", TFieldRequirementType.DEFAULT, 
+      put(KEYSPACE, new FieldMetaData("keyspace", TFieldRequirementType.DEFAULT, 
           new FieldValueMetaData(TType.STRING)));
       put(KEY, new FieldMetaData("key", TFieldRequirementType.DEFAULT, 
           new FieldValueMetaData(TType.STRING)));
@@ -4067,13 +4067,13 @@ public class Cassandra {
     }
 
     public get_column_count_args(
-      String table,
+      String keyspace,
       String key,
       ColumnParent column_parent,
       int consistency_level)
     {
       this();
-      this.table = table;
+      this.keyspace = keyspace;
       this.key = key;
       this.column_parent = column_parent;
       this.consistency_level = consistency_level;
@@ -4084,8 +4084,8 @@ public class Cassandra {
      * Performs a deep copy on <i>other</i>.
      */
     public get_column_count_args(get_column_count_args other) {
-      if (other.isSetTable()) {
-        this.table = other.table;
+      if (other.isSetKeyspace()) {
+        this.keyspace = other.keyspace;
       }
       if (other.isSetKey()) {
         this.key = other.key;
@@ -4102,26 +4102,26 @@ public class Cassandra {
       return new get_column_count_args(this);
     }
 
-    public String getTable() {
-      return this.table;
+    public String getKeyspace() {
+      return this.keyspace;
     }
 
-    public void setTable(String table) {
-      this.table = table;
+    public void setKeyspace(String keyspace) {
+      this.keyspace = keyspace;
     }
 
-    public void unsetTable() {
-      this.table = null;
+    public void unsetKeyspace() {
+      this.keyspace = null;
     }
 
-    // Returns true if field table is set (has been asigned a value) and false otherwise
-    public boolean isSetTable() {
-      return this.table != null;
+    // Returns true if field keyspace is set (has been asigned a value) and false otherwise
+    public boolean isSetKeyspace() {
+      return this.keyspace != null;
     }
 
-    public void setTableIsSet(boolean value) {
+    public void setKeyspaceIsSet(boolean value) {
       if (!value) {
-        this.table = null;
+        this.keyspace = null;
       }
     }
 
@@ -4195,11 +4195,11 @@ public class Cassandra {
 
     public void setFieldValue(int fieldID, Object value) {
       switch (fieldID) {
-      case TABLE:
+      case KEYSPACE:
         if (value == null) {
-          unsetTable();
+          unsetKeyspace();
         } else {
-          setTable((String)value);
+          setKeyspace((String)value);
         }
         break;
 
@@ -4234,8 +4234,8 @@ public class Cassandra {
 
     public Object getFieldValue(int fieldID) {
       switch (fieldID) {
-      case TABLE:
-        return getTable();
+      case KEYSPACE:
+        return getKeyspace();
 
       case KEY:
         return getKey();
@@ -4254,8 +4254,8 @@ public class Cassandra {
     // Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise
     public boolean isSet(int fieldID) {
       switch (fieldID) {
-      case TABLE:
-        return isSetTable();
+      case KEYSPACE:
+        return isSetKeyspace();
       case KEY:
         return isSetKey();
       case COLUMN_PARENT:
@@ -4280,12 +4280,12 @@ public class Cassandra {
       if (that == null)
         return false;
 
-      boolean this_present_table = true && this.isSetTable();
-      boolean that_present_table = true && that.isSetTable();
-      if (this_present_table || that_present_table) {
-        if (!(this_present_table && that_present_table))
+      boolean this_present_keyspace = true && this.isSetKeyspace();
+      boolean that_present_keyspace = true && that.isSetKeyspace();
+      if (this_present_keyspace || that_present_keyspace) {
+        if (!(this_present_keyspace && that_present_keyspace))
           return false;
-        if (!this.table.equals(that.table))
+        if (!this.keyspace.equals(that.keyspace))
           return false;
       }
 
@@ -4335,9 +4335,9 @@ public class Cassandra {
         }
         switch (field.id)
         {
-          case TABLE:
+          case KEYSPACE:
             if (field.type == TType.STRING) {
-              this.table = iprot.readString();
+              this.keyspace = iprot.readString();
             } else { 
               TProtocolUtil.skip(iprot, field.type);
             }
@@ -4382,9 +4382,9 @@ public class Cassandra {
       validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
-      if (this.table != null) {
-        oprot.writeFieldBegin(TABLE_FIELD_DESC);
-        oprot.writeString(this.table);
+      if (this.keyspace != null) {
+        oprot.writeFieldBegin(KEYSPACE_FIELD_DESC);
+        oprot.writeString(this.keyspace);
         oprot.writeFieldEnd();
       }
       if (this.key != null) {
@@ -4409,11 +4409,11 @@ public class Cassandra {
       StringBuilder sb = new StringBuilder("get_column_count_args(");
       boolean first = true;
 
-      sb.append("table:");
-      if (this.table == null) {
+      sb.append("keyspace:");
+      if (this.keyspace == null) {
         sb.append("null");
       } else {
-        sb.append(this.table);
+        sb.append(this.keyspace);
       }
       first = false;
       if (!first) sb.append(", ");
@@ -4730,15 +4730,15 @@ public class Cassandra {
 
   public static class insert_args implements TBase, java.io.Serializable, Cloneable   {
     private static final TStruct STRUCT_DESC = new TStruct("insert_args");
-    private static final TField TABLE_FIELD_DESC = new TField("table", TType.STRING, (short)1);
+    private static final TField KEYSPACE_FIELD_DESC = new TField("keyspace", TType.STRING, (short)1);
     private static final TField KEY_FIELD_DESC = new TField("key", TType.STRING, (short)2);
     private static final TField COLUMN_PATH_FIELD_DESC = new TField("column_path", TType.STRUCT, (short)3);
     private static final TField VALUE_FIELD_DESC = new TField("value", TType.STRING, (short)4);
     private static final TField TIMESTAMP_FIELD_DESC = new TField("timestamp", TType.I64, (short)5);
     private static final TField CONSISTENCY_LEVEL_FIELD_DESC = new TField("consistency_level", TType.I32, (short)6);
 
-    public String table;
-    public static final int TABLE = 1;
+    public String keyspace;
+    public static final int KEYSPACE = 1;
     public String key;
     public static final int KEY = 2;
     public ColumnPath column_path;
@@ -4757,7 +4757,7 @@ public class Cassandra {
     }
 
     public static final Map<Integer, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new HashMap<Integer, FieldMetaData>() {{
-      put(TABLE, new FieldMetaData("table", TFieldRequirementType.DEFAULT, 
+      put(KEYSPACE, new FieldMetaData("keyspace", TFieldRequirementType.DEFAULT, 
           new FieldValueMetaData(TType.STRING)));
       put(KEY, new FieldMetaData("key", TFieldRequirementType.DEFAULT, 
           new FieldValueMetaData(TType.STRING)));
@@ -4781,7 +4781,7 @@ public class Cassandra {
     }
 
     public insert_args(
-      String table,
+      String keyspace,
       String key,
       ColumnPath column_path,
       byte[] value,
@@ -4789,7 +4789,7 @@ public class Cassandra {
       int consistency_level)
     {
       this();
-      this.table = table;
+      this.keyspace = keyspace;
       this.key = key;
       this.column_path = column_path;
       this.value = value;
@@ -4803,8 +4803,8 @@ public class Cassandra {
      * Performs a deep copy on <i>other</i>.
      */
     public insert_args(insert_args other) {
-      if (other.isSetTable()) {
-        this.table = other.table;
+      if (other.isSetKeyspace()) {
+        this.keyspace = other.keyspace;
       }
       if (other.isSetKey()) {
         this.key = other.key;
@@ -4827,26 +4827,26 @@ public class Cassandra {
       return new insert_args(this);
     }
 
-    public String getTable() {
-      return this.table;
+    public String getKeyspace() {
+      return this.keyspace;
     }
 
-    public void setTable(String table) {
-      this.table = table;
+    public void setKeyspace(String keyspace) {
+      this.keyspace = keyspace;
     }
 
-    public void unsetTable() {
-      this.table = null;
+    public void unsetKeyspace() {
+      this.keyspace = null;
     }
 
-    // Returns true if field table is set (has been asigned a value) and false otherwise
-    public boolean isSetTable() {
-      return this.table != null;
+    // Returns true if field keyspace is set (has been asigned a value) and false otherwise
+    public boolean isSetKeyspace() {
+      return this.keyspace != null;
     }
 
-    public void setTableIsSet(boolean value) {
+    public void setKeyspaceIsSet(boolean value) {
       if (!value) {
-        this.table = null;
+        this.keyspace = null;
       }
     }
 
@@ -4965,11 +4965,11 @@ public class Cassandra {
 
     public void setFieldValue(int fieldID, Object value) {
       switch (fieldID) {
-      case TABLE:
+      case KEYSPACE:
         if (value == null) {
-          unsetTable();
+          unsetKeyspace();
         } else {
-          setTable((String)value);
+          setKeyspace((String)value);
         }
         break;
 
@@ -5020,8 +5020,8 @@ public class Cassandra {
 
     public Object getFieldValue(int fieldID) {
       switch (fieldID) {
-      case TABLE:
-        return getTable();
+      case KEYSPACE:
+        return getKeyspace();
 
       case KEY:
         return getKey();
@@ -5046,8 +5046,8 @@ public class Cassandra {
     // Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise
     public boolean isSet(int fieldID) {
       switch (fieldID) {
-      case TABLE:
-        return isSetTable();
+      case KEYSPACE:
+        return isSetKeyspace();
       case KEY:
         return isSetKey();
       case COLUMN_PATH:
@@ -5076,12 +5076,12 @@ public class Cassandra {
       if (that == null)
         return false;
 
-      boolean this_present_table = true && this.isSetTable();
-      boolean that_present_table = true && that.isSetTable();
-      if (this_present_table || that_present_table) {
-        if (!(this_present_table && that_present_table))
+      boolean this_present_keyspace = true && this.isSetKeyspace();
+      boolean that_present_keyspace = true && that.isSetKeyspace();
+      if (this_present_keyspace || that_present_keyspace) {
+        if (!(this_present_keyspace && that_present_keyspace))
           return false;
-        if (!this.table.equals(that.table))
+        if (!this.keyspace.equals(that.keyspace))
           return false;
       }
 
@@ -5149,9 +5149,9 @@ public class Cassandra {
         }
         switch (field.id)
         {
-          case TABLE:
+          case KEYSPACE:
             if (field.type == TType.STRING) {
-              this.table = iprot.readString();
+              this.keyspace = iprot.readString();
             } else { 
               TProtocolUtil.skip(iprot, field.type);
             }
@@ -5211,9 +5211,9 @@ public class Cassandra {
       validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
-      if (this.table != null) {
-        oprot.writeFieldBegin(TABLE_FIELD_DESC);
-        oprot.writeString(this.table);
+      if (this.keyspace != null) {
+        oprot.writeFieldBegin(KEYSPACE_FIELD_DESC);
+        oprot.writeString(this.keyspace);
         oprot.writeFieldEnd();
       }
       if (this.key != null) {
@@ -5246,11 +5246,11 @@ public class Cassandra {
       StringBuilder sb = new StringBuilder("insert_args(");
       boolean first = true;
 
-      sb.append("table:");
-      if (this.table == null) {
+      sb.append("keyspace:");
+      if (this.keyspace == null) {
         sb.append("null");
       } else {
-        sb.append(this.table);
+        sb.append(this.keyspace);
       }
       first = false;
       if (!first) sb.append(", ");
@@ -5588,12 +5588,12 @@ public class Cassandra {
 
   public static class batch_insert_args implements TBase, java.io.Serializable, Cloneable   {
     private static final TStruct STRUCT_DESC = new TStruct("batch_insert_args");
-    private static final TField TABLE_FIELD_DESC = new TField("table", TType.STRING, (short)1);
+    private static final TField KEYSPACE_FIELD_DESC = new TField("keyspace", TType.STRING, (short)1);
     private static final TField BATCH_MUTATION_FIELD_DESC = new TField("batch_mutation", TType.STRUCT, (short)2);
     private static final TField CONSISTENCY_LEVEL_FIELD_DESC = new TField("consistency_level", TType.I32, (short)3);
 
-    public String table;
-    public static final int TABLE = 1;
+    public String keyspace;
+    public static final int KEYSPACE = 1;
     public BatchMutation batch_mutation;
     public static final int BATCH_MUTATION = 2;
     public int consistency_level;
@@ -5605,7 +5605,7 @@ public class Cassandra {
     }
 
     public static final Map<Integer, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new HashMap<Integer, FieldMetaData>() {{
-      put(TABLE, new FieldMetaData("table", TFieldRequirementType.DEFAULT, 
+      put(KEYSPACE, new FieldMetaData("keyspace", TFieldRequirementType.DEFAULT, 
           new FieldValueMetaData(TType.STRING)));
       put(BATCH_MUTATION, new FieldMetaData("batch_mutation", TFieldRequirementType.DEFAULT, 
           new StructMetaData(TType.STRUCT, BatchMutation.class)));
@@ -5623,12 +5623,12 @@ public class Cassandra {
     }
 
     public batch_insert_args(
-      String table,
+      String keyspace,
       BatchMutation batch_mutation,
       int consistency_level)
     {
       this();
-      this.table = table;
+      this.keyspace = keyspace;
       this.batch_mutation = batch_mutation;
       this.consistency_level = consistency_level;
       this.__isset.consistency_level = true;
@@ -5638,8 +5638,8 @@ public class Cassandra {
      * Performs a deep copy on <i>other</i>.
      */
     public batch_insert_args(batch_insert_args other) {
-      if (other.isSetTable()) {
-        this.table = other.table;
+      if (other.isSetKeyspace()) {
+        this.keyspace = other.keyspace;
       }
       if (other.isSetBatch_mutation()) {
         this.batch_mutation = new BatchMutation(other.batch_mutation);
@@ -5653,26 +5653,26 @@ public class Cassandra {
       return new batch_insert_args(this);
     }
 
-    public String getTable() {
-      return this.table;
+    public String getKeyspace() {
+      return this.keyspace;
     }
 
-    public void setTable(String table) {
-      this.table = table;
+    public void setKeyspace(String keyspace) {
+      this.keyspace = keyspace;
     }
 
-    public void unsetTable() {
-      this.table = null;
+    public void unsetKeyspace() {
+      this.keyspace = null;
     }
 
-    // Returns true if field table is set (has been asigned a value) and false otherwise
-    public boolean isSetTable() {
-      return this.table != null;
+    // Returns true if field keyspace is set (has been asigned a value) and false otherwise
+    public boolean isSetKeyspace() {
+      return this.keyspace != null;
     }
 
-    public void setTableIsSet(boolean value) {
+    public void setKeyspaceIsSet(boolean value) {
       if (!value) {
-        this.table = null;
+        this.keyspace = null;
       }
     }
 
@@ -5723,11 +5723,11 @@ public class Cassandra {
 
     public void setFieldValue(int fieldID, Object value) {
       switch (fieldID) {
-      case TABLE:
+      case KEYSPACE:
         if (value == null) {
-          unsetTable();
+          unsetKeyspace();
         } else {
-          setTable((String)value);
+          setKeyspace((String)value);
         }
         break;
 
@@ -5754,8 +5754,8 @@ public class Cassandra {
 
     public Object getFieldValue(int fieldID) {
       switch (fieldID) {
-      case TABLE:
-        return getTable();
+      case KEYSPACE:
+        return getKeyspace();
 
       case BATCH_MUTATION:
         return getBatch_mutation();
@@ -5771,8 +5771,8 @@ public class Cassandra {
     // Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise
     public boolean isSet(int fieldID) {
       switch (fieldID) {
-      case TABLE:
-        return isSetTable();
+      case KEYSPACE:
+        return isSetKeyspace();
       case BATCH_MUTATION:
         return isSetBatch_mutation();
       case CONSISTENCY_LEVEL:
@@ -5795,12 +5795,12 @@ public class Cassandra {
       if (that == null)
         return false;
 
-      boolean this_present_table = true && this.isSetTable();
-      boolean that_present_table = true && that.isSetTable();
-      if (this_present_table || that_present_table) {
-        if (!(this_present_table && that_present_table))
+      boolean this_present_keyspace = true && this.isSetKeyspace();
+      boolean that_present_keyspace = true && that.isSetKeyspace();
+      if (this_present_keyspace || that_present_keyspace) {
+        if (!(this_present_keyspace && that_present_keyspace))
           return false;
-        if (!this.table.equals(that.table))
+        if (!this.keyspace.equals(that.keyspace))
           return false;
       }
 
@@ -5841,9 +5841,9 @@ public class Cassandra {
         }
         switch (field.id)
         {
-          case TABLE:
+          case KEYSPACE:
             if (field.type == TType.STRING) {
-              this.table = iprot.readString();
+              this.keyspace = iprot.readString();
             } else { 
               TProtocolUtil.skip(iprot, field.type);
             }
@@ -5881,9 +5881,9 @@ public class Cassandra {
       validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
-      if (this.table != null) {
-        oprot.writeFieldBegin(TABLE_FIELD_DESC);
-        oprot.writeString(this.table);
+      if (this.keyspace != null) {
+        oprot.writeFieldBegin(KEYSPACE_FIELD_DESC);
+        oprot.writeString(this.keyspace);
         oprot.writeFieldEnd();
       }
       if (this.batch_mutation != null) {
@@ -5903,11 +5903,11 @@ public class Cassandra {
       StringBuilder sb = new StringBuilder("batch_insert_args(");
       boolean first = true;
 
-      sb.append("table:");
-      if (this.table == null) {
+      sb.append("keyspace:");
+      if (this.keyspace == null) {
         sb.append("null");
       } else {
-        sb.append(this.table);
+        sb.append(this.keyspace);
       }
       first = false;
       if (!first) sb.append(", ");
@@ -6220,14 +6220,14 @@ public class Cassandra {
 
   public static class remove_args implements TBase, java.io.Serializable, Cloneable   {
     private static final TStruct STRUCT_DESC = new TStruct("remove_args");
-    private static final TField TABLE_FIELD_DESC = new TField("table", TType.STRING, (short)1);
+    private static final TField KEYSPACE_FIELD_DESC = new TField("keyspace", TType.STRING, (short)1);
     private static final TField KEY_FIELD_DESC = new TField("key", TType.STRING, (short)2);
     private static final TField COLUMN_PATH_OR_PARENT_FIELD_DESC = new TField("column_path_or_parent", TType.STRUCT, (short)3);
     private static final TField TIMESTAMP_FIELD_DESC = new TField("timestamp", TType.I64, (short)4);
     private static final TField CONSISTENCY_LEVEL_FIELD_DESC = new TField("consistency_level", TType.I32, (short)5);
 
-    public String table;
-    public static final int TABLE = 1;
+    public String keyspace;
+    public static final int KEYSPACE = 1;
     public String key;
     public static final int KEY = 2;
     public ColumnPathOrParent column_path_or_parent;
@@ -6244,7 +6244,7 @@ public class Cassandra {
     }
 
     public static final Map<Integer, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new HashMap<Integer, FieldMetaData>() {{
-      put(TABLE, new FieldMetaData("table", TFieldRequirementType.DEFAULT, 
+      put(KEYSPACE, new FieldMetaData("keyspace", TFieldRequirementType.DEFAULT, 
           new FieldValueMetaData(TType.STRING)));
       put(KEY, new FieldMetaData("key", TFieldRequirementType.DEFAULT, 
           new FieldValueMetaData(TType.STRING)));
@@ -6266,14 +6266,14 @@ public class Cassandra {
     }
 
     public remove_args(
-      String table,
+      String keyspace,
       String key,
       ColumnPathOrParent column_path_or_parent,
       long timestamp,
       int consistency_level)
     {
       this();
-      this.table = table;
+      this.keyspace = keyspace;
       this.key = key;
       this.column_path_or_parent = column_path_or_parent;
       this.timestamp = timestamp;
@@ -6286,8 +6286,8 @@ public class Cassandra {
      * Performs a deep copy on <i>other</i>.
      */
     public remove_args(remove_args other) {
-      if (other.isSetTable()) {
-        this.table = other.table;
+      if (other.isSetKeyspace()) {
+        this.keyspace = other.keyspace;
       }
       if (other.isSetKey()) {
         this.key = other.key;
@@ -6306,26 +6306,26 @@ public class Cassandra {
       return new remove_args(this);
     }
 
-    public String getTable() {
-      return this.table;
+    public String getKeyspace() {
+      return this.keyspace;
     }
 
-    public void setTable(String table) {
-      this.table = table;
+    public void setKeyspace(String keyspace) {
+      this.keyspace = keyspace;
     }
 
-    public void unsetTable() {
-      this.table = null;
+    public void unsetKeyspace() {
+      this.keyspace = null;
     }
 
-    // Returns true if field table is set (has been asigned a value) and false otherwise
-    public boolean isSetTable() {
-      return this.table != null;
+    // Returns true if field keyspace is set (has been asigned a value) and false otherwise
+    public boolean isSetKeyspace() {
+      return this.keyspace != null;
     }
 
-    public void setTableIsSet(boolean value) {
+    public void setKeyspaceIsSet(boolean value) {
       if (!value) {
-        this.table = null;
+        this.keyspace = null;
       }
     }
 
@@ -6421,11 +6421,11 @@ public class Cassandra {
 
     public void setFieldValue(int fieldID, Object value) {
       switch (fieldID) {
-      case TABLE:
+      case KEYSPACE:
         if (value == null) {
-          unsetTable();
+          unsetKeyspace();
         } else {
-          setTable((String)value);
+          setKeyspace((String)value);
         }
         break;
 
@@ -6468,8 +6468,8 @@ public class Cassandra {
 
     public Object getFieldValue(int fieldID) {
       switch (fieldID) {
-      case TABLE:
-        return getTable();
+      case KEYSPACE:
+        return getKeyspace();
 
       case KEY:
         return getKey();
@@ -6491,8 +6491,8 @@ public class Cassandra {
     // Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise
     public boolean isSet(int fieldID) {
       switch (fieldID) {
-      case TABLE:
-        return isSetTable();
+      case KEYSPACE:
+        return isSetKeyspace();
       case KEY:
         return isSetKey();
       case COLUMN_PATH_OR_PARENT:
@@ -6519,12 +6519,12 @@ public class Cassandra {
       if (that == null)
         return false;
 
-      boolean this_present_table = true && this.isSetTable();
-      boolean that_present_table = true && that.isSetTable();
-      if (this_present_table || that_present_table) {
-        if (!(this_present_table && that_present_table))
+      boolean this_present_keyspace = true && this.isSetKeyspace();
+      boolean that_present_keyspace = true && that.isSetKeyspace();
+      if (this_present_keyspace || that_present_keyspace) {
+        if (!(this_present_keyspace && that_present_keyspace))
           return false;
-        if (!this.table.equals(that.table))
+        if (!this.keyspace.equals(that.keyspace))
           return false;
       }
 
@@ -6583,9 +6583,9 @@ public class Cassandra {
         }
         switch (field.id)
         {
-          case TABLE:
+          case KEYSPACE:
             if (field.type == TType.STRING) {
-              this.table = iprot.readString();
+              this.keyspace = iprot.readString();
             } else { 
               TProtocolUtil.skip(iprot, field.type);
             }
@@ -6638,9 +6638,9 @@ public class Cassandra {
       validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
-      if (this.table != null) {
-        oprot.writeFieldBegin(TABLE_FIELD_DESC);
-        oprot.writeString(this.table);
+      if (this.keyspace != null) {
+        oprot.writeFieldBegin(KEYSPACE_FIELD_DESC);
+        oprot.writeString(this.keyspace);
         oprot.writeFieldEnd();
       }
       if (this.key != null) {
@@ -6668,11 +6668,11 @@ public class Cassandra {
       StringBuilder sb = new StringBuilder("remove_args(");
       boolean first = true;
 
-      sb.append("table:");
-      if (this.table == null) {
+      sb.append("keyspace:");
+      if (this.keyspace == null) {
         sb.append("null");
       } else {
-        sb.append(this.table);
+        sb.append(this.keyspace);
       }
       first = false;
       if (!first) sb.append(", ");
@@ -6997,7 +6997,7 @@ public class Cassandra {
 
   public static class get_slice_super_args implements TBase, java.io.Serializable, Cloneable   {
     private static final TStruct STRUCT_DESC = new TStruct("get_slice_super_args");
-    private static final TField TABLE_FIELD_DESC = new TField("table", TType.STRING, (short)1);
+    private static final TField KEYSPACE_FIELD_DESC = new TField("keyspace", TType.STRING, (short)1);
     private static final TField KEY_FIELD_DESC = new TField("key", TType.STRING, (short)2);
     private static final TField COLUMN_FAMILY_FIELD_DESC = new TField("column_family", TType.STRING, (short)3);
     private static final TField START_FIELD_DESC = new TField("start", TType.STRING, (short)4);
@@ -7006,8 +7006,8 @@ public class Cassandra {
     private static final TField COUNT_FIELD_DESC = new TField("count", TType.I32, (short)7);
     private static final TField CONSISTENCY_LEVEL_FIELD_DESC = new TField("consistency_level", TType.I32, (short)8);
 
-    public String table;
-    public static final int TABLE = 1;
+    public String keyspace;
+    public static final int KEYSPACE = 1;
     public String key;
     public static final int KEY = 2;
     public String column_family;
@@ -7031,7 +7031,7 @@ public class Cassandra {
     }
 
     public static final Map<Integer, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new HashMap<Integer, FieldMetaData>() {{
-      put(TABLE, new FieldMetaData("table", TFieldRequirementType.DEFAULT, 
+      put(KEYSPACE, new FieldMetaData("keyspace", TFieldRequirementType.DEFAULT, 
           new FieldValueMetaData(TType.STRING)));
       put(KEY, new FieldMetaData("key", TFieldRequirementType.DEFAULT, 
           new FieldValueMetaData(TType.STRING)));
@@ -7061,7 +7061,7 @@ public class Cassandra {
     }
 
     public get_slice_super_args(
-      String table,
+      String keyspace,
       String key,
       String column_family,
       byte[] start,
@@ -7071,7 +7071,7 @@ public class Cassandra {
       int consistency_level)
     {
       this();
-      this.table = table;
+      this.keyspace = keyspace;
       this.key = key;
       this.column_family = column_family;
       this.start = start;
@@ -7088,8 +7088,8 @@ public class Cassandra {
      * Performs a deep copy on <i>other</i>.
      */
     public get_slice_super_args(get_slice_super_args other) {
-      if (other.isSetTable()) {
-        this.table = other.table;
+      if (other.isSetKeyspace()) {
+        this.keyspace = other.keyspace;
       }
       if (other.isSetKey()) {
         this.key = other.key;
@@ -7118,26 +7118,26 @@ public class Cassandra {
       return new get_slice_super_args(this);
     }
 
-    public String getTable() {
-      return this.table;
+    public String getKeyspace() {
+      return this.keyspace;
     }
 
-    public void setTable(String table) {
-      this.table = table;
+    public void setKeyspace(String keyspace) {
+      this.keyspace = keyspace;
     }
 
-    public void unsetTable() {
-      this.table = null;
+    public void unsetKeyspace() {
+      this.keyspace = null;
     }
 
-    // Returns true if field table is set (has been asigned a value) and false otherwise
-    public boolean isSetTable() {
-      return this.table != null;
+    // Returns true if field keyspace is set (has been asigned a value) and false otherwise
+    public boolean isSetKeyspace() {
+      return this.keyspace != null;
     }
 
-    public void setTableIsSet(boolean value) {
+    public void setKeyspaceIsSet(boolean value) {
       if (!value) {
-        this.table = null;
+        this.keyspace = null;
       }
     }
 
@@ -7301,11 +7301,11 @@ public class Cassandra {
 
     public void setFieldValue(int fieldID, Object value) {
       switch (fieldID) {
-      case TABLE:
+      case KEYSPACE:
         if (value == null) {
-          unsetTable();
+          unsetKeyspace();
         } else {
-          setTable((String)value);
+          setKeyspace((String)value);
         }
         break;
 
@@ -7372,8 +7372,8 @@ public class Cassandra {
 
     public Object getFieldValue(int fieldID) {
       switch (fieldID) {
-      case TABLE:
-        return getTable();
+      case KEYSPACE:
+        return getKeyspace();
 
       case KEY:
         return getKey();
@@ -7404,8 +7404,8 @@ public class Cassandra {
     // Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise
     public boolean isSet(int fieldID) {
       switch (fieldID) {
-      case TABLE:
-        return isSetTable();
+      case KEYSPACE:
+        return isSetKeyspace();
       case KEY:
         return isSetKey();
       case COLUMN_FAMILY:
@@ -7438,12 +7438,12 @@ public class Cassandra {
       if (that == null)
         return false;
 
-      boolean this_present_table = true && this.isSetTable();
-      boolean that_present_table = true && that.isSetTable();
-      if (this_present_table || that_present_table) {
-        if (!(this_present_table && that_present_table))
+      boolean this_present_keyspace = true && this.isSetKeyspace();
+      boolean that_present_keyspace = true && that.isSetKeyspace();
+      if (this_present_keyspace || that_present_keyspace) {
+        if (!(this_present_keyspace && that_present_keyspace))
           return false;
-        if (!this.table.equals(that.table))
+        if (!this.keyspace.equals(that.keyspace))
           return false;
       }
 
@@ -7529,9 +7529,9 @@ public class Cassandra {
         }
         switch (field.id)
         {
-          case TABLE:
+          case KEYSPACE:
             if (field.type == TType.STRING) {
-              this.table = iprot.readString();
+              this.keyspace = iprot.readString();
             } else { 
               TProtocolUtil.skip(iprot, field.type);
             }
@@ -7605,9 +7605,9 @@ public class Cassandra {
       validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
-      if (this.table != null) {
-        oprot.writeFieldBegin(TABLE_FIELD_DESC);
-        oprot.writeString(this.table);
+      if (this.keyspace != null) {
+        oprot.writeFieldBegin(KEYSPACE_FIELD_DESC);
+        oprot.writeString(this.keyspace);
         oprot.writeFieldEnd();
       }
       if (this.key != null) {
@@ -7648,11 +7648,11 @@ public class Cassandra {
       StringBuilder sb = new StringBuilder("get_slice_super_args(");
       boolean first = true;
 
-      sb.append("table:");
-      if (this.table == null) {
+      sb.append("keyspace:");
+      if (this.keyspace == null) {
         sb.append("null");
       } else {
-        sb.append(this.table);
+        sb.append(this.keyspace);
       }
       first = false;
       if (!first) sb.append(", ");
@@ -8043,14 +8043,14 @@ public class Cassandra {
 
   public static class get_slice_super_by_names_args implements TBase, java.io.Serializable, Cloneable   {
     private static final TStruct STRUCT_DESC = new TStruct("get_slice_super_by_names_args");
-    private static final TField TABLE_FIELD_DESC = new TField("table", TType.STRING, (short)1);
+    private static final TField KEYSPACE_FIELD_DESC = new TField("keyspace", TType.STRING, (short)1);
     private static final TField KEY_FIELD_DESC = new TField("key", TType.STRING, (short)2);
     private static final TField COLUMN_FAMILY_FIELD_DESC = new TField("column_family", TType.STRING, (short)3);
     private static final TField SUPER_COLUMN_NAMES_FIELD_DESC = new TField("super_column_names", TType.LIST, (short)4);
     private static final TField CONSISTENCY_LEVEL_FIELD_DESC = new TField("consistency_level", TType.I32, (short)5);
 
-    public String table;
-    public static final int TABLE = 1;
+    public String keyspace;
+    public static final int KEYSPACE = 1;
     public String key;
     public static final int KEY = 2;
     public String column_family;
@@ -8066,7 +8066,7 @@ public class Cassandra {
     }
 
     public static final Map<Integer, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new HashMap<Integer, FieldMetaData>() {{
-      put(TABLE, new FieldMetaData("table", TFieldRequirementType.DEFAULT, 
+      put(KEYSPACE, new FieldMetaData("keyspace", TFieldRequirementType.DEFAULT, 
           new FieldValueMetaData(TType.STRING)));
       put(KEY, new FieldMetaData("key", TFieldRequirementType.DEFAULT, 
           new FieldValueMetaData(TType.STRING)));
@@ -8089,14 +8089,14 @@ public class Cassandra {
     }
 
     public get_slice_super_by_names_args(
-      String table,
+      String keyspace,
       String key,
       String column_family,
       List<byte[]> super_column_names,
       int consistency_level)
     {
       this();
-      this.table = table;
+      this.keyspace = keyspace;
       this.key = key;
       this.column_family = column_family;
       this.super_column_names = super_column_names;
@@ -8108,8 +8108,8 @@ public class Cassandra {
      * Performs a deep copy on <i>other</i>.
      */
     public get_slice_super_by_names_args(get_slice_super_by_names_args other) {
-      if (other.isSetTable()) {
-        this.table = other.table;
+      if (other.isSetKeyspace()) {
+        this.keyspace = other.keyspace;
       }
       if (other.isSetKey()) {
         this.key = other.key;
@@ -8135,26 +8135,26 @@ public class Cassandra {
       return new get_slice_super_by_names_args(this);
     }
 
-    public String getTable() {
-      return this.table;
+    public String getKeyspace() {
+      return this.keyspace;
     }
 
-    public void setTable(String table) {
-      this.table = table;
+    public void setKeyspace(String keyspace) {
+      this.keyspace = keyspace;
     }
 
-    public void unsetTable() {
-      this.table = null;
+    public void unsetKeyspace() {
+      this.keyspace = null;
     }
 
-    // Returns true if field table is set (has been asigned a value) and false otherwise
-    public boolean isSetTable() {
-      return this.table != null;
+    // Returns true if field keyspace is set (has been asigned a value) and false otherwise
+    public boolean isSetKeyspace() {
+      return this.keyspace != null;
     }
 
-    public void setTableIsSet(boolean value) {
+    public void setKeyspaceIsSet(boolean value) {
       if (!value) {
-        this.table = null;
+        this.keyspace = null;
       }
     }
 
@@ -8266,11 +8266,11 @@ public class Cassandra {
 
     public void setFieldValue(int fieldID, Object value) {
       switch (fieldID) {
-      case TABLE:
+      case KEYSPACE:
         if (value == null) {
-          unsetTable();
+          unsetKeyspace();
         } else {
-          setTable((String)value);
+          setKeyspace((String)value);
         }
         break;
 
@@ -8313,8 +8313,8 @@ public class Cassandra {
 
     public Object getFieldValue(int fieldID) {
       switch (fieldID) {
-      case TABLE:
-        return getTable();
+      case KEYSPACE:
+        return getKeyspace();
 
       case KEY:
         return getKey();
@@ -8336,8 +8336,8 @@ public class Cassandra {
     // Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise
     public boolean isSet(int fieldID) {
       switch (fieldID) {
-      case TABLE:
-        return isSetTable();
+      case KEYSPACE:
+        return isSetKeyspace();
       case KEY:
         return isSetKey();
       case COLUMN_FAMILY:
@@ -8364,12 +8364,12 @@ public class Cassandra {
       if (that == null)
         return false;
 
-      boolean this_present_table = true && this.isSetTable();
-      boolean that_present_table = true && that.isSetTable();
-      if (this_present_table || that_present_table) {
-        if (!(this_present_table && that_present_table))
+      boolean this_present_keyspace = true && this.isSetKeyspace();
+      boolean that_present_keyspace = true && that.isSetKeyspace();
+      if (this_present_keyspace || that_present_keyspace) {
+        if (!(this_present_keyspace && that_present_keyspace))
           return false;
-        if (!this.table.equals(that.table))
+        if (!this.keyspace.equals(that.keyspace))
           return false;
       }
 
@@ -8428,9 +8428,9 @@ public class Cassandra {
         }
         switch (field.id)
         {
-          case TABLE:
+          case KEYSPACE:
             if (field.type == TType.STRING) {
-              this.table = iprot.readString();
+              this.keyspace = iprot.readString();
             } else { 
               TProtocolUtil.skip(iprot, field.type);
             }
@@ -8491,9 +8491,9 @@ public class Cassandra {
       validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
-      if (this.table != null) {
-        oprot.writeFieldBegin(TABLE_FIELD_DESC);
-        oprot.writeString(this.table);
+      if (this.keyspace != null) {
+        oprot.writeFieldBegin(KEYSPACE_FIELD_DESC);
+        oprot.writeString(this.keyspace);
         oprot.writeFieldEnd();
       }
       if (this.key != null) {
@@ -8529,11 +8529,11 @@ public class Cassandra {
       StringBuilder sb = new StringBuilder("get_slice_super_by_names_args(");
       boolean first = true;
 
-      sb.append("table:");
-      if (this.table == null) {
+      sb.append("keyspace:");
+      if (this.keyspace == null) {
         sb.append("null");
       } else {
-        sb.append(this.table);
+        sb.append(this.keyspace);
       }
       first = false;
       if (!first) sb.append(", ");
@@ -8898,13 +8898,13 @@ public class Cassandra {
 
   public static class get_super_column_args implements TBase, java.io.Serializable, Cloneable   {
     private static final TStruct STRUCT_DESC = new TStruct("get_super_column_args");
-    private static final TField TABLE_FIELD_DESC = new TField("table", TType.STRING, (short)1);
+    private static final TField KEYSPACE_FIELD_DESC = new TField("keyspace", TType.STRING, (short)1);
     private static final TField KEY_FIELD_DESC = new TField("key", TType.STRING, (short)2);
     private static final TField SUPER_COLUMN_PATH_FIELD_DESC = new TField("super_column_path", TType.STRUCT, (short)3);
     private static final TField CONSISTENCY_LEVEL_FIELD_DESC = new TField("consistency_level", TType.I32, (short)4);
 
-    public String table;
-    public static final int TABLE = 1;
+    public String keyspace;
+    public static final int KEYSPACE = 1;
     public String key;
     public static final int KEY = 2;
     public SuperColumnPath super_column_path;
@@ -8918,7 +8918,7 @@ public class Cassandra {
     }
 
     public static final Map<Integer, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new HashMap<Integer, FieldMetaData>() {{
-      put(TABLE, new FieldMetaData("table", TFieldRequirementType.DEFAULT, 
+      put(KEYSPACE, new FieldMetaData("keyspace", TFieldRequirementType.DEFAULT, 
           new FieldValueMetaData(TType.STRING)));
       put(KEY, new FieldMetaData("key", TFieldRequirementType.DEFAULT, 
           new FieldValueMetaData(TType.STRING)));
@@ -8938,13 +8938,13 @@ public class Cassandra {
     }
 
     public get_super_column_args(
-      String table,
+      String keyspace,
       String key,
       SuperColumnPath super_column_path,
       int consistency_level)
     {
       this();
-      this.table = table;
+      this.keyspace = keyspace;
       this.key = key;
       this.super_column_path = super_column_path;
       this.consistency_level = consistency_level;
@@ -8955,8 +8955,8 @@ public class Cassandra {
      * Performs a deep copy on <i>other</i>.
      */
     public get_super_column_args(get_super_column_args other) {
-      if (other.isSetTable()) {
-        this.table = other.table;
+      if (other.isSetKeyspace()) {
+        this.keyspace = other.keyspace;
       }
       if (other.isSetKey()) {
         this.key = other.key;
@@ -8973,26 +8973,26 @@ public class Cassandra {
       return new get_super_column_args(this);
     }
 
-    public String getTable() {
-      return this.table;
+    public String getKeyspace() {
+      return this.keyspace;
     }
 
-    public void setTable(String table) {
-      this.table = table;
+    public void setKeyspace(String keyspace) {
+      this.keyspace = keyspace;
     }
 
-    public void unsetTable() {
-      this.table = null;
+    public void unsetKeyspace() {
+      this.keyspace = null;
     }
 
-    // Returns true if field table is set (has been asigned a value) and false otherwise
-    public boolean isSetTable() {
-      return this.table != null;
+    // Returns true if field keyspace is set (has been asigned a value) and false otherwise
+    public boolean isSetKeyspace() {
+      return this.keyspace != null;
     }
 
-    public void setTableIsSet(boolean value) {
+    public void setKeyspaceIsSet(boolean value) {
       if (!value) {
-        this.table = null;
+        this.keyspace = null;
       }
     }
 
@@ -9066,11 +9066,11 @@ public class Cassandra {
 
     public void setFieldValue(int fieldID, Object value) {
       switch (fieldID) {
-      case TABLE:
+      case KEYSPACE:
         if (value == null) {
-          unsetTable();
+          unsetKeyspace();
         } else {
-          setTable((String)value);
+          setKeyspace((String)value);
         }
         break;
 
@@ -9105,8 +9105,8 @@ public class Cassandra {
 
     public Object getFieldValue(int fieldID) {
       switch (fieldID) {
-      case TABLE:
-        return getTable();
+      case KEYSPACE:
+        return getKeyspace();
 
       case KEY:
         return getKey();
@@ -9125,8 +9125,8 @@ public class Cassandra {
     // Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise
     public boolean isSet(int fieldID) {
       switch (fieldID) {
-      case TABLE:
-        return isSetTable();
+      case KEYSPACE:
+        return isSetKeyspace();
       case KEY:
         return isSetKey();
       case SUPER_COLUMN_PATH:
@@ -9151,12 +9151,12 @@ public class Cassandra {
       if (that == null)
         return false;
 
-      boolean this_present_table = true && this.isSetTable();
-      boolean that_present_table = true && that.isSetTable();
-      if (this_present_table || that_present_table) {
-        if (!(this_present_table && that_present_table))
+      boolean this_present_keyspace = true && this.isSetKeyspace();
+      boolean that_present_keyspace = true && that.isSetKeyspace();
+      if (this_present_keyspace || that_present_keyspace) {
+        if (!(this_present_keyspace && that_present_keyspace))
           return false;
-        if (!this.table.equals(that.table))
+        if (!this.keyspace.equals(that.keyspace))
           return false;
       }
 
@@ -9206,9 +9206,9 @@ public class Cassandra {
         }
         switch (field.id)
         {
-          case TABLE:
+          case KEYSPACE:
             if (field.type == TType.STRING) {
-              this.table = iprot.readString();
+              this.keyspace = iprot.readString();
             } else { 
               TProtocolUtil.skip(iprot, field.type);
             }
@@ -9253,9 +9253,9 @@ public class Cassandra {
       validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
-      if (this.table != null) {
-        oprot.writeFieldBegin(TABLE_FIELD_DESC);
-        oprot.writeString(this.table);
+      if (this.keyspace != null) {
+        oprot.writeFieldBegin(KEYSPACE_FIELD_DESC);
+        oprot.writeString(this.keyspace);
         oprot.writeFieldEnd();
       }
       if (this.key != null) {
@@ -9280,11 +9280,11 @@ public class Cassandra {
       StringBuilder sb = new StringBuilder("get_super_column_args(");
       boolean first = true;
 
-      sb.append("table:");
-      if (this.table == null) {
+      sb.append("keyspace:");
+      if (this.keyspace == null) {
         sb.append("null");
       } else {
-        sb.append(this.table);
+        sb.append(this.keyspace);
       }
       first = false;
       if (!first) sb.append(", ");
@@ -9680,12 +9680,12 @@ public class Cassandra {
 
   public static class batch_insert_super_column_args implements TBase, java.io.Serializable, Cloneable   {
     private static final TStruct STRUCT_DESC = new TStruct("batch_insert_super_column_args");
-    private static final TField TABLE_FIELD_DESC = new TField("table", TType.STRING, (short)1);
+    private static final TField KEYSPACE_FIELD_DESC = new TField("keyspace", TType.STRING, (short)1);
     private static final TField BATCH_MUTATION_SUPER_FIELD_DESC = new TField("batch_mutation_super", TType.STRUCT, (short)2);
     private static final TField CONSISTENCY_LEVEL_FIELD_DESC = new TField("consistency_level", TType.I32, (short)3);
 
-    public String table;
-    public static final int TABLE = 1;
+    public String keyspace;
+    public static final int KEYSPACE = 1;
     public BatchMutationSuper batch_mutation_super;
     public static final int BATCH_MUTATION_SUPER = 2;
     public int consistency_level;
@@ -9697,7 +9697,7 @@ public class Cassandra {
     }
 
     public static final Map<Integer, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new HashMap<Integer, FieldMetaData>() {{
-      put(TABLE, new FieldMetaData("table", TFieldRequirementType.DEFAULT, 
+      put(KEYSPACE, new FieldMetaData("keyspace", TFieldRequirementType.DEFAULT, 
           new FieldValueMetaData(TType.STRING)));
       put(BATCH_MUTATION_SUPER, new FieldMetaData("batch_mutation_super", TFieldRequirementType.DEFAULT, 
           new StructMetaData(TType.STRUCT, BatchMutationSuper.class)));
@@ -9715,12 +9715,12 @@ public class Cassandra {
     }
 
     public batch_insert_super_column_args(
-      String table,
+      String keyspace,
       BatchMutationSuper batch_mutation_super,
       int consistency_level)
     {
       this();
-      this.table = table;
+      this.keyspace = keyspace;
       this.batch_mutation_super = batch_mutation_super;
       this.consistency_level = consistency_level;
       this.__isset.consistency_level = true;
@@ -9730,8 +9730,8 @@ public class Cassandra {
      * Performs a deep copy on <i>other</i>.
      */
     public batch_insert_super_column_args(batch_insert_super_column_args other) {
-      if (other.isSetTable()) {
-        this.table = other.table;
+      if (other.isSetKeyspace()) {
+        this.keyspace = other.keyspace;
       }
       if (other.isSetBatch_mutation_super()) {
         this.batch_mutation_super = new BatchMutationSuper(other.batch_mutation_super);
@@ -9745,26 +9745,26 @@ public class Cassandra {
       return new batch_insert_super_column_args(this);
     }
 
-    public String getTable() {
-      return this.table;
+    public String getKeyspace() {
+      return this.keyspace;
     }
 
-    public void setTable(String table) {
-      this.table = table;
+    public void setKeyspace(String keyspace) {
+      this.keyspace = keyspace;
     }
 
-    public void unsetTable() {
-      this.table = null;
+    public void unsetKeyspace() {
+      this.keyspace = null;
     }
 
-    // Returns true if field table is set (has been asigned a value) and false otherwise
-    public boolean isSetTable() {
-      return this.table != null;
+    // Returns true if field keyspace is set (has been asigned a value) and false otherwise
+    public boolean isSetKeyspace() {
+      return this.keyspace != null;
     }
 
-    public void setTableIsSet(boolean value) {
+    public void setKeyspaceIsSet(boolean value) {
       if (!value) {
-        this.table = null;
+        this.keyspace = null;
       }
     }
 
@@ -9815,11 +9815,11 @@ public class Cassandra {
 
     public void setFieldValue(int fieldID, Object value) {
       switch (fieldID) {
-      case TABLE:
+      case KEYSPACE:
         if (value == null) {
-          unsetTable();
+          unsetKeyspace();
         } else {
-          setTable((String)value);
+          setKeyspace((String)value);
         }
         break;
 
@@ -9846,8 +9846,8 @@ public class Cassandra {
 
     public Object getFieldValue(int fieldID) {
       switch (fieldID) {
-      case TABLE:
-        return getTable();
+      case KEYSPACE:
+        return getKeyspace();
 
       case BATCH_MUTATION_SUPER:
         return getBatch_mutation_super();
@@ -9863,8 +9863,8 @@ public class Cassandra {
     // Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise
     public boolean isSet(int fieldID) {
       switch (fieldID) {
-      case TABLE:
-        return isSetTable();
+      case KEYSPACE:
+        return isSetKeyspace();
       case BATCH_MUTATION_SUPER:
         return isSetBatch_mutation_super();
       case CONSISTENCY_LEVEL:
@@ -9887,12 +9887,12 @@ public class Cassandra {
       if (that == null)
         return false;
 
-      boolean this_present_table = true && this.isSetTable();
-      boolean that_present_table = true && that.isSetTable();
-      if (this_present_table || that_present_table) {
-        if (!(this_present_table && that_present_table))
+      boolean this_present_keyspace = true && this.isSetKeyspace();
+      boolean that_present_keyspace = true && that.isSetKeyspace();
+      if (this_present_keyspace || that_present_keyspace) {
+        if (!(this_present_keyspace && that_present_keyspace))
           return false;
-        if (!this.table.equals(that.table))
+        if (!this.keyspace.equals(that.keyspace))
           return false;
       }
 
@@ -9933,9 +9933,9 @@ public class Cassandra {
         }
         switch (field.id)
         {
-          case TABLE:
+          case KEYSPACE:
             if (field.type == TType.STRING) {
-              this.table = iprot.readString();
+              this.keyspace = iprot.readString();
             } else { 
               TProtocolUtil.skip(iprot, field.type);
             }
@@ -9973,9 +9973,9 @@ public class Cassandra {
       validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
-      if (this.table != null) {
-        oprot.writeFieldBegin(TABLE_FIELD_DESC);
-        oprot.writeString(this.table);
+      if (this.keyspace != null) {
+        oprot.writeFieldBegin(KEYSPACE_FIELD_DESC);
+        oprot.writeString(this.keyspace);
         oprot.writeFieldEnd();
       }
       if (this.batch_mutation_super != null) {
@@ -9995,11 +9995,11 @@ public class Cassandra {
       StringBuilder sb = new StringBuilder("batch_insert_super_column_args(");
       boolean first = true;
 
-      sb.append("table:");
-      if (this.table == null) {
+      sb.append("keyspace:");
+      if (this.keyspace == null) {
         sb.append("null");
       } else {
-        sb.append(this.table);
+        sb.append(this.keyspace);
       }
       first = false;
       if (!first) sb.append(", ");
@@ -10312,14 +10312,14 @@ public class Cassandra {
 
   public static class get_key_range_args implements TBase, java.io.Serializable, Cloneable   {
     private static final TStruct STRUCT_DESC = new TStruct("get_key_range_args");
-    private static final TField TABLE_FIELD_DESC = new TField("table", TType.STRING, (short)1);
+    private static final TField KEYSPACE_FIELD_DESC = new TField("keyspace", TType.STRING, (short)1);
     private static final TField COLUMN_FAMILY_FIELD_DESC = new TField("column_family", TType.STRING, (short)2);
     private static final TField START_FIELD_DESC = new TField("start", TType.STRING, (short)3);
     private static final TField FINISH_FIELD_DESC = new TField("finish", TType.STRING, (short)4);
     private static final TField COUNT_FIELD_DESC = new TField("count", TType.I32, (short)5);
 
-    public String table;
-    public static final int TABLE = 1;
+    public String keyspace;
+    public static final int KEYSPACE = 1;
     public String column_family;
     public static final int COLUMN_FAMILY = 2;
     public String start;
@@ -10335,7 +10335,7 @@ public class Cassandra {
     }
 
     public static final Map<Integer, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new HashMap<Integer, FieldMetaData>() {{
-      put(TABLE, new FieldMetaData("table", TFieldRequirementType.DEFAULT, 
+      put(KEYSPACE, new FieldMetaData("keyspace", TFieldRequirementType.DEFAULT, 
           new FieldValueMetaData(TType.STRING)));
       put(COLUMN_FAMILY, new FieldMetaData("column_family", TFieldRequirementType.DEFAULT, 
           new FieldValueMetaData(TType.STRING)));
@@ -10361,14 +10361,14 @@ public class Cassandra {
     }
 
     public get_key_range_args(
-      String table,
+      String keyspace,
       String column_family,
       String start,
       String finish,
       int count)
     {
       this();
-      this.table = table;
+      this.keyspace = keyspace;
       this.column_family = column_family;
       this.start = start;
       this.finish = finish;
@@ -10380,8 +10380,8 @@ public class Cassandra {
      * Performs a deep copy on <i>other</i>.
      */
     public get_key_range_args(get_key_range_args other) {
-      if (other.isSetTable()) {
-        this.table = other.table;
+      if (other.isSetKeyspace()) {
+        this.keyspace = other.keyspace;
       }
       if (other.isSetColumn_family()) {
         this.column_family = other.column_family;
@@ -10401,26 +10401,26 @@ public class Cassandra {
       return new get_key_range_args(this);
     }
 
-    public String getTable() {
-      return this.table;
+    public String getKeyspace() {
+      return this.keyspace;
     }
 
-    public void setTable(String table) {
-      this.table = table;
+    public void setKeyspace(String keyspace) {
+      this.keyspace = keyspace;
     }
 
-    public void unsetTable() {
-      this.table = null;
+    public void unsetKeyspace() {
+      this.keyspace = null;
     }
 
-    // Returns true if field table is set (has been asigned a value) and false otherwise
-    public boolean isSetTable() {
-      return this.table != null;
+    // Returns true if field keyspace is set (has been asigned a value) and false otherwise
+    public boolean isSetKeyspace() {
+      return this.keyspace != null;
     }
 
-    public void setTableIsSet(boolean value) {
+    public void setKeyspaceIsSet(boolean value) {
       if (!value) {
-        this.table = null;
+        this.keyspace = null;
       }
     }
 
@@ -10517,11 +10517,11 @@ public class Cassandra {
 
     public void setFieldValue(int fieldID, Object value) {
       switch (fieldID) {
-      case TABLE:
+      case KEYSPACE:
         if (value == null) {
-          unsetTable();
+          unsetKeyspace();
         } else {
-          setTable((String)value);
+          setKeyspace((String)value);
         }
         break;
 
@@ -10564,8 +10564,8 @@ public class Cassandra {
 
     public Object getFieldValue(int fieldID) {
       switch (fieldID) {
-      case TABLE:
-        return getTable();
+      case KEYSPACE:
+        return getKeyspace();
 
       case COLUMN_FAMILY:
         return getColumn_family();
@@ -10587,8 +10587,8 @@ public class Cassandra {
     // Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise
     public boolean isSet(int fieldID) {
       switch (fieldID) {
-      case TABLE:
-        return isSetTable();
+      case KEYSPACE:
+        return isSetKeyspace();
       case COLUMN_FAMILY:
         return isSetColumn_family();
       case START:
@@ -10615,12 +10615,12 @@ public class Cassandra {
       if (that == null)
         return false;
 
-      boolean this_present_table = true && this.isSetTable();
-      boolean that_present_table = true && that.isSetTable();
-      if (this_present_table || that_present_table) {
-        if (!(this_present_table && that_present_table))
+      boolean this_present_keyspace = true && this.isSetKeyspace();
+      boolean that_present_keyspace = true && that.isSetKeyspace();
+      if (this_present_keyspace || that_present_keyspace) {
+        if (!(this_present_keyspace && that_present_keyspace))
           return false;
-        if (!this.table.equals(that.table))
+        if (!this.keyspace.equals(that.keyspace))
           return false;
       }
 
@@ -10679,9 +10679,9 @@ public class Cassandra {
         }
         switch (field.id)
         {
-          case TABLE:
+          case KEYSPACE:
             if (field.type == TType.STRING) {
-              this.table = iprot.readString();
+              this.keyspace = iprot.readString();
             } else { 
               TProtocolUtil.skip(iprot, field.type);
             }
@@ -10732,9 +10732,9 @@ public class Cassandra {
       validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
-      if (this.table != null) {
-        oprot.writeFieldBegin(TABLE_FIELD_DESC);
-        oprot.writeString(this.table);
+      if (this.keyspace != null) {
+        oprot.writeFieldBegin(KEYSPACE_FIELD_DESC);
+        oprot.writeString(this.keyspace);
         oprot.writeFieldEnd();
       }
       if (this.column_family != null) {
@@ -10764,11 +10764,11 @@ public class Cassandra {
       StringBuilder sb = new StringBuilder("get_key_range_args(");
       boolean first = true;
 
-      sb.append("table:");
-      if (this.table == null) {
+      sb.append("keyspace:");
+      if (this.keyspace == null) {
         sb.append("null");
       } else {
-        sb.append(this.table);
+        sb.append(this.keyspace);
       }
       first = false;
       if (!first) sb.append(", ");
@@ -11949,80 +11949,80 @@ public class Cassandra {
 
   }
 
-  public static class describe_table_args implements TBase, java.io.Serializable, Cloneable   {
-    private static final TStruct STRUCT_DESC = new TStruct("describe_table_args");
-    private static final TField TABLE_FIELD_DESC = new TField("table", TType.STRING, (short)1);
+  public static class describe_keyspace_args implements TBase, java.io.Serializable, Cloneable   {
+    private static final TStruct STRUCT_DESC = new TStruct("describe_keyspace_args");
+    private static final TField KEYSPACE_FIELD_DESC = new TField("keyspace", TType.STRING, (short)1);
 
-    public String table;
-    public static final int TABLE = 1;
+    public String keyspace;
+    public static final int KEYSPACE = 1;
 
     private final Isset __isset = new Isset();
     private static final class Isset implements java.io.Serializable {
     }
 
     public static final Map<Integer, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new HashMap<Integer, FieldMetaData>() {{
-      put(TABLE, new FieldMetaData("table", TFieldRequirementType.DEFAULT, 
+      put(KEYSPACE, new FieldMetaData("keyspace", TFieldRequirementType.DEFAULT, 
           new FieldValueMetaData(TType.STRING)));
     }});
 
     static {
-      FieldMetaData.addStructMetaDataMap(describe_table_args.class, metaDataMap);
+      FieldMetaData.addStructMetaDataMap(describe_keyspace_args.class, metaDataMap);
     }
 
-    public describe_table_args() {
+    public describe_keyspace_args() {
     }
 
-    public describe_table_args(
-      String table)
+    public describe_keyspace_args(
+      String keyspace)
     {
       this();
-      this.table = table;
+      this.keyspace = keyspace;
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public describe_table_args(describe_table_args other) {
-      if (other.isSetTable()) {
-        this.table = other.table;
+    public describe_keyspace_args(describe_keyspace_args other) {
+      if (other.isSetKeyspace()) {
+        this.keyspace = other.keyspace;
       }
     }
 
     @Override
-    public describe_table_args clone() {
-      return new describe_table_args(this);
+    public describe_keyspace_args clone() {
+      return new describe_keyspace_args(this);
     }
 
-    public String getTable() {
-      return this.table;
+    public String getKeyspace() {
+      return this.keyspace;
     }
 
-    public void setTable(String table) {
-      this.table = table;
+    public void setKeyspace(String keyspace) {
+      this.keyspace = keyspace;
     }
 
-    public void unsetTable() {
-      this.table = null;
+    public void unsetKeyspace() {
+      this.keyspace = null;
     }
 
-    // Returns true if field table is set (has been asigned a value) and false otherwise
-    public boolean isSetTable() {
-      return this.table != null;
+    // Returns true if field keyspace is set (has been asigned a value) and false otherwise
+    public boolean isSetKeyspace() {
+      return this.keyspace != null;
     }
 
-    public void setTableIsSet(boolean value) {
+    public void setKeyspaceIsSet(boolean value) {
       if (!value) {
-        this.table = null;
+        this.keyspace = null;
       }
     }
 
     public void setFieldValue(int fieldID, Object value) {
       switch (fieldID) {
-      case TABLE:
+      case KEYSPACE:
         if (value == null) {
-          unsetTable();
+          unsetKeyspace();
         } else {
-          setTable((String)value);
+          setKeyspace((String)value);
         }
         break;
 
@@ -12033,8 +12033,8 @@ public class Cassandra {
 
     public Object getFieldValue(int fieldID) {
       switch (fieldID) {
-      case TABLE:
-        return getTable();
+      case KEYSPACE:
+        return getKeyspace();
 
       default:
         throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
@@ -12044,8 +12044,8 @@ public class Cassandra {
     // Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise
     public boolean isSet(int fieldID) {
       switch (fieldID) {
-      case TABLE:
-        return isSetTable();
+      case KEYSPACE:
+        return isSetKeyspace();
       default:
         throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
       }
@@ -12055,21 +12055,21 @@ public class Cassandra {
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof describe_table_args)
-        return this.equals((describe_table_args)that);
+      if (that instanceof describe_keyspace_args)
+        return this.equals((describe_keyspace_args)that);
       return false;
     }
 
-    public boolean equals(describe_table_args that) {
+    public boolean equals(describe_keyspace_args that) {
       if (that == null)
         return false;
 
-      boolean this_present_table = true && this.isSetTable();
-      boolean that_present_table = true && that.isSetTable();
-      if (this_present_table || that_present_table) {
-        if (!(this_present_table && that_present_table))
+      boolean this_present_keyspace = true && this.isSetKeyspace();
+      boolean that_present_keyspace = true && that.isSetKeyspace();
+      if (this_present_keyspace || that_present_keyspace) {
+        if (!(this_present_keyspace && that_present_keyspace))
           return false;
-        if (!this.table.equals(that.table))
+        if (!this.keyspace.equals(that.keyspace))
           return false;
       }
 
@@ -12092,9 +12092,9 @@ public class Cassandra {
         }
         switch (field.id)
         {
-          case TABLE:
+          case KEYSPACE:
             if (field.type == TType.STRING) {
-              this.table = iprot.readString();
+              this.keyspace = iprot.readString();
             } else { 
               TProtocolUtil.skip(iprot, field.type);
             }
@@ -12116,9 +12116,9 @@ public class Cassandra {
       validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
-      if (this.table != null) {
-        oprot.writeFieldBegin(TABLE_FIELD_DESC);
-        oprot.writeString(this.table);
+      if (this.keyspace != null) {
+        oprot.writeFieldBegin(KEYSPACE_FIELD_DESC);
+        oprot.writeString(this.keyspace);
         oprot.writeFieldEnd();
       }
       oprot.writeFieldStop();
@@ -12127,14 +12127,14 @@ public class Cassandra {
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("describe_table_args(");
+      StringBuilder sb = new StringBuilder("describe_keyspace_args(");
       boolean first = true;
 
-      sb.append("table:");
-      if (this.table == null) {
+      sb.append("keyspace:");
+      if (this.keyspace == null) {
         sb.append("null");
       } else {
-        sb.append(this.table);
+        sb.append(this.keyspace);
       }
       first = false;
       sb.append(")");
@@ -12148,8 +12148,8 @@ public class Cassandra {
 
   }
 
-  public static class describe_table_result implements TBase, java.io.Serializable, Cloneable   {
-    private static final TStruct STRUCT_DESC = new TStruct("describe_table_result");
+  public static class describe_keyspace_result implements TBase, java.io.Serializable, Cloneable   {
+    private static final TStruct STRUCT_DESC = new TStruct("describe_keyspace_result");
     private static final TField SUCCESS_FIELD_DESC = new TField("success", TType.MAP, (short)0);
     private static final TField NFE_FIELD_DESC = new TField("nfe", TType.STRUCT, (short)1);
 
@@ -12174,13 +12174,13 @@ public class Cassandra {
     }});
 
     static {
-      FieldMetaData.addStructMetaDataMap(describe_table_result.class, metaDataMap);
+      FieldMetaData.addStructMetaDataMap(describe_keyspace_result.class, metaDataMap);
     }
 
-    public describe_table_result() {
+    public describe_keyspace_result() {
     }
 
-    public describe_table_result(
+    public describe_keyspace_result(
       Map<String,Map<String,String>> success,
       NotFoundException nfe)
     {
@@ -12192,7 +12192,7 @@ public class Cassandra {
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public describe_table_result(describe_table_result other) {
+    public describe_keyspace_result(describe_keyspace_result other) {
       if (other.isSetSuccess()) {
         Map<String,Map<String,String>> __this__success = new HashMap<String,Map<String,String>>();
         for (Map.Entry<String, Map<String,String>> other_element : other.success.entrySet()) {
@@ -12225,8 +12225,8 @@ public class Cassandra {
     }
 
     @Override
-    public describe_table_result clone() {
-      return new describe_table_result(this);
+    public describe_keyspace_result clone() {
+      return new describe_keyspace_result(this);
     }
 
     public int getSuccessSize() {
@@ -12338,12 +12338,12 @@ public class Cassandra {
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof describe_table_result)
-        return this.equals((describe_table_result)that);
+      if (that instanceof describe_keyspace_result)
+        return this.equals((describe_keyspace_result)that);
       return false;
     }
 
-    public boolean equals(describe_table_result that) {
+    public boolean equals(describe_keyspace_result that) {
       if (that == null)
         return false;
 
@@ -12468,7 +12468,7 @@ public class Cassandra {
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("describe_table_result(");
+      StringBuilder sb = new StringBuilder("describe_keyspace_result(");
       boolean first = true;
 
       sb.append("success:");
diff --git a/interface/gen-java/org/apache/cassandra/service/ConsistencyLevel.java b/interface/gen-java/org/apache/cassandra/service/ConsistencyLevel.java
index 04323d8bd1..0ce14bd32f 100644
--- a/interface/gen-java/org/apache/cassandra/service/ConsistencyLevel.java
+++ b/interface/gen-java/org/apache/cassandra/service/ConsistencyLevel.java
@@ -19,12 +19,7 @@ public class ConsistencyLevel {
   public static final int QUORUM = 2;
   public static final int ALL = 3;
 
-  public static final IntRangeSet VALID_VALUES = new IntRangeSet(
-    ZERO, 
-    ONE, 
-    QUORUM, 
-    ALL );
-
+  public static final IntRangeSet VALID_VALUES = new IntRangeSet(ZERO, ONE, QUORUM, ALL);
   public static final Map<Integer, String> VALUES_TO_NAMES = new HashMap<Integer, String>() {{
     put(ZERO, "ZERO");
     put(ONE, "ONE");
diff --git a/src/java/org/apache/cassandra/cli/Cli.g b/src/java/org/apache/cassandra/cli/Cli.g
index 5aeb26ab85..a61108599a 100644
--- a/src/java/org/apache/cassandra/cli/Cli.g
+++ b/src/java/org/apache/cassandra/cli/Cli.g
@@ -178,8 +178,8 @@ K_NAME:       'NAME';
 K_QUIT:       'QUIT';
 K_SET:        'SET';
 K_SHOW:       'SHOW';
-K_TABLE:      'TABLE';
-K_TABLES:     'TABLES';
+K_TABLE:      'KEYSPACE';
+K_TABLES:     'KEYSPACES';
 K_THRIFT:     'THRIFT';
 K_VERSION:    'VERSION';
 
diff --git a/src/java/org/apache/cassandra/cli/CliClient.java b/src/java/org/apache/cassandra/cli/CliClient.java
index c0aba6c318..03687bde1c 100644
--- a/src/java/org/apache/cassandra/cli/CliClient.java
+++ b/src/java/org/apache/cassandra/cli/CliClient.java
@@ -93,14 +93,14 @@ public class CliClient
        css_.out.println("List of all CLI commands:");
        css_.out.println("?                                                         Same as help.");
        css_.out.println("connect <hostname>/<port>                                 Connect to Cassandra's thrift service.");
-       css_.out.println("describe table <tbl>                                      Describe table.");
+       css_.out.println("describe keyspace <keyspacename>                          Describe keyspace.");
        css_.out.println("exit                                                      Exit CLI.");
        css_.out.println("explain plan [<set stmt>|<get stmt>|<select stmt>]        Explains the PLAN for specified stmt.");
        css_.out.println("help                                                      Display this help.");
        css_.out.println("quit                                                      Exit CLI.");
        css_.out.println("show config file                                          Display contents of config file");
        css_.out.println("show cluster name                                         Display cassandra server version");
-       css_.out.println("show tables                                               Show list of tables.");
+       css_.out.println("show keyspaces                                               Show list of keyspaces.");
        css_.out.println("show version                                              Show server version.");
        css_.out.println("select ...                                                CQL select statement (TBD).");
        css_.out.println("get ...                                                   CQL data retrieval statement.");
@@ -229,7 +229,7 @@ public class CliClient
         if (!CliMain.isConnected())
             return;
         
-        List<String> tables = thriftClient_.get_string_list_property("tables");
+        List<String> tables = thriftClient_.get_string_list_property("keyspaces");
         for (String table : tables)
         {
             css_.out.println(table);
@@ -250,7 +250,7 @@ public class CliClient
         // Describe and display
         Map<String, Map<String, String>> columnFamiliesMap;
         try {
-            columnFamiliesMap = thriftClient_.describe_table(tableName);
+            columnFamiliesMap = thriftClient_.describe_keyspace(tableName);
             for (String columnFamilyName: columnFamiliesMap.keySet()) {
                 Map<String, String> columnMap = columnFamiliesMap.get(columnFamilyName);
                 String desc = columnMap.get("Desc");
@@ -264,7 +264,7 @@ public class CliClient
                 css_.out.println("------");
             }
         } catch (NotFoundException e) {
-            css_.out.println("Table " + tableName + " could not be found.");
+            css_.out.println("Keyspace " + tableName + " could not be found.");
         }
         
         return;
diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index 9899a82e67..c32b958e80 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -327,7 +327,7 @@ public class DatabaseDescriptor
             }
 
             /* Read the table related stuff from config */
-            NodeList tables = xmlUtils.getRequestedNodeList("/Storage/Tables/Table");
+            NodeList tables = xmlUtils.getRequestedNodeList("/Storage/Keyspaces/Keyspace");
             int size = tables.getLength();
             for ( int i = 0; i < size; ++i )
             {
@@ -346,7 +346,7 @@ public class DatabaseDescriptor
                 tables_.add(tName);
                 tableToCFMetaDataMap_.put(tName, new HashMap<String, CFMetaData>());
 
-                String xqlCacheSize = "/Storage/Tables/Table[@Name='" + tName + "']/KeysCachedFraction";
+                String xqlCacheSize = "/Storage/Keyspaces/Keyspace[@Name='" + tName + "']/KeysCachedFraction";
                 value = xmlUtils.getNodeValue(xqlCacheSize);
                 if (value == null)
                 {
@@ -357,7 +357,7 @@ public class DatabaseDescriptor
                     tableKeysCachedFractions_.put(tName, Double.valueOf(value));
                 }
 
-                String xqlTable = "/Storage/Tables/Table[@Name='" + tName + "']/";
+                String xqlTable = "/Storage/Keyspaces/Keyspace[@Name='" + tName + "']/";
                 NodeList columnFamilies = xmlUtils.getRequestedNodeList(xqlTable + "ColumnFamily");
 
                 // get name of the rowKey for this table
diff --git a/src/java/org/apache/cassandra/db/TableNotDefinedException.java b/src/java/org/apache/cassandra/db/KeyspaceNotDefinedException.java
similarity index 88%
rename from src/java/org/apache/cassandra/db/TableNotDefinedException.java
rename to src/java/org/apache/cassandra/db/KeyspaceNotDefinedException.java
index 48e705f899..969d4f43de 100644
--- a/src/java/org/apache/cassandra/db/TableNotDefinedException.java
+++ b/src/java/org/apache/cassandra/db/KeyspaceNotDefinedException.java
@@ -20,9 +20,9 @@ package org.apache.cassandra.db;
 
 import org.apache.cassandra.service.InvalidRequestException;
 
-public class TableNotDefinedException extends InvalidRequestException
+public class KeyspaceNotDefinedException extends InvalidRequestException
 {
-    public TableNotDefinedException(String why)
+    public KeyspaceNotDefinedException(String why)
     {
         super(why);
     }
diff --git a/src/java/org/apache/cassandra/service/CassandraDaemon.java b/src/java/org/apache/cassandra/service/CassandraDaemon.java
index 240e060a00..f75c298a2c 100644
--- a/src/java/org/apache/cassandra/service/CassandraDaemon.java
+++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java
@@ -85,7 +85,7 @@ public class CassandraDaemon
         for (String table : tables)
         {
             if (logger.isDebugEnabled())
-                logger.debug("opening table " + table);
+                logger.debug("opening keyspace " + table);
             Table tbl = Table.open(table);
             tbl.onStart();
         }
diff --git a/src/java/org/apache/cassandra/service/CassandraServer.java b/src/java/org/apache/cassandra/service/CassandraServer.java
index 5d3d7ffec9..a25f0c1048 100644
--- a/src/java/org/apache/cassandra/service/CassandraServer.java
+++ b/src/java/org/apache/cassandra/service/CassandraServer.java
@@ -463,7 +463,7 @@ public class CassandraServer implements Cassandra.Iface
 
     public List<String> get_string_list_property(String propertyName)
     {
-        if (propertyName.equals("tables"))
+        if (propertyName.equals("keyspaces"))
         {
             return DatabaseDescriptor.getTables();        
         }
@@ -473,11 +473,11 @@ public class CassandraServer implements Cassandra.Iface
         }
     }
 
-    public Map<String,Map<String,String>> describe_table(String tableName) throws NotFoundException
+    public Map<String, Map<String, String>> describe_keyspace(String table) throws NotFoundException
     {
         Map <String, Map<String, String>> columnFamiliesMap = new HashMap<String, Map<String, String>> ();
 
-        Map<String, CFMetaData> tableMetaData = DatabaseDescriptor.getTableMetaData(tableName);
+        Map<String, CFMetaData> tableMetaData = DatabaseDescriptor.getTableMetaData(table);
         // table doesn't exist
         if (tableMetaData == null) {
             throw new NotFoundException();
diff --git a/src/java/org/apache/cassandra/service/ThriftValidation.java b/src/java/org/apache/cassandra/service/ThriftValidation.java
index f1d90e0e95..80cdec1d30 100644
--- a/src/java/org/apache/cassandra/service/ThriftValidation.java
+++ b/src/java/org/apache/cassandra/service/ThriftValidation.java
@@ -1,8 +1,7 @@
 package org.apache.cassandra.service;
 
-import org.apache.cassandra.db.TableNotDefinedException;
+import org.apache.cassandra.db.KeyspaceNotDefinedException;
 import org.apache.cassandra.db.ColumnFamilyNotDefinedException;
-import org.apache.cassandra.db.RowMutation;
 import org.apache.cassandra.config.DatabaseDescriptor;
 
 public class ThriftValidation
@@ -21,7 +20,7 @@ public class ThriftValidation
         }
     }
 
-    static void validateCommand(String tablename, String... columnFamilyNames) throws TableNotDefinedException, ColumnFamilyNotDefinedException
+    static void validateCommand(String tablename, String... columnFamilyNames) throws KeyspaceNotDefinedException, ColumnFamilyNotDefinedException
     {
         validateTable(tablename);
         for (String cfName : columnFamilyNames)
@@ -33,11 +32,11 @@ public class ThriftValidation
         }
     }
 
-    private static void validateTable(String tablename) throws TableNotDefinedException
+    private static void validateTable(String tablename) throws KeyspaceNotDefinedException
     {
         if (!DatabaseDescriptor.getTables().contains(tablename))
         {
-            throw new TableNotDefinedException("Table " + tablename + " does not exist in this schema.");
+            throw new KeyspaceNotDefinedException("Keyspace " + tablename + " does not exist in this schema.");
         }
     }
 
diff --git a/src/java/org/apache/cassandra/tools/NodeProbe.java b/src/java/org/apache/cassandra/tools/NodeProbe.java
index bd715090a7..152b165f06 100644
--- a/src/java/org/apache/cassandra/tools/NodeProbe.java
+++ b/src/java/org/apache/cassandra/tools/NodeProbe.java
@@ -328,7 +328,7 @@ public class NodeProbe
                 double tableTotalReadTime = 0.0f;
                 double tableTotalWriteTime = 0.0f;
                 
-                outs.println("Table: " + tableName);
+                outs.println("Keyspace: " + tableName);
                 for (ColumnFamilyStoreMBean cfstore: columnFamilies) {
                     int writeCount = cfstore.getWriteCount();
                     int readCount = cfstore.getReadCount();
diff --git a/test/conf/storage-conf.xml b/test/conf/storage-conf.xml
index c72bb3fea5..f9f80e85e9 100644
--- a/test/conf/storage-conf.xml
+++ b/test/conf/storage-conf.xml
@@ -40,21 +40,21 @@
    <StagingFileDirectory>build/test/cassandra/staging</StagingFileDirectory>
    <MemtableSizeInMB>1</MemtableSizeInMB>
    <MemtableObjectCountInMillions>0.00002</MemtableObjectCountInMillions> <!-- 20 -->
-   <Tables>
-     <Table Name = "Table1">
+   <Keyspaces>
+     <Keyspace Name = "Keyspace1">
        <ColumnFamily Name="Standard1"/>
        <ColumnFamily Name="Standard2"/>
        <ColumnFamily CompareWith="LongType" Name="StandardLong1"/>
        <ColumnFamily CompareWith="LongType" Name="StandardLong2"/>
        <ColumnFamily ColumnType="Super" CompareSubcolumnsWith="LongType" Name="Super1"/>
        <ColumnFamily ColumnType="Super" CompareSubcolumnsWith="LongType" Name="Super2"/>
-     </Table>
-     <Table Name = "Table2">
+     </Keyspace>
+     <Keyspace Name = "Keyspace2">
        <ColumnFamily Name="Standard1"/>
        <ColumnFamily Name="Standard3"/>
        <ColumnFamily ColumnType="Super" Name="Super3"/>
-     </Table>
-   </Tables>
+     </Keyspace>
+   </Keyspaces>
    <Seeds>
      <!-- Add names of hosts that are deemed contact points -->
      <Seed>127.0.0.1</Seed>
diff --git a/test/system/test_server.py b/test/system/test_server.py
index e35efd5292..523e1e4c0b 100644
--- a/test/system/test_server.py
+++ b/test/system/test_server.py
@@ -39,8 +39,8 @@ def _insert_simple(block=True):
         consistencyLevel = ConsistencyLevel.ONE
     else:
         consistencyLevel = ConsistencyLevel.ZERO
-    client.insert('Table1', 'key1', ColumnPath('Standard1', column='c1'), 'value1', 0, consistencyLevel)
-    client.insert('Table1', 'key1', ColumnPath('Standard1', column='c2'), 'value2', 0, consistencyLevel)
+    client.insert('Keyspace1', 'key1', ColumnPath('Standard1', column='c1'), 'value1', 0, consistencyLevel)
+    client.insert('Keyspace1', 'key1', ColumnPath('Standard1', column='c2'), 'value2', 0, consistencyLevel)
 
 def _insert_batch(block):
     cfmap = {'Standard1': _SIMPLE_COLUMNS,
@@ -50,68 +50,68 @@ def _insert_batch(block):
     else:
         consistencyLevel = ConsistencyLevel.ZERO
 
-    client.batch_insert('Table1', BatchMutation(key='key1', cfmap=cfmap), consistencyLevel)
+    client.batch_insert('Keyspace1', BatchMutation(key='key1', cfmap=cfmap), consistencyLevel)
 
 def _verify_batch():
     _verify_simple()
-    L = client.get_slice('Table1', 'key1', ColumnParent('Standard2'), '', '', True, 1000, ConsistencyLevel.ONE)
+    L = client.get_slice('Keyspace1', 'key1', ColumnParent('Standard2'), '', '', True, 1000, ConsistencyLevel.ONE)
     assert L == _SIMPLE_COLUMNS, L
 
 def _verify_simple():
-    assert client.get_column('Table1', 'key1', ColumnPath('Standard1', column='c1'), ConsistencyLevel.ONE) == Column('c1', 'value1', 0)
-    L = client.get_slice('Table1', 'key1', ColumnParent('Standard1'), '', '', True, 1000, ConsistencyLevel.ONE)
+    assert client.get_column('Keyspace1', 'key1', ColumnPath('Standard1', column='c1'), ConsistencyLevel.ONE) == Column('c1', 'value1', 0)
+    L = client.get_slice('Keyspace1', 'key1', ColumnParent('Standard1'), '', '', True, 1000, ConsistencyLevel.ONE)
     assert L == _SIMPLE_COLUMNS, L
 
 def _insert_super():
-    client.insert('Table1', 'key1', ColumnPath('Super1', 'sc1', _i64(4)), 'value4', 0, ConsistencyLevel.ZERO)
-    client.insert('Table1', 'key1', ColumnPath('Super1', 'sc2', _i64(5)), 'value5', 0, ConsistencyLevel.ZERO)
-    client.insert('Table1', 'key1', ColumnPath('Super1', 'sc2', _i64(6)), 'value6', 0, ConsistencyLevel.ZERO)
+    client.insert('Keyspace1', 'key1', ColumnPath('Super1', 'sc1', _i64(4)), 'value4', 0, ConsistencyLevel.ZERO)
+    client.insert('Keyspace1', 'key1', ColumnPath('Super1', 'sc2', _i64(5)), 'value5', 0, ConsistencyLevel.ZERO)
+    client.insert('Keyspace1', 'key1', ColumnPath('Super1', 'sc2', _i64(6)), 'value6', 0, ConsistencyLevel.ZERO)
     time.sleep(0.1)
 
 def _insert_range():
-    client.insert('Table1', 'key1', ColumnPath('Standard1', column='c1'), 'value1', 0, ConsistencyLevel.ONE)
-    client.insert('Table1', 'key1', ColumnPath('Standard1', column='c2'), 'value2', 0, ConsistencyLevel.ONE)
-    client.insert('Table1', 'key1', ColumnPath('Standard1', column='c3'), 'value3', 0, ConsistencyLevel.ONE)
+    client.insert('Keyspace1', 'key1', ColumnPath('Standard1', column='c1'), 'value1', 0, ConsistencyLevel.ONE)
+    client.insert('Keyspace1', 'key1', ColumnPath('Standard1', column='c2'), 'value2', 0, ConsistencyLevel.ONE)
+    client.insert('Keyspace1', 'key1', ColumnPath('Standard1', column='c3'), 'value3', 0, ConsistencyLevel.ONE)
     time.sleep(0.1)
 
 def _verify_range():
-    result = client.get_slice('Table1','key1', ColumnParent('Standard1'), 'c1', 'c2', True, 1000, ConsistencyLevel.ONE)
+    result = client.get_slice('Keyspace1','key1', ColumnParent('Standard1'), 'c1', 'c2', True, 1000, ConsistencyLevel.ONE)
     assert len(result) == 2
     assert result[0].name == 'c1'
     assert result[1].name == 'c2'
 
-    result = client.get_slice('Table1','key1', ColumnParent('Standard1'), 'c3', 'c2', False, 1000, ConsistencyLevel.ONE)
+    result = client.get_slice('Keyspace1','key1', ColumnParent('Standard1'), 'c3', 'c2', False, 1000, ConsistencyLevel.ONE)
     assert len(result) == 2
     assert result[0].name == 'c3'
     assert result[1].name == 'c2'
 
-    result = client.get_slice('Table1','key1', ColumnParent('Standard1'), 'a', 'z' , True, 1000, ConsistencyLevel.ONE)
+    result = client.get_slice('Keyspace1','key1', ColumnParent('Standard1'), 'a', 'z' , True, 1000, ConsistencyLevel.ONE)
     assert len(result) == 3, result
     
-    result = client.get_slice('Table1','key1', ColumnParent('Standard1'), 'a', 'z' , True, 2, ConsistencyLevel.ONE)
+    result = client.get_slice('Keyspace1','key1', ColumnParent('Standard1'), 'a', 'z' , True, 2, ConsistencyLevel.ONE)
     assert len(result) == 2, result
 	 	
 def _insert_super_range():
-    client.insert('Table1', 'key1', ColumnPath('Super1', 'sc1', _i64(4)), 'value4', 0, False)
-    client.insert('Table1', 'key1', ColumnPath('Super1', 'sc2', _i64(5)), 'value5', 0, False)
-    client.insert('Table1', 'key1', ColumnPath('Super1', 'sc2', _i64(6)), 'value6', 0, False)
-    client.insert('Table1', 'key1', ColumnPath('Super1', 'sc3', _i64(7)), 'value7', 0, False)
+    client.insert('Keyspace1', 'key1', ColumnPath('Super1', 'sc1', _i64(4)), 'value4', 0, False)
+    client.insert('Keyspace1', 'key1', ColumnPath('Super1', 'sc2', _i64(5)), 'value5', 0, False)
+    client.insert('Keyspace1', 'key1', ColumnPath('Super1', 'sc2', _i64(6)), 'value6', 0, False)
+    client.insert('Keyspace1', 'key1', ColumnPath('Super1', 'sc3', _i64(7)), 'value7', 0, False)
     time.sleep(0.1)
 
 def _verify_super_range():
-    result = client.get_slice_super('Table1','key1', 'Super1', 'sc2', 'sc3', True, 2, ConsistencyLevel.ONE)
+    result = client.get_slice_super('Keyspace1','key1', 'Super1', 'sc2', 'sc3', True, 2, ConsistencyLevel.ONE)
     assert len(result) == 2
     assert result[0].name == 'sc2'
     assert result[1].name == 'sc3'
 
-    result = client.get_slice_super('Table1','key1', 'Super1', 'sc3', 'sc2', False, 2, ConsistencyLevel.ONE)
+    result = client.get_slice_super('Keyspace1','key1', 'Super1', 'sc3', 'sc2', False, 2, ConsistencyLevel.ONE)
     assert len(result) == 2
     assert result[0].name == 'sc3'
     assert result[1].name == 'sc2'
 
 def _verify_super(supercf='Super1'):
-    assert client.get_column('Table1', 'key1', ColumnPath(supercf, 'sc1', _i64(4)), ConsistencyLevel.ONE) == Column(_i64(4), 'value4', 0)
-    slice = client.get_slice_super('Table1', 'key1', 'Super1', '', '', True, 1000, ConsistencyLevel.ONE)
+    assert client.get_column('Keyspace1', 'key1', ColumnPath(supercf, 'sc1', _i64(4)), ConsistencyLevel.ONE) == Column(_i64(4), 'value4', 0)
+    slice = client.get_slice_super('Keyspace1', 'key1', 'Super1', '', '', True, 1000, ConsistencyLevel.ONE)
     assert slice == _SUPER_COLUMNS, slice
 
 def _expect_exception(fn, type_):
@@ -132,21 +132,21 @@ class TestMutations(CassandraTester):
         _verify_simple()
 
     def test_empty_slice(self):
-        assert client.get_slice('Table1', 'key1', ColumnParent('Standard2'), '', '', True, 1000, ConsistencyLevel.ONE) == []
+        assert client.get_slice('Keyspace1', 'key1', ColumnParent('Standard2'), '', '', True, 1000, ConsistencyLevel.ONE) == []
 
     def test_empty_slice_super(self):
-        assert client.get_slice_super('Table1', 'key1', 'Super1', '', '', True, 1000, ConsistencyLevel.ONE) == []
+        assert client.get_slice_super('Keyspace1', 'key1', 'Super1', '', '', True, 1000, ConsistencyLevel.ONE) == []
 
     def test_missing_super(self):
-        _expect_missing(lambda: client.get_column('Table1', 'key1', ColumnPath('Super1', 'sc1', 'c1'), ConsistencyLevel.ONE))
+        _expect_missing(lambda: client.get_column('Keyspace1', 'key1', ColumnPath('Super1', 'sc1', 'c1'), ConsistencyLevel.ONE))
 
     def test_count(self):
         _insert_simple()
         _insert_super()
-        assert client.get_column_count('Table1', 'key1', ColumnParent('Standard2'), ConsistencyLevel.ONE) == 0
-        assert client.get_column_count('Table1', 'key1', ColumnParent('Standard1'), ConsistencyLevel.ONE) == 2
-        assert client.get_column_count('Table1', 'key1', ColumnParent('Super1', 'sc2'), ConsistencyLevel.ONE) == 2
-        assert client.get_column_count('Table1', 'key1', ColumnParent('Super1'), ConsistencyLevel.ONE) == 2
+        assert client.get_column_count('Keyspace1', 'key1', ColumnParent('Standard2'), ConsistencyLevel.ONE) == 0
+        assert client.get_column_count('Keyspace1', 'key1', ColumnParent('Standard1'), ConsistencyLevel.ONE) == 2
+        assert client.get_column_count('Keyspace1', 'key1', ColumnParent('Super1', 'sc2'), ConsistencyLevel.ONE) == 2
+        assert client.get_column_count('Keyspace1', 'key1', ColumnParent('Super1'), ConsistencyLevel.ONE) == 2
 
     def test_insert_blocking(self):
         _insert_simple()
@@ -166,18 +166,18 @@ class TestMutations(CassandraTester):
         _verify_batch()
 
     def test_bad_calls(self):
-        _expect_exception(lambda: client.insert('Table1', 'key1', ColumnPath('Standard1', 'x', 'y'), 'value', 0, ConsistencyLevel.ONE), InvalidRequestException)
+        _expect_exception(lambda: client.insert('Keyspace1', 'key1', ColumnPath('Standard1', 'x', 'y'), 'value', 0, ConsistencyLevel.ONE), InvalidRequestException)
 
-        _expect_exception(lambda: client.get_column('Table1', 'key1', ColumnPath('Standard1'), ConsistencyLevel.ONE), InvalidRequestException)
-        _expect_exception(lambda: client.get_column('Table1', 'key1', ColumnPath('Standard1', 'x', 'y'), ConsistencyLevel.ONE), InvalidRequestException)
-        _expect_exception(lambda: client.get_column('Table1', 'key1', ColumnPath('Super1'), ConsistencyLevel.ONE), InvalidRequestException)
-        _expect_exception(lambda: client.get_column('Table1', 'key1', ColumnPath('Super1', 'x'), ConsistencyLevel.ONE), InvalidRequestException)
-        _expect_exception(lambda: client.get_key_range('Table1', 'S', '', '', 1000), InvalidRequestException)
+        _expect_exception(lambda: client.get_column('Keyspace1', 'key1', ColumnPath('Standard1'), ConsistencyLevel.ONE), InvalidRequestException)
+        _expect_exception(lambda: client.get_column('Keyspace1', 'key1', ColumnPath('Standard1', 'x', 'y'), ConsistencyLevel.ONE), InvalidRequestException)
+        _expect_exception(lambda: client.get_column('Keyspace1', 'key1', ColumnPath('Super1'), ConsistencyLevel.ONE), InvalidRequestException)
+        _expect_exception(lambda: client.get_column('Keyspace1', 'key1', ColumnPath('Super1', 'x'), ConsistencyLevel.ONE), InvalidRequestException)
+        _expect_exception(lambda: client.get_key_range('Keyspace1', 'S', '', '', 1000), InvalidRequestException)
 
     def test_batch_insert_super(self):
          cfmap = {'Super1': _SUPER_COLUMNS,
                   'Super2': _SUPER_COLUMNS}
-         client.batch_insert_super_column('Table1', BatchMutation(key='key1', cfmap=cfmap), ConsistencyLevel.ZERO)
+         client.batch_insert_super_column('Keyspace1', BatchMutation(key='key1', cfmap=cfmap), ConsistencyLevel.ZERO)
          time.sleep(0.1)
          _verify_super('Super1')
          _verify_super('Super2')
@@ -185,32 +185,32 @@ class TestMutations(CassandraTester):
     def test_batch_insert_super_blocking(self):
          cfmap = {'Super1': _SUPER_COLUMNS,
                   'Super2': _SUPER_COLUMNS}
-         client.batch_insert_super_column('Table1', BatchMutation(key='key1', cfmap=cfmap), ConsistencyLevel.ONE)
+         client.batch_insert_super_column('Keyspace1', BatchMutation(key='key1', cfmap=cfmap), ConsistencyLevel.ONE)
          _verify_super('Super1')
          _verify_super('Super2')
 
     def test_cf_remove_column(self):
         _insert_simple()
-        client.remove('Table1', 'key1', ColumnPathOrParent('Standard1', column='c1'), 1, ConsistencyLevel.ONE)
-        _expect_missing(lambda: client.get_column('Table1', 'key1', ColumnPath('Standard1', column='c1'), ConsistencyLevel.ONE))
-        assert client.get_column('Table1', 'key1', ColumnPath('Standard1', column='c2'), ConsistencyLevel.ONE) \
+        client.remove('Keyspace1', 'key1', ColumnPathOrParent('Standard1', column='c1'), 1, ConsistencyLevel.ONE)
+        _expect_missing(lambda: client.get_column('Keyspace1', 'key1', ColumnPath('Standard1', column='c1'), ConsistencyLevel.ONE))
+        assert client.get_column('Keyspace1', 'key1', ColumnPath('Standard1', column='c2'), ConsistencyLevel.ONE) \
             == Column('c2', 'value2', 0)
-        assert client.get_slice('Table1', 'key1', ColumnParent('Standard1'), '', '', True, 1000, ConsistencyLevel.ONE) \
+        assert client.get_slice('Keyspace1', 'key1', ColumnParent('Standard1'), '', '', True, 1000, ConsistencyLevel.ONE) \
             == [Column('c2', 'value2', 0)]
 
         # New insert, make sure it shows up post-remove:
-        client.insert('Table1', 'key1', ColumnPath('Standard1', column='c3'), 'value3', 0, ConsistencyLevel.ONE)
-        assert client.get_slice('Table1', 'key1', ColumnParent('Standard1'), '', '', True, 1000, ConsistencyLevel.ONE) == \
+        client.insert('Keyspace1', 'key1', ColumnPath('Standard1', column='c3'), 'value3', 0, ConsistencyLevel.ONE)
+        assert client.get_slice('Keyspace1', 'key1', ColumnParent('Standard1'), '', '', True, 1000, ConsistencyLevel.ONE) == \
             [Column('c2', 'value2', 0), Column('c3', 'value3', 0)]
 
         # Test resurrection.  First, re-insert the value w/ older timestamp, 
         # and make sure it stays removed
-        client.insert('Table1', 'key1', ColumnPath('Standard1', column='c1'), 'value1', 0, ConsistencyLevel.ONE)
-        assert client.get_slice('Table1', 'key1', ColumnParent('Standard1'), '', '', True, 1000, ConsistencyLevel.ONE) == \
+        client.insert('Keyspace1', 'key1', ColumnPath('Standard1', column='c1'), 'value1', 0, ConsistencyLevel.ONE)
+        assert client.get_slice('Keyspace1', 'key1', ColumnParent('Standard1'), '', '', True, 1000, ConsistencyLevel.ONE) == \
             [Column('c2', 'value2', 0), Column('c3', 'value3', 0)]
         # Next, w/ a newer timestamp; it should come back:
-        client.insert('Table1', 'key1', ColumnPath('Standard1', column='c1'), 'value1', 2, ConsistencyLevel.ONE)
-        assert client.get_slice('Table1', 'key1', ColumnParent('Standard1'), '', '', True, 1000, ConsistencyLevel.ONE) == \
+        client.insert('Keyspace1', 'key1', ColumnPath('Standard1', column='c1'), 'value1', 2, ConsistencyLevel.ONE)
+        assert client.get_slice('Keyspace1', 'key1', ColumnParent('Standard1'), '', '', True, 1000, ConsistencyLevel.ONE) == \
             [Column('c1', 'value1', 2), Column('c2', 'value2', 0), Column('c3', 'value3', 0)]
 
 
@@ -219,17 +219,17 @@ class TestMutations(CassandraTester):
         _insert_super()
 
         # Remove the key1:Standard1 cf:
-        client.remove('Table1', 'key1', ColumnPathOrParent('Standard1'), 3, ConsistencyLevel.ONE)
-        assert client.get_slice('Table1', 'key1', ColumnParent('Standard1'), '', '', True, 1000, ConsistencyLevel.ONE) == []
+        client.remove('Keyspace1', 'key1', ColumnPathOrParent('Standard1'), 3, ConsistencyLevel.ONE)
+        assert client.get_slice('Keyspace1', 'key1', ColumnParent('Standard1'), '', '', True, 1000, ConsistencyLevel.ONE) == []
         _verify_super()
 
         # Test resurrection.  First, re-insert a value w/ older timestamp, 
         # and make sure it stays removed:
-        client.insert('Table1', 'key1', ColumnPath('Standard1', column='c1'), 'value1', 0, ConsistencyLevel.ONE)
-        assert client.get_slice('Table1', 'key1', ColumnParent('Standard1'), '', '', True, 1000, ConsistencyLevel.ONE) == []
+        client.insert('Keyspace1', 'key1', ColumnPath('Standard1', column='c1'), 'value1', 0, ConsistencyLevel.ONE)
+        assert client.get_slice('Keyspace1', 'key1', ColumnParent('Standard1'), '', '', True, 1000, ConsistencyLevel.ONE) == []
         # Next, w/ a newer timestamp; it should come back:
-        client.insert('Table1', 'key1', ColumnPath('Standard1', column='c1'), 'value1', 4, ConsistencyLevel.ONE)
-        assert client.get_slice('Table1', 'key1', ColumnParent('Standard1'), '', '', True, 1000, ConsistencyLevel.ONE) == \
+        client.insert('Keyspace1', 'key1', ColumnPath('Standard1', column='c1'), 'value1', 4, ConsistencyLevel.ONE)
+        assert client.get_slice('Keyspace1', 'key1', ColumnParent('Standard1'), '', '', True, 1000, ConsistencyLevel.ONE) == \
             [Column('c1', 'value1', 4)]
 
 
@@ -238,33 +238,33 @@ class TestMutations(CassandraTester):
         _insert_super()
 
         # Make sure remove clears out what it's supposed to, and _only_ that:
-        client.remove('Table1', 'key1', ColumnPathOrParent('Super1', 'sc2', _i64(5)), 5, ConsistencyLevel.ONE)
-        _expect_missing(lambda: client.get_column('Table1', 'key1', ColumnPath('Super1', 'sc2', _i64(5)), ConsistencyLevel.ONE))
-        assert client.get_slice_super('Table1', 'key1', 'Super1', '', '', True, 1000, ConsistencyLevel.ONE) == \
+        client.remove('Keyspace1', 'key1', ColumnPathOrParent('Super1', 'sc2', _i64(5)), 5, ConsistencyLevel.ONE)
+        _expect_missing(lambda: client.get_column('Keyspace1', 'key1', ColumnPath('Super1', 'sc2', _i64(5)), ConsistencyLevel.ONE))
+        assert client.get_slice_super('Keyspace1', 'key1', 'Super1', '', '', True, 1000, ConsistencyLevel.ONE) == \
             [SuperColumn(name='sc1', columns=[Column(_i64(4), 'value4', 0)]),
              SuperColumn(name='sc2', columns=[Column(_i64(6), 'value6', 0)])]
         _verify_simple()
 
         # New insert, make sure it shows up post-remove:
-        client.insert('Table1', 'key1', ColumnPath('Super1', 'sc2', _i64(7)), 'value7', 0, ConsistencyLevel.ONE)
+        client.insert('Keyspace1', 'key1', ColumnPath('Super1', 'sc2', _i64(7)), 'value7', 0, ConsistencyLevel.ONE)
         scs = [SuperColumn(name='sc1', 
                            columns=[Column(_i64(4), 'value4', 0)]),
                SuperColumn(name='sc2', 
                            columns=[Column(_i64(6), 'value6', 0), Column(_i64(7), 'value7', 0)])]
 
-        actual = client.get_slice_super('Table1', 'key1', 'Super1', '', '', True, 1000, ConsistencyLevel.ONE)
-        assert client.get_slice_super('Table1', 'key1', 'Super1', '', '', True, 1000, ConsistencyLevel.ONE) == scs, actual
+        actual = client.get_slice_super('Keyspace1', 'key1', 'Super1', '', '', True, 1000, ConsistencyLevel.ONE)
+        assert client.get_slice_super('Keyspace1', 'key1', 'Super1', '', '', True, 1000, ConsistencyLevel.ONE) == scs, actual
 
         # Test resurrection.  First, re-insert the value w/ older timestamp, 
         # and make sure it stays removed:
-        client.insert('Table1', 'key1', ColumnPath('Super1', 'sc2', _i64(5)), 'value5', 0, ConsistencyLevel.ONE)
+        client.insert('Keyspace1', 'key1', ColumnPath('Super1', 'sc2', _i64(5)), 'value5', 0, ConsistencyLevel.ONE)
 
-        actual = client.get_slice_super('Table1', 'key1', 'Super1', '', '', True, 1000, ConsistencyLevel.ONE)
+        actual = client.get_slice_super('Keyspace1', 'key1', 'Super1', '', '', True, 1000, ConsistencyLevel.ONE)
         assert actual == scs, actual
 
         # Next, w/ a newer timestamp; it should come back
-        client.insert('Table1', 'key1', ColumnPath('Super1', 'sc2', _i64(5)), 'value5', 6, ConsistencyLevel.ONE)
-        actual = client.get_slice_super('Table1', 'key1', 'Super1', '', '', True, 1000, ConsistencyLevel.ONE)
+        client.insert('Keyspace1', 'key1', ColumnPath('Super1', 'sc2', _i64(5)), 'value5', 6, ConsistencyLevel.ONE)
+        actual = client.get_slice_super('Keyspace1', 'key1', 'Super1', '', '', True, 1000, ConsistencyLevel.ONE)
         assert actual == \
             [SuperColumn(name='sc1', columns=[Column(_i64(4), 'value4', 0)]), 
              SuperColumn(name='sc2', columns=[Column(_i64(5), 'value5', 6), 
@@ -276,72 +276,72 @@ class TestMutations(CassandraTester):
         _insert_super()
 
         # Make sure remove clears out what it's supposed to, and _only_ that:
-        client.remove('Table1', 'key1', ColumnPathOrParent('Super1', 'sc2'), 5, ConsistencyLevel.ONE)
-        _expect_missing(lambda: client.get_column('Table1', 'key1', ColumnPath('Super1', 'sc2', _i64(5)), ConsistencyLevel.ONE))
-        actual = client.get_slice('Table1', 'key1', ColumnParent('Super1', 'sc2'), '', '', True, 1000, ConsistencyLevel.ONE)
+        client.remove('Keyspace1', 'key1', ColumnPathOrParent('Super1', 'sc2'), 5, ConsistencyLevel.ONE)
+        _expect_missing(lambda: client.get_column('Keyspace1', 'key1', ColumnPath('Super1', 'sc2', _i64(5)), ConsistencyLevel.ONE))
+        actual = client.get_slice('Keyspace1', 'key1', ColumnParent('Super1', 'sc2'), '', '', True, 1000, ConsistencyLevel.ONE)
         assert actual == [], actual
         scs = [SuperColumn(name='sc1', columns=[Column(_i64(4), 'value4', 0)])]
-        actual = client.get_slice_super('Table1', 'key1', 'Super1', '', '', True, 1000, ConsistencyLevel.ONE)
+        actual = client.get_slice_super('Keyspace1', 'key1', 'Super1', '', '', True, 1000, ConsistencyLevel.ONE)
         assert actual == scs, actual
         _verify_simple()
 
         # Test resurrection.  First, re-insert the value w/ older timestamp, 
         # and make sure it stays removed:
-        client.insert('Table1', 'key1', ColumnPath('Super1', 'sc2', _i64(5)), 'value5', 0, ConsistencyLevel.ONE)
-        actual = client.get_slice_super('Table1', 'key1', 'Super1', '', '', True, 1000, ConsistencyLevel.ONE)
+        client.insert('Keyspace1', 'key1', ColumnPath('Super1', 'sc2', _i64(5)), 'value5', 0, ConsistencyLevel.ONE)
+        actual = client.get_slice_super('Keyspace1', 'key1', 'Super1', '', '', True, 1000, ConsistencyLevel.ONE)
         assert actual == scs, actual
 
         # Next, w/ a newer timestamp; it should come back
-        client.insert('Table1', 'key1', ColumnPath('Super1', 'sc2', _i64(5)), 'value5', 6, ConsistencyLevel.ONE)
-        actual = client.get_slice_super('Table1', 'key1', 'Super1', '', '', True, 1000, ConsistencyLevel.ONE)
+        client.insert('Keyspace1', 'key1', ColumnPath('Super1', 'sc2', _i64(5)), 'value5', 6, ConsistencyLevel.ONE)
+        actual = client.get_slice_super('Keyspace1', 'key1', 'Super1', '', '', True, 1000, ConsistencyLevel.ONE)
         assert actual == \
             [SuperColumn(name='sc1', columns=[Column(_i64(4), 'value4', 0)]),
              SuperColumn(name='sc2', columns=[Column(_i64(5), 'value5', 6)])], actual
 
 
     def test_empty_range(self):
-        assert client.get_key_range('Table1', 'Standard1', '', '', 1000) == []
+        assert client.get_key_range('Keyspace1', 'Standard1', '', '', 1000) == []
         _insert_simple()
-        assert client.get_key_range('Table1', 'Super1', '', '', 1000) == []
+        assert client.get_key_range('Keyspace1', 'Super1', '', '', 1000) == []
 
     def test_range_with_remove(self):
         _insert_simple()
-        assert client.get_key_range('Table1', 'Standard1', 'key1', '', 1000) == ['key1']
+        assert client.get_key_range('Keyspace1', 'Standard1', 'key1', '', 1000) == ['key1']
 
-        client.remove('Table1', 'key1', ColumnPathOrParent('Standard1', column='c1'), 1, ConsistencyLevel.ONE)
-        client.remove('Table1', 'key1', ColumnPathOrParent('Standard1', column='c2'), 1, ConsistencyLevel.ONE)
-        actual = client.get_key_range('Table1', 'Standard1', '', '', 1000)
+        client.remove('Keyspace1', 'key1', ColumnPathOrParent('Standard1', column='c1'), 1, ConsistencyLevel.ONE)
+        client.remove('Keyspace1', 'key1', ColumnPathOrParent('Standard1', column='c2'), 1, ConsistencyLevel.ONE)
+        actual = client.get_key_range('Keyspace1', 'Standard1', '', '', 1000)
         assert actual == [], actual
 
     def test_range_with_remove_cf(self):
         _insert_simple()
-        assert client.get_key_range('Table1', 'Standard1', 'key1', '', 1000) == ['key1']
+        assert client.get_key_range('Keyspace1', 'Standard1', 'key1', '', 1000) == ['key1']
 
-        client.remove('Table1', 'key1', ColumnPathOrParent('Standard1'), 1, ConsistencyLevel.ONE)
-        actual = client.get_key_range('Table1', 'Standard1', '', '', 1000)
+        client.remove('Keyspace1', 'key1', ColumnPathOrParent('Standard1'), 1, ConsistencyLevel.ONE)
+        actual = client.get_key_range('Keyspace1', 'Standard1', '', '', 1000)
         assert actual == [], actual
 
     def test_range_collation(self):
         for key in ['-a', '-b', 'a', 'b'] + [str(i) for i in xrange(100)]:
-            client.insert('Table1', key, ColumnPath('Standard1', column=key), 'v', 0, ConsistencyLevel.ONE)
-        L = client.get_key_range('Table1', 'Standard1', '', '', 1000)
+            client.insert('Keyspace1', key, ColumnPath('Standard1', column=key), 'v', 0, ConsistencyLevel.ONE)
+        L = client.get_key_range('Keyspace1', 'Standard1', '', '', 1000)
         # note the collated ordering rather than ascii
         assert L == ['0', '1', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '2', '20', '21', '22', '23', '24', '25', '26', '27','28', '29', '3', '30', '31', '32', '33', '34', '35', '36', '37', '38', '39', '4', '40', '41', '42', '43', '44', '45', '46', '47', '48', '49', '5', '50', '51', '52', '53', '54', '55', '56', '57', '58', '59', '6', '60', '61', '62', '63', '64', '65', '66', '67', '68', '69', '7', '70', '71', '72', '73', '74', '75', '76', '77', '78', '79', '8', '80', '81', '82', '83', '84', '85', '86', '87', '88', '89', '9', '90', '91', '92', '93', '94', '95', '96', '97', '98', '99', 'a', '-a', 'b', '-b'], L
 
     def test_range_partial(self):
         for key in ['-a', '-b', 'a', 'b'] + [str(i) for i in xrange(100)]:
-            client.insert('Table1', key, ColumnPath('Standard1', column=key), 'v', 0, ConsistencyLevel.ONE)
+            client.insert('Keyspace1', key, ColumnPath('Standard1', column=key), 'v', 0, ConsistencyLevel.ONE)
 
-        L = client.get_key_range('Table1', 'Standard1', 'a', '', 1000)
+        L = client.get_key_range('Keyspace1', 'Standard1', 'a', '', 1000)
         assert L == ['a', '-a', 'b', '-b'], L
 
-        L = client.get_key_range('Table1', 'Standard1', '', '15', 1000)
+        L = client.get_key_range('Keyspace1', 'Standard1', '', '15', 1000)
         assert L == ['0', '1', '10', '11', '12', '13', '14', '15'], L
 
-        L = client.get_key_range('Table1', 'Standard1', '50', '51', 1000)
+        L = client.get_key_range('Keyspace1', 'Standard1', '50', '51', 1000)
         assert L == ['50', '51'], L
     
-        L = client.get_key_range('Table1', 'Standard1', '1', '', 10)
+        L = client.get_key_range('Keyspace1', 'Standard1', '1', '', 10)
         assert L == ['1', '10', '11', '12', '13', '14', '15', '16', '17', '18'], L
 
     def test_get_slice_range(self):
@@ -354,12 +354,12 @@ class TestMutations(CassandraTester):
         
     def test_get_slice_by_names(self):
         _insert_range()
-        result = client.get_slice_by_names('Table1','key1', ColumnParent('Standard1'), ['c1', 'c2'], ConsistencyLevel.ONE) 
+        result = client.get_slice_by_names('Keyspace1', 'key1', ColumnParent('Standard1'), ['c1', 'c2'], ConsistencyLevel.ONE) 
         assert len(result) == 2
         assert result[0].name == 'c1'
         assert result[1].name == 'c2'
 
         _insert_super()
-        result = client.get_slice_by_names('Table1','key1', ColumnParent('Super1', 'sc1'), [_i64(4)], ConsistencyLevel.ONE) 
+        result = client.get_slice_by_names('Keyspace1', 'key1', ColumnParent('Super1', 'sc1'), [_i64(4)], ConsistencyLevel.ONE) 
         assert len(result) == 1
         assert result[0].name == _i64(4)
diff --git a/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java b/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
index ca497f4c09..9c07a63507 100644
--- a/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
+++ b/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
@@ -103,12 +103,12 @@ public class ColumnFamilyStoreTest extends CleanupHelper
     @Test
     public void testGetColumnWithWrongBF() throws IOException, ExecutionException, InterruptedException
     {
-        Table table = Table.open("Table1");
+        Table table = Table.open("Keyspace1");
         ColumnFamilyStore store = table.getColumnFamilyStore("Standard1");
         RowMutation rm;
 
         // add data
-        rm = new RowMutation("Table1", "key1");
+        rm = new RowMutation("Keyspace1", "key1");
         rm.add(new QueryPath("Standard1", null, "Column1".getBytes()), "asdf".getBytes(), 0);
         rm.add(new QueryPath("Standard1", null, "Column2".getBytes()), "asdf".getBytes(), 0);
         rm.apply();
diff --git a/test/unit/org/apache/cassandra/db/ColumnFamilyTest.java b/test/unit/org/apache/cassandra/db/ColumnFamilyTest.java
index c58ec3fdaf..40e58890e4 100644
--- a/test/unit/org/apache/cassandra/db/ColumnFamilyTest.java
+++ b/test/unit/org/apache/cassandra/db/ColumnFamilyTest.java
@@ -40,7 +40,7 @@ public class ColumnFamilyTest
     {
         ColumnFamily cf;
 
-        cf = ColumnFamily.create("Table1", "Standard1");
+        cf = ColumnFamily.create("Keyspace1", "Standard1");
         cf.addColumn(column("C", "v", 1));
         DataOutputBuffer bufOut = new DataOutputBuffer();
         ColumnFamily.serializer().serialize(cf, bufOut);
@@ -65,7 +65,7 @@ public class ColumnFamilyTest
         }
 
         // write
-        cf = ColumnFamily.create("Table1", "Standard1");
+        cf = ColumnFamily.create("Keyspace1", "Standard1");
         DataOutputBuffer bufOut = new DataOutputBuffer();
         for (String cName : map.navigableKeySet())
         {
@@ -87,7 +87,7 @@ public class ColumnFamilyTest
     @Test
     public void testGetColumnCount()
     {
-        ColumnFamily cf = ColumnFamily.create("Table1", "Standard1");
+        ColumnFamily cf = ColumnFamily.create("Keyspace1", "Standard1");
 
         cf.addColumn(column("col1", "", 1));
         cf.addColumn(column("col2", "", 2));
@@ -100,7 +100,7 @@ public class ColumnFamilyTest
     @Test
     public void testTimestamp()
     {
-        ColumnFamily cf = ColumnFamily.create("Table1", "Standard1");
+        ColumnFamily cf = ColumnFamily.create("Keyspace1", "Standard1");
 
         cf.addColumn(column("col1", "val1", 2));
         cf.addColumn(column("col1", "val2", 2)); // same timestamp, new value
@@ -112,9 +112,9 @@ public class ColumnFamilyTest
     @Test
     public void testMergeAndAdd()
     {
-        ColumnFamily cf_new = ColumnFamily.create("Table1", "Standard1");
-        ColumnFamily cf_old = ColumnFamily.create("Table1", "Standard1");
-        ColumnFamily cf_result = ColumnFamily.create("Table1", "Standard1");
+        ColumnFamily cf_new = ColumnFamily.create("Keyspace1", "Standard1");
+        ColumnFamily cf_old = ColumnFamily.create("Keyspace1", "Standard1");
+        ColumnFamily cf_result = ColumnFamily.create("Keyspace1", "Standard1");
         byte val[] = "sample value".getBytes();
         byte val2[] = "x value ".getBytes();
 
@@ -136,7 +136,7 @@ public class ColumnFamilyTest
     @Test
     public void testEmptyDigest()
     {
-        ColumnFamily cf = ColumnFamily.create("Table1", "Standard1");
+        ColumnFamily cf = ColumnFamily.create("Keyspace1", "Standard1");
         assert cf.digest().length == 0;
     }
 }
diff --git a/test/unit/org/apache/cassandra/db/CommitLogTest.java b/test/unit/org/apache/cassandra/db/CommitLogTest.java
index 3c49ba7a86..da83f7904f 100644
--- a/test/unit/org/apache/cassandra/db/CommitLogTest.java
+++ b/test/unit/org/apache/cassandra/db/CommitLogTest.java
@@ -34,7 +34,7 @@ public class CommitLogTest extends CleanupHelper
         assert CommitLog.getSegmentCount() == 0;
         CommitLog.setSegmentSize(1000);
 
-        Table table = Table.open("Table1");
+        Table table = Table.open("Keyspace1");
         ColumnFamilyStore store1 = table.getColumnFamilyStore("Standard1");
         ColumnFamilyStore store2 = table.getColumnFamilyStore("Standard2");
         RowMutation rm;
@@ -43,7 +43,7 @@ public class CommitLogTest extends CleanupHelper
         // add data.  use relatively large values to force quick segment creation since we have a low flush threshold in the test config.
         for (int i = 0; i < 10; i++)
         {
-            rm = new RowMutation("Table1", "key1");
+            rm = new RowMutation("Keyspace1", "key1");
             rm.add(new QueryPath("Standard1", null, "Column1".getBytes()), value, 0);
             rm.add(new QueryPath("Standard2", null, "Column1".getBytes()), value, 0);
             rm.apply();
diff --git a/test/unit/org/apache/cassandra/db/CompactionsTest.java b/test/unit/org/apache/cassandra/db/CompactionsTest.java
index 6ff6ec229e..873d7aff93 100644
--- a/test/unit/org/apache/cassandra/db/CompactionsTest.java
+++ b/test/unit/org/apache/cassandra/db/CompactionsTest.java
@@ -38,7 +38,7 @@ public class CompactionsTest extends CleanupHelper
     public void testCompactions() throws IOException, ExecutionException, InterruptedException
     {
         // this test does enough rows to force multiple block indexes to be used
-        Table table = Table.open("Table1");
+        Table table = Table.open("Keyspace1");
         ColumnFamilyStore store = table.getColumnFamilyStore("Standard1");
 
         final int ROWS_PER_SSTABLE = 10;
@@ -46,7 +46,7 @@ public class CompactionsTest extends CleanupHelper
         for (int j = 0; j < (SSTableReader.indexInterval() * 3) / ROWS_PER_SSTABLE; j++) {
             for (int i = 0; i < ROWS_PER_SSTABLE; i++) {
                 String key = String.valueOf(i % 2);
-                RowMutation rm = new RowMutation("Table1", key);
+                RowMutation rm = new RowMutation("Keyspace1", key);
                 rm.add(new QueryPath("Standard1", null, String.valueOf(i / 2).getBytes()), new byte[0], j * ROWS_PER_SSTABLE + i);
                 rm.apply();
                 inserted.add(key);
diff --git a/test/unit/org/apache/cassandra/db/MultitableTest.java b/test/unit/org/apache/cassandra/db/MultitableTest.java
index 041fb62b98..4fae76bba4 100644
--- a/test/unit/org/apache/cassandra/db/MultitableTest.java
+++ b/test/unit/org/apache/cassandra/db/MultitableTest.java
@@ -14,20 +14,20 @@ public class MultitableTest extends CleanupHelper
     @Test
     public void testSameCFs() throws IOException, ExecutionException, InterruptedException
     {
-        Table table1 = Table.open("Table1");
-        Table table2 = Table.open("Table2");
+        Table table1 = Table.open("Keyspace1");
+        Table table2 = Table.open("Keyspace2");
 
         RowMutation rm;
         ColumnFamily cf;
 
-        rm = new RowMutation("Table1", "keymulti");
-        cf = ColumnFamily.create("Table1", "Standard1");
+        rm = new RowMutation("Keyspace1", "keymulti");
+        cf = ColumnFamily.create("Keyspace1", "Standard1");
         cf.addColumn(column("col1", "val1", 1L));
         rm.add(cf);
         rm.apply();
 
-        rm = new RowMutation("Table2", "keymulti");
-        cf = ColumnFamily.create("Table2", "Standard1");
+        rm = new RowMutation("Keyspace2", "keymulti");
+        cf = ColumnFamily.create("Keyspace2", "Standard1");
         cf.addColumn(column("col2", "val2", 1L));
         rm.add(cf);
         rm.apply();
diff --git a/test/unit/org/apache/cassandra/db/NameSortTest.java b/test/unit/org/apache/cassandra/db/NameSortTest.java
index 2b7a261756..b99778c810 100644
--- a/test/unit/org/apache/cassandra/db/NameSortTest.java
+++ b/test/unit/org/apache/cassandra/db/NameSortTest.java
@@ -58,7 +58,7 @@ public class NameSortTest extends CleanupHelper
 
     private void testNameSort(int N) throws IOException, ExecutionException, InterruptedException
     {
-        Table table = Table.open("Table1");
+        Table table = Table.open("Keyspace1");
 
         for (int i = 0; i < N; ++i)
         {
@@ -69,7 +69,7 @@ public class NameSortTest extends CleanupHelper
             for (int j = 0; j < 8; ++j)
             {
                 byte[] bytes = j % 2 == 0 ? "a".getBytes() : "b".getBytes();
-                rm = new RowMutation("Table1", key);
+                rm = new RowMutation("Keyspace1", key);
                 rm.add(new QueryPath("Standard1", null, ("Column-" + j).getBytes()), bytes, j);
                 rm.apply();
             }
@@ -77,7 +77,7 @@ public class NameSortTest extends CleanupHelper
             // super
             for (int j = 0; j < 8; ++j)
             {
-                rm = new RowMutation("Table1", key);
+                rm = new RowMutation("Keyspace1", key);
                 for (int k = 0; k < 4; ++k)
                 {
                     String value = (j + k) % 2 == 0 ? "a" : "b";
diff --git a/test/unit/org/apache/cassandra/db/OneCompactionTest.java b/test/unit/org/apache/cassandra/db/OneCompactionTest.java
index 016d3865d5..2cc74b7716 100644
--- a/test/unit/org/apache/cassandra/db/OneCompactionTest.java
+++ b/test/unit/org/apache/cassandra/db/OneCompactionTest.java
@@ -34,13 +34,13 @@ public class OneCompactionTest
 {
     private void testCompaction(String columnFamilyName, int insertsPerTable) throws IOException, ExecutionException, InterruptedException
     {
-        Table table = Table.open("Table1");
+        Table table = Table.open("Keyspace1");
         ColumnFamilyStore store = table.getColumnFamilyStore(columnFamilyName);
 
         Set<String> inserted = new HashSet<String>();
         for (int j = 0; j < insertsPerTable; j++) {
             String key = "0";
-            RowMutation rm = new RowMutation("Table1", key);
+            RowMutation rm = new RowMutation("Keyspace1", key);
             rm.add(new QueryPath(columnFamilyName, null, "0".getBytes()), new byte[0], j);
             rm.apply();
             inserted.add(key);
diff --git a/test/unit/org/apache/cassandra/db/ReadMessageTest.java b/test/unit/org/apache/cassandra/db/ReadMessageTest.java
index 25f72bbed8..0602973134 100644
--- a/test/unit/org/apache/cassandra/db/ReadMessageTest.java
+++ b/test/unit/org/apache/cassandra/db/ReadMessageTest.java
@@ -44,15 +44,15 @@ public class ReadMessageTest
         
         ReadCommand rm, rm2;
         
-        rm = new SliceByNamesReadCommand("Table1", "row1", new QueryPath("Standard1"), colList);
+        rm = new SliceByNamesReadCommand("Keyspace1", "row1", new QueryPath("Standard1"), colList);
         rm2 = serializeAndDeserializeReadMessage(rm);
         assert rm2.toString().equals(rm.toString());
 
-        rm = new SliceFromReadCommand("Table1", "row1", new QueryPath("Standard1"), ArrayUtils.EMPTY_BYTE_ARRAY, ArrayUtils.EMPTY_BYTE_ARRAY, true, 2);
+        rm = new SliceFromReadCommand("Keyspace1", "row1", new QueryPath("Standard1"), ArrayUtils.EMPTY_BYTE_ARRAY, ArrayUtils.EMPTY_BYTE_ARRAY, true, 2);
         rm2 = serializeAndDeserializeReadMessage(rm);
         assert rm2.toString().equals(rm.toString());
         
-        rm = new SliceFromReadCommand("Table1", "row1", new QueryPath("Standard1"), "a".getBytes(), "z".getBytes(), true, 5);
+        rm = new SliceFromReadCommand("Keyspace1", "row1", new QueryPath("Standard1"), "a".getBytes(), "z".getBytes(), true, 5);
         rm2 = serializeAndDeserializeReadMessage(rm);
         assertEquals(rm2.toString(), rm.toString());
     }
@@ -71,15 +71,15 @@ public class ReadMessageTest
     @Test
     public void testGetColumn() throws IOException, ColumnFamilyNotDefinedException
     {
-        Table table = Table.open("Table1");
+        Table table = Table.open("Keyspace1");
         RowMutation rm;
 
         // add data
-        rm = new RowMutation("Table1", "key1");
+        rm = new RowMutation("Keyspace1", "key1");
         rm.add(new QueryPath("Standard1", null, "Column1".getBytes()), "abcd".getBytes(), 0);
         rm.apply();
 
-        ReadCommand command = new SliceByNamesReadCommand("Table1", "key1", new QueryPath("Standard1"), Arrays.asList("Column1".getBytes()));
+        ReadCommand command = new SliceByNamesReadCommand("Keyspace1", "key1", new QueryPath("Standard1"), Arrays.asList("Column1".getBytes()));
         Row row = command.getRow(table);
         ColumnFamily cf = row.getColumnFamily("Standard1");
         IColumn col = cf.getColumn("Column1".getBytes());
diff --git a/test/unit/org/apache/cassandra/db/RecoveryManager2Test.java b/test/unit/org/apache/cassandra/db/RecoveryManager2Test.java
index 166971308b..d57d979d98 100644
--- a/test/unit/org/apache/cassandra/db/RecoveryManager2Test.java
+++ b/test/unit/org/apache/cassandra/db/RecoveryManager2Test.java
@@ -16,14 +16,14 @@ public class RecoveryManager2Test extends CleanupHelper
     @Test
     public void testWithFlush() throws IOException, ExecutionException, InterruptedException
     {
-        Table table1 = Table.open("Table1");
+        Table table1 = Table.open("Keyspace1");
         Set<String> keys = new HashSet<String>();
 
         for (int i = 0; i < 100; i++)
         {
             String key = "key" + i;
-            RowMutation rm = new RowMutation("Table1", key);
-            ColumnFamily cf = ColumnFamily.create("Table1", "Standard1");
+            RowMutation rm = new RowMutation("Keyspace1", key);
+            ColumnFamily cf = ColumnFamily.create("Keyspace1", "Standard1");
             cf.addColumn(column("col1", "val1", 1L));
             rm.add(cf);
             rm.apply();
diff --git a/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java b/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java
index ceda5da3bd..a39312f394 100644
--- a/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java
+++ b/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java
@@ -42,20 +42,20 @@ public class RecoveryManagerTest extends CleanupHelper
     @Test
     public void testOne() throws IOException, ExecutionException, InterruptedException
     {
-        Table table1 = Table.open("Table1");
-        Table table2 = Table.open("Table2");
+        Table table1 = Table.open("Keyspace1");
+        Table table2 = Table.open("Keyspace2");
 
         RowMutation rm;
         ColumnFamily cf;
 
-        rm = new RowMutation("Table1", "keymulti");
-        cf = ColumnFamily.create("Table1", "Standard1");
+        rm = new RowMutation("Keyspace1", "keymulti");
+        cf = ColumnFamily.create("Keyspace1", "Standard1");
         cf.addColumn(column("col1", "val1", 1L));
         rm.add(cf);
         rm.apply();
 
-        rm = new RowMutation("Table2", "keymulti");
-        cf = ColumnFamily.create("Table2", "Standard3");
+        rm = new RowMutation("Keyspace2", "keymulti");
+        cf = ColumnFamily.create("Keyspace2", "Standard3");
         cf.addColumn(column("col2", "val2", 1L));
         rm.add(cf);
         rm.apply();
diff --git a/test/unit/org/apache/cassandra/db/RemoveColumnFamilyTest.java b/test/unit/org/apache/cassandra/db/RemoveColumnFamilyTest.java
index 86cce02585..35efad195e 100644
--- a/test/unit/org/apache/cassandra/db/RemoveColumnFamilyTest.java
+++ b/test/unit/org/apache/cassandra/db/RemoveColumnFamilyTest.java
@@ -32,17 +32,17 @@ public class RemoveColumnFamilyTest
     @Test
     public void testRemoveColumnFamily() throws IOException, ExecutionException, InterruptedException
     {
-        Table table = Table.open("Table1");
+        Table table = Table.open("Keyspace1");
         ColumnFamilyStore store = table.getColumnFamilyStore("Standard1");
         RowMutation rm;
 
         // add data
-        rm = new RowMutation("Table1", "key1");
+        rm = new RowMutation("Keyspace1", "key1");
         rm.add(new QueryPath("Standard1", null, "Column1".getBytes()), "asdf".getBytes(), 0);
         rm.apply();
 
         // remove
-        rm = new RowMutation("Table1", "key1");
+        rm = new RowMutation("Keyspace1", "key1");
         rm.delete(new QueryPath("Standard1"), 1);
         rm.apply();
 
diff --git a/test/unit/org/apache/cassandra/db/RemoveColumnFamilyWithFlush1Test.java b/test/unit/org/apache/cassandra/db/RemoveColumnFamilyWithFlush1Test.java
index 61426e900c..423ad5ad20 100644
--- a/test/unit/org/apache/cassandra/db/RemoveColumnFamilyWithFlush1Test.java
+++ b/test/unit/org/apache/cassandra/db/RemoveColumnFamilyWithFlush1Test.java
@@ -32,19 +32,19 @@ public class RemoveColumnFamilyWithFlush1Test
     @Test
     public void testRemoveColumnFamilyWithFlush1() throws IOException, ExecutionException, InterruptedException
     {
-        Table table = Table.open("Table1");
+        Table table = Table.open("Keyspace1");
         ColumnFamilyStore store = table.getColumnFamilyStore("Standard1");
         RowMutation rm;
 
         // add data
-        rm = new RowMutation("Table1", "key1");
+        rm = new RowMutation("Keyspace1", "key1");
         rm.add(new QueryPath("Standard1", null, "Column1".getBytes()), "asdf".getBytes(), 0);
         rm.add(new QueryPath("Standard1", null, "Column2".getBytes()), "asdf".getBytes(), 0);
         rm.apply();
         store.forceBlockingFlush();
 
         // remove
-        rm = new RowMutation("Table1", "key1");
+        rm = new RowMutation("Keyspace1", "key1");
         rm.delete(new QueryPath("Standard1"), 1);
         rm.apply();
 
diff --git a/test/unit/org/apache/cassandra/db/RemoveColumnFamilyWithFlush2Test.java b/test/unit/org/apache/cassandra/db/RemoveColumnFamilyWithFlush2Test.java
index 83f1346a10..74220bdabd 100644
--- a/test/unit/org/apache/cassandra/db/RemoveColumnFamilyWithFlush2Test.java
+++ b/test/unit/org/apache/cassandra/db/RemoveColumnFamilyWithFlush2Test.java
@@ -32,16 +32,16 @@ public class RemoveColumnFamilyWithFlush2Test
     @Test
     public void testRemoveColumnFamilyWithFlush2() throws IOException, ExecutionException, InterruptedException
     {
-        Table table = Table.open("Table1");
+        Table table = Table.open("Keyspace1");
         ColumnFamilyStore store = table.getColumnFamilyStore("Standard1");
         RowMutation rm;
 
         // add data
-        rm = new RowMutation("Table1", "key1");
+        rm = new RowMutation("Keyspace1", "key1");
         rm.add(new QueryPath("Standard1", null, "Column1".getBytes()), "asdf".getBytes(), 0);
         rm.apply();
         // remove
-        rm = new RowMutation("Table1", "key1");
+        rm = new RowMutation("Keyspace1", "key1");
         rm.delete(new QueryPath("Standard1"), 1);
         rm.apply();
         store.forceBlockingFlush();
diff --git a/test/unit/org/apache/cassandra/db/RemoveColumnTest.java b/test/unit/org/apache/cassandra/db/RemoveColumnTest.java
index d5b365fa32..dcc9093169 100644
--- a/test/unit/org/apache/cassandra/db/RemoveColumnTest.java
+++ b/test/unit/org/apache/cassandra/db/RemoveColumnTest.java
@@ -33,18 +33,18 @@ public class RemoveColumnTest
     @Test
     public void testRemoveColumn() throws IOException, ExecutionException, InterruptedException
     {
-        Table table = Table.open("Table1");
+        Table table = Table.open("Keyspace1");
         ColumnFamilyStore store = table.getColumnFamilyStore("Standard1");
         RowMutation rm;
 
         // add data
-        rm = new RowMutation("Table1", "key1");
+        rm = new RowMutation("Keyspace1", "key1");
         rm.add(new QueryPath("Standard1", null, "Column1".getBytes()), "asdf".getBytes(), 0);
         rm.apply();
         store.forceBlockingFlush();
 
         // remove
-        rm = new RowMutation("Table1", "key1");
+        rm = new RowMutation("Keyspace1", "key1");
         rm.delete(new QueryPath("Standard1", null, "Column1".getBytes()), 1);
         rm.apply();
 
diff --git a/test/unit/org/apache/cassandra/db/RemoveSubColumnTest.java b/test/unit/org/apache/cassandra/db/RemoveSubColumnTest.java
index 68f24b1b89..a2e3e61b9c 100644
--- a/test/unit/org/apache/cassandra/db/RemoveSubColumnTest.java
+++ b/test/unit/org/apache/cassandra/db/RemoveSubColumnTest.java
@@ -34,18 +34,18 @@ public class RemoveSubColumnTest
     @Test
     public void testRemoveSubColumn() throws IOException, ExecutionException, InterruptedException
     {
-        Table table = Table.open("Table1");
+        Table table = Table.open("Keyspace1");
         ColumnFamilyStore store = table.getColumnFamilyStore("Super1");
         RowMutation rm;
 
         // add data
-        rm = new RowMutation("Table1", "key1");
+        rm = new RowMutation("Keyspace1", "key1");
         addMutation(rm, "Super1", "SC1", 1, "asdf", 0);
         rm.apply();
         store.forceBlockingFlush();
 
         // remove
-        rm = new RowMutation("Table1", "key1");
+        rm = new RowMutation("Keyspace1", "key1");
         rm.delete(new QueryPath("Super1", "SC1".getBytes(), getBytes(1)), 1);
         rm.apply();
 
diff --git a/test/unit/org/apache/cassandra/db/RemoveSuperColumnTest.java b/test/unit/org/apache/cassandra/db/RemoveSuperColumnTest.java
index 0914a675ba..9839d0eba5 100644
--- a/test/unit/org/apache/cassandra/db/RemoveSuperColumnTest.java
+++ b/test/unit/org/apache/cassandra/db/RemoveSuperColumnTest.java
@@ -38,17 +38,17 @@ public class RemoveSuperColumnTest
     @Test
     public void testRemoveSuperColumn() throws IOException, ExecutionException, InterruptedException
     {
-        ColumnFamilyStore store = Table.open("Table1").getColumnFamilyStore("Super1");
+        ColumnFamilyStore store = Table.open("Keyspace1").getColumnFamilyStore("Super1");
         RowMutation rm;
 
         // add data
-        rm = new RowMutation("Table1", "key1");
+        rm = new RowMutation("Keyspace1", "key1");
         addMutation(rm, "Super1", "SC1", 1, "val1", 0);
         rm.apply();
         store.forceBlockingFlush();
 
         // remove
-        rm = new RowMutation("Table1", "key1");
+        rm = new RowMutation("Keyspace1", "key1");
         rm.delete(new QueryPath("Super1", "SC1".getBytes()), 1);
         rm.apply();
 
@@ -65,7 +65,7 @@ public class RemoveSuperColumnTest
 
     private void validateRemoveTwoSources() throws IOException
     {
-        ColumnFamilyStore store = Table.open("Table1").getColumnFamilyStore("Super1");
+        ColumnFamilyStore store = Table.open("Keyspace1").getColumnFamilyStore("Super1");
         ColumnFamily resolved = store.getColumnFamily(new NamesQueryFilter("key1", new QueryPath("Super1"), "SC1".getBytes()));
         assert resolved.getSortedColumns().iterator().next().getMarkedForDeleteAt() == 1;
         assert resolved.getSortedColumns().iterator().next().getSubColumns().size() == 0;
@@ -75,7 +75,7 @@ public class RemoveSuperColumnTest
 
     private void validateRemoveCompacted() throws IOException
     {
-        ColumnFamilyStore store = Table.open("Table1").getColumnFamilyStore("Super1");
+        ColumnFamilyStore store = Table.open("Keyspace1").getColumnFamilyStore("Super1");
         ColumnFamily resolved = store.getColumnFamily(new NamesQueryFilter("key1", new QueryPath("Super1"), "SC1".getBytes()));
         assert resolved.getSortedColumns().iterator().next().getMarkedForDeleteAt() == 1;
         Collection<IColumn> subColumns = resolved.getSortedColumns().iterator().next().getSubColumns();
@@ -85,22 +85,22 @@ public class RemoveSuperColumnTest
     @Test
     public void testRemoveSuperColumnWithNewData() throws IOException, ExecutionException, InterruptedException
     {
-        ColumnFamilyStore store = Table.open("Table1").getColumnFamilyStore("Super2");
+        ColumnFamilyStore store = Table.open("Keyspace1").getColumnFamilyStore("Super2");
         RowMutation rm;
 
         // add data
-        rm = new RowMutation("Table1", "key1");
+        rm = new RowMutation("Keyspace1", "key1");
         addMutation(rm, "Super2", "SC1", 1, "val1", 0);
         rm.apply();
         store.forceBlockingFlush();
 
         // remove
-        rm = new RowMutation("Table1", "key1");
+        rm = new RowMutation("Keyspace1", "key1");
         rm.delete(new QueryPath("Super2", "SC1".getBytes()), 1);
         rm.apply();
 
         // new data
-        rm = new RowMutation("Table1", "key1");
+        rm = new RowMutation("Keyspace1", "key1");
         addMutation(rm, "Super2", "SC1", 2, "val2", 2);
         rm.apply();
 
@@ -117,7 +117,7 @@ public class RemoveSuperColumnTest
 
     private void validateRemoveWithNewData() throws IOException
     {
-        ColumnFamilyStore store = Table.open("Table1").getColumnFamilyStore("Super2");
+        ColumnFamilyStore store = Table.open("Keyspace1").getColumnFamilyStore("Super2");
         ColumnFamily resolved = store.getColumnFamily(new NamesQueryFilter("key1", new QueryPath("Super2", "SC1".getBytes()), getBytes(2)));
         Collection<IColumn> subColumns = resolved.getSortedColumns().iterator().next().getSubColumns();
         assert subColumns.size() == 1;
diff --git a/test/unit/org/apache/cassandra/db/RowTest.java b/test/unit/org/apache/cassandra/db/RowTest.java
index 8669fc1571..8d056b32cf 100644
--- a/test/unit/org/apache/cassandra/db/RowTest.java
+++ b/test/unit/org/apache/cassandra/db/RowTest.java
@@ -32,10 +32,10 @@ public class RowTest
     @Test
     public void testDiffColumnFamily()
     {
-        ColumnFamily cf1 = ColumnFamily.create("Table1", "Standard1");
+        ColumnFamily cf1 = ColumnFamily.create("Keyspace1", "Standard1");
         cf1.addColumn(column("one", "onev", 0));
 
-        ColumnFamily cf2 = ColumnFamily.create("Table1", "Standard1");
+        ColumnFamily cf2 = ColumnFamily.create("Keyspace1", "Standard1");
         cf2.delete(0, 0);
 
         ColumnFamily cfDiff = cf1.diff(cf2);
@@ -61,15 +61,15 @@ public class RowTest
     public void testRepair()
     {
         Row row1 = new Row();
-        ColumnFamily cf1 = ColumnFamily.create("Table1", "Standard1");
+        ColumnFamily cf1 = ColumnFamily.create("Keyspace1", "Standard1");
         cf1.addColumn(column("one", "A", 0));
         row1.addColumnFamily(cf1);
 
         Row row2 = new Row();
-        ColumnFamily cf2 = ColumnFamily.create("Table1", "Standard1");
+        ColumnFamily cf2 = ColumnFamily.create("Keyspace1", "Standard1");
         cf2.addColumn(column("one", "B", 1));
         cf2.addColumn(column("two", "C", 1));
-        ColumnFamily cf3 = ColumnFamily.create("Table2", "Standard3");
+        ColumnFamily cf3 = ColumnFamily.create("Keyspace2", "Standard3");
         cf3.addColumn(column("three", "D", 1));
         row2.addColumnFamily(cf2);
         row2.addColumnFamily(cf3);
diff --git a/test/unit/org/apache/cassandra/db/TableTest.java b/test/unit/org/apache/cassandra/db/TableTest.java
index fcf7cb9aef..9cc53539b9 100644
--- a/test/unit/org/apache/cassandra/db/TableTest.java
+++ b/test/unit/org/apache/cassandra/db/TableTest.java
@@ -62,7 +62,7 @@ public class TableTest extends CleanupHelper
     @Test
     public void testGetRowSingleColumn() throws Throwable
     {
-        final Table table = Table.open("Table1");
+        final Table table = Table.open("Keyspace1");
         final ColumnFamilyStore cfStore = table.getColumnFamilyStore("Standard1");
 
         Runner setup = new Runner()
@@ -93,10 +93,10 @@ public class TableTest extends CleanupHelper
     public void testGetRowSliceByRange() throws Throwable
     {
     	String key = TEST_KEY+"slicerow";
-    	Table table = Table.open("Table1");
+    	Table table = Table.open("Keyspace1");
         ColumnFamilyStore cfStore = table.getColumnFamilyStore("Standard1");
-    	RowMutation rm = new RowMutation("Table1", key);
-        ColumnFamily cf = ColumnFamily.create("Table1", "Standard1");
+    	RowMutation rm = new RowMutation("Keyspace1", key);
+        ColumnFamily cf = ColumnFamily.create("Keyspace1", "Standard1");
         // First write "a", "b", "c"
         cf.addColumn(column("a", "val1", 1L));
         cf.addColumn(column("b", "val2", 1L));
@@ -119,8 +119,8 @@ public class TableTest extends CleanupHelper
 
     private RowMutation makeSimpleRowMutation()
     {
-        RowMutation rm = new RowMutation("Table1",TEST_KEY);
-        ColumnFamily cf = ColumnFamily.create("Table1", "Standard1");
+        RowMutation rm = new RowMutation("Keyspace1",TEST_KEY);
+        ColumnFamily cf = ColumnFamily.create("Keyspace1", "Standard1");
         cf.addColumn(column("col1","val1", 1L));
         cf.addColumn(column("col2","val2", 1L));
         cf.addColumn(column("col3","val3", 1L));
@@ -131,9 +131,9 @@ public class TableTest extends CleanupHelper
     @Test
     public void testGetSliceNoMatch() throws Throwable
     {
-        Table table = Table.open("Table1");
-        RowMutation rm = new RowMutation("Table1", "row1000");
-        ColumnFamily cf = ColumnFamily.create("Table1", "Standard2");
+        Table table = Table.open("Keyspace1");
+        RowMutation rm = new RowMutation("Keyspace1", "row1000");
+        ColumnFamily cf = ColumnFamily.create("Keyspace1", "Standard2");
         cf.addColumn(column("col1", "val1", 1));
         rm.add(cf);
         rm.apply();
@@ -166,15 +166,15 @@ public class TableTest extends CleanupHelper
     public void testGetSliceFromBasic() throws Throwable
     {
         // tests slicing against data from one row in a memtable and then flushed to an sstable
-        final Table table = Table.open("Table1");
+        final Table table = Table.open("Keyspace1");
         final ColumnFamilyStore cfStore = table.getColumnFamilyStore("Standard1");
         final String ROW = "row1";
         Runner setup = new Runner()
         {
             public void run() throws Exception
             {
-                RowMutation rm = new RowMutation("Table1", ROW);
-                ColumnFamily cf = ColumnFamily.create("Table1", "Standard1");
+                RowMutation rm = new RowMutation("Keyspace1", ROW);
+                ColumnFamily cf = ColumnFamily.create("Keyspace1", "Standard1");
                 cf.addColumn(column("col1", "val1", 1L));
                 cf.addColumn(column("col3", "val3", 1L));
                 cf.addColumn(column("col4", "val4", 1L));
@@ -184,7 +184,7 @@ public class TableTest extends CleanupHelper
                 rm.add(cf);
                 rm.apply();
 
-                rm = new RowMutation("Table1", ROW);
+                rm = new RowMutation("Keyspace1", ROW);
                 rm.delete(new QueryPath("Standard1", null, "col4".getBytes()), 2L);
                 rm.apply();
             }
@@ -225,15 +225,15 @@ public class TableTest extends CleanupHelper
     public void testGetSliceFromAdvanced() throws Throwable
     {
         // tests slicing against data from one row spread across two sstables
-        final Table table = Table.open("Table1");
+        final Table table = Table.open("Keyspace1");
         final ColumnFamilyStore cfStore = table.getColumnFamilyStore("Standard1");
         final String ROW = "row2";
         Runner setup = new Runner()
         {
             public void run() throws Exception
             {
-                RowMutation rm = new RowMutation("Table1", ROW);
-                ColumnFamily cf = ColumnFamily.create("Table1", "Standard1");
+                RowMutation rm = new RowMutation("Keyspace1", ROW);
+                ColumnFamily cf = ColumnFamily.create("Keyspace1", "Standard1");
                 cf.addColumn(column("col1", "val1", 1L));
                 cf.addColumn(column("col2", "val2", 1L));
                 cf.addColumn(column("col3", "val3", 1L));
@@ -244,8 +244,8 @@ public class TableTest extends CleanupHelper
                 rm.apply();
                 cfStore.forceBlockingFlush();
 
-                rm = new RowMutation("Table1", ROW);
-                cf = ColumnFamily.create("Table1", "Standard1");
+                rm = new RowMutation("Keyspace1", ROW);
+                cf = ColumnFamily.create("Keyspace1", "Standard1");
                 cf.addColumn(column("col1", "valx", 2L));
                 cf.addColumn(column("col2", "valx", 2L));
                 cf.addColumn(column("col3", "valx", 2L));
@@ -275,11 +275,11 @@ public class TableTest extends CleanupHelper
     public void testGetSliceFromLarge() throws Throwable
     {
         // tests slicing against 1000 columns in an sstable
-        Table table = Table.open("Table1");
+        Table table = Table.open("Keyspace1");
         ColumnFamilyStore cfStore = table.getColumnFamilyStore("Standard1");
         String ROW = "row3";
-        RowMutation rm = new RowMutation("Table1", ROW);
-        ColumnFamily cf = ColumnFamily.create("Table1", "Standard1");
+        RowMutation rm = new RowMutation("Keyspace1", ROW);
+        ColumnFamily cf = ColumnFamily.create("Keyspace1", "Standard1");
         for (int i = 1000; i < 2000; i++)
             cf.addColumn(column("col" + i, ("vvvvvvvvvvvvvvvv" + i), 1L));
         rm.add(cf);
@@ -315,15 +315,15 @@ public class TableTest extends CleanupHelper
     public void testGetSliceFromSuperBasic() throws Throwable
     {
         // tests slicing against data from one row spread across two sstables
-        final Table table = Table.open("Table1");
+        final Table table = Table.open("Keyspace1");
         final ColumnFamilyStore cfStore = table.getColumnFamilyStore("Super1");
         final String ROW = "row2";
         Runner setup = new Runner()
         {
             public void run() throws Exception
             {
-                RowMutation rm = new RowMutation("Table1", ROW);
-                ColumnFamily cf = ColumnFamily.create("Table1", "Super1");
+                RowMutation rm = new RowMutation("Keyspace1", ROW);
+                ColumnFamily cf = ColumnFamily.create("Keyspace1", "Super1");
                 SuperColumn sc = new SuperColumn("sc1".getBytes(), new LongType());
                 sc.addColumn(new Column(getBytes(1), "val1".getBytes(), 1L));
                 cf.addColumn(sc);
diff --git a/test/unit/org/apache/cassandra/db/TimeSortTest.java b/test/unit/org/apache/cassandra/db/TimeSortTest.java
index d0713b05c3..13b1611309 100644
--- a/test/unit/org/apache/cassandra/db/TimeSortTest.java
+++ b/test/unit/org/apache/cassandra/db/TimeSortTest.java
@@ -37,16 +37,16 @@ public class TimeSortTest extends CleanupHelper
     @Test
     public void testMixedSources() throws IOException, ExecutionException, InterruptedException
     {
-        Table table = Table.open("Table1");
+        Table table = Table.open("Keyspace1");
         ColumnFamilyStore cfStore = table.getColumnFamilyStore("StandardLong1");
         RowMutation rm;
 
-        rm = new RowMutation("Table1", "key0");
+        rm = new RowMutation("Keyspace1", "key0");
         rm.add(new QueryPath("StandardLong1", null, getBytes(100)), "a".getBytes(), 100);
         rm.apply();
         cfStore.forceBlockingFlush();
 
-        rm = new RowMutation("Table1", "key0");
+        rm = new RowMutation("Keyspace1", "key0");
         rm.add(new QueryPath("StandardLong1", null, getBytes(0)), "b".getBytes(), 0);
         rm.apply();
 
@@ -58,12 +58,12 @@ public class TimeSortTest extends CleanupHelper
     @Test
     public void testTimeSort() throws IOException, ExecutionException, InterruptedException
     {
-        Table table = Table.open("Table1");
+        Table table = Table.open("Keyspace1");
         ColumnFamilyStore cfStore = table.getColumnFamilyStore("StandardLong1");
 
         for (int i = 900; i < 1000; ++i)
         {
-            RowMutation rm = new RowMutation("Table1", Integer.toString(i));
+            RowMutation rm = new RowMutation("Keyspace1", Integer.toString(i));
             for (int j = 0; j < 8; ++j)
             {
                 rm.add(new QueryPath("StandardLong1", null, getBytes(j * 2)), "a".getBytes(), j * 2);
@@ -78,14 +78,14 @@ public class TimeSortTest extends CleanupHelper
 
         // interleave some new data to test memtable + sstable
         String key = "900";
-        RowMutation rm = new RowMutation("Table1", key);
+        RowMutation rm = new RowMutation("Keyspace1", key);
         for (int j = 0; j < 4; ++j)
         {
             rm.add(new QueryPath("StandardLong1", null, getBytes(j * 2 + 1)), "b".getBytes(), j * 2 + 1);
         }
         rm.apply();
         // and some overwrites
-        rm = new RowMutation("Table1", key);
+        rm = new RowMutation("Keyspace1", key);
         rm.add(new QueryPath("StandardLong1", null, getBytes(0)), "c".getBytes(), 100);
         rm.add(new QueryPath("StandardLong1", null, getBytes(10)), "c".getBytes(), 100);
         rm.apply();
diff --git a/test/unit/org/apache/cassandra/service/CassandraServerTest.java b/test/unit/org/apache/cassandra/service/CassandraServerTest.java
index 4e4308fcc0..3a6de251ea 100644
--- a/test/unit/org/apache/cassandra/service/CassandraServerTest.java
+++ b/test/unit/org/apache/cassandra/service/CassandraServerTest.java
@@ -40,17 +40,17 @@ public class CassandraServerTest extends CleanupHelper
             cfmap.put("Standard1", columns);
             cfmap.put("Standard2", columns);
 
-            BatchMutation m = new BatchMutation("Table1", "key1", cfmap);
+            BatchMutation m = new BatchMutation("Keyspace1", "key1", cfmap);
             server.batch_insert(m, 1);
 
             Column column;
-            column = server.get_column("Table1", "key1", "Standard1:c2");
+            column = server.get_column("Keyspace1", "key1", "Standard1:c2");
             assert column.value.equals("0");
 
-            column = server.get_column("Table1", "key1", "Standard2:c2");
+            column = server.get_column("Keyspace1", "key1", "Standard2:c2");
             assert column.value.equals("0");
 
-            ArrayList<Column> Columns = server.get_slice_strong("Table1", "key1", "Standard1", -1, -1);
+            ArrayList<Column> Columns = server.get_slice_strong("Keyspace1", "key1", "Standard1", -1, -1);
             assert Columns.size() == 2;
         } finally {
             server.shutdown();