diff --git a/src/org/apache/cassandra/db/BinaryMemtable.java b/src/org/apache/cassandra/db/BinaryMemtable.java
index 558680bd7e..b39a6a9596 100644
--- a/src/org/apache/cassandra/db/BinaryMemtable.java
+++ b/src/org/apache/cassandra/db/BinaryMemtable.java
@@ -156,7 +156,7 @@ public class BinaryMemtable
             {            	
                 /* Now write the key and value to disk */
                 ssTable.append(key, bytes);
-                bf.fill(key);
+                bf.add(key);
             }
         }
         ssTable.close(bf);
diff --git a/src/org/apache/cassandra/db/ColumnFamilyStore.java b/src/org/apache/cassandra/db/ColumnFamilyStore.java
index fbfa0f8be0..e011efd9d1 100644
--- a/src/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/org/apache/cassandra/db/ColumnFamilyStore.java
@@ -1147,7 +1147,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
 	                        try
 	                        {
 		                        ssTableRange.append(lastkey, bufOut);
-		                        compactedRangeBloomFilter.fill(lastkey);                                
+		                        compactedRangeBloomFilter.add(lastkey);
 	                        }
 	                        catch(Exception ex)
 	                        {
@@ -1229,7 +1229,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
 
     private void doFill(BloomFilter bf, String decoratedKey)
     {
-        bf.fill(StorageService.getPartitioner().undecorateKey(decoratedKey));
+        bf.add(StorageService.getPartitioner().undecorateKey(decoratedKey));
     }
     
     /*
diff --git a/src/org/apache/cassandra/db/ColumnIndexer.java b/src/org/apache/cassandra/db/ColumnIndexer.java
index 42dc26d725..d08da7e168 100644
--- a/src/org/apache/cassandra/db/ColumnIndexer.java
+++ b/src/org/apache/cassandra/db/ColumnIndexer.java
@@ -24,13 +24,10 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-import org.apache.cassandra.config.CFMetaData;
 import org.apache.cassandra.config.DatabaseDescriptor;
 import org.apache.cassandra.io.DataOutputBuffer;
 import org.apache.cassandra.io.IndexHelper;
-import org.apache.cassandra.io.SSTable.KeyPositionInfo;
 import org.apache.cassandra.utils.BloomFilter;
-import org.apache.cassandra.utils.FBUtilities;
 
 
 /**
@@ -81,14 +78,14 @@ public class ColumnIndexer
         BloomFilter bf = new BloomFilter(columnCount, 4);
         for ( IColumn column : columns )
         {
-            bf.fill(column.name());
+            bf.add(column.name());
             /* If this is SuperColumn type Column Family we need to get the subColumns too. */
             if ( column instanceof SuperColumn )
             {
                 Collection<IColumn> subColumns = column.getSubColumns();
                 for ( IColumn subColumn : subColumns )
                 {
-                    bf.fill(subColumn.name());
+                    bf.add(subColumn.name());
                 }
             }
         }
diff --git a/src/org/apache/cassandra/db/Memtable.java b/src/org/apache/cassandra/db/Memtable.java
index bfa4738098..3954e97bf1 100644
--- a/src/org/apache/cassandra/db/Memtable.java
+++ b/src/org/apache/cassandra/db/Memtable.java
@@ -398,7 +398,7 @@ public class Memtable implements Comparable<Memtable>
                 ColumnFamily.serializerWithIndexes().serialize( columnFamily, buffer );
                 /* Now write the key and value to disk */
                 ssTable.append(partitioner.decorateKey(key), buffer);
-                bf.fill(key);
+                bf.add(key);
                 columnFamily.clear();
             }
         }
diff --git a/src/org/apache/cassandra/test/SSTableTest.java b/src/org/apache/cassandra/test/SSTableTest.java
index e58c1f2ed1..718a44cba5 100644
--- a/src/org/apache/cassandra/test/SSTableTest.java
+++ b/src/org/apache/cassandra/test/SSTableTest.java
@@ -52,7 +52,7 @@ public class SSTableTest
             cf.addColumn("C", "Avinash Lakshman is a good man".getBytes(), i);
             ColumnFamily.serializerWithIndexes().serialize(cf, bufOut);
             ssTable.append(key, bufOut);            
-            bf.fill(key);
+            bf.add(key);
         }
         ssTable.close(bf);
     }
@@ -87,7 +87,7 @@ public class SSTableTest
         BloomFilter bf = new BloomFilter(1024*1024, 15);
         for ( int i = 0; i < 1024*1024; ++i )
         {
-            bf.fill(Integer.toString(i));
+            bf.add(Integer.toString(i));
         }
         
         DataOutputBuffer bufOut = new DataOutputBuffer();
diff --git a/src/org/apache/cassandra/tools/IndexBuilder.java b/src/org/apache/cassandra/tools/IndexBuilder.java
index 753e16de48..e9fbc0793d 100644
--- a/src/org/apache/cassandra/tools/IndexBuilder.java
+++ b/src/org/apache/cassandra/tools/IndexBuilder.java
@@ -29,9 +29,6 @@ import org.apache.cassandra.io.SequenceFile;
 import org.apache.cassandra.utils.BasicUtilities;
 import org.apache.cassandra.utils.BloomFilter;
 
-import org.apache.cassandra.io.*;
-import org.apache.cassandra.utils.*;
-
 public class IndexBuilder
 {
     private static final int bufferSize_ = 64*1024;
@@ -126,7 +123,7 @@ public class IndexBuilder
                     for ( int i = 0; i < blockSize; ++i )
                     {
                         String currentKey = bufIn.readUTF();
-                        bf.fill(currentKey);
+                        bf.add(currentKey);
                         if ( largestKey == null )
                         {
                             largestKey = currentKey;
diff --git a/src/org/apache/cassandra/tools/ThreadListBuilder.java b/src/org/apache/cassandra/tools/ThreadListBuilder.java
index 48bfe16f5e..a52a53c8b1 100644
--- a/src/org/apache/cassandra/tools/ThreadListBuilder.java
+++ b/src/org/apache/cassandra/tools/ThreadListBuilder.java
@@ -21,7 +21,6 @@ package org.apache.cassandra.tools;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.InputStreamReader;
 import java.io.RandomAccessFile;
 import java.util.ArrayList;
@@ -69,7 +68,7 @@ public class ThreadListBuilder
                     bf = new BloomFilter(count_, 8);
                 }
                 line = line.trim();                
-                bf.fill(line);
+                bf.add(line);
                 ++keyCount;
             }
         }
diff --git a/src/org/apache/cassandra/utils/BloomFilter.java b/src/org/apache/cassandra/utils/BloomFilter.java
index 32e3d9a1eb..6d8e2a8736 100644
--- a/src/org/apache/cassandra/utils/BloomFilter.java
+++ b/src/org/apache/cassandra/utils/BloomFilter.java
@@ -142,7 +142,7 @@ public class BloomFilter implements Serializable
      the filter_.
      This is a general purpose API.
      */
-    public void fill(String key)
+    public void add(String key)
     {
         for (int i = 0; i < hashes_; ++i)
         {