diff --git a/CMakeLists.txt b/CMakeLists.txt
index 40da6b5..fbffed1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -80,7 +80,7 @@ ENDIF ( "${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" )
 
 #CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
 IF ( HAVE_STASIS )
-  ADD_LIBRARY(logstore requestDispatch.cpp simpleServer.cpp logserver.cpp logstore.cpp diskTreeComponent.cpp memTreeComponent.cpp datapage.cpp merger.cpp tuplemerger.cpp mergeStats.cpp mergeManager.cpp bloomFilter.c)
+  ADD_LIBRARY(logstore requestDispatch.cpp simpleServer.cpp logserver.cpp blsm.cpp diskTreeComponent.cpp memTreeComponent.cpp datapage.cpp merger.cpp tuplemerger.cpp mergeStats.cpp mergeManager.cpp bloomFilter.c)
 ENDIF ( HAVE_STASIS )
 
 ADD_LIBRARY(logstore_client tcpclient.cpp)
diff --git a/Makefile b/Makefile
index 5ca87f3..0ffa394 100644
--- a/Makefile
+++ b/Makefile
@@ -8,15 +8,15 @@ INC = -I ../stasis 							\
       -I ./sherpa
 
 LIBSRC = $(wildcard *.c) $(wildcard *.cpp)
-LIBNAME = logstore
+LIBNAME = blsm
 
 ifeq ($(shell uname),Linux)
 STATIC_LIBS= ../mapkeeper/thrift/gen-cpp/libmapkeeper.a	\
-	 -lrt sherpa/LSMServerHandler.cc bin/liblogstore.a		\
+	 -lrt sherpa/LSMServerHandler.cc bin/libblsm.a		\
 	../stasis/bin/libstasis.a
 else
 STATIC_LIBS= ./libstdc++.a ../mapkeeper/thrift/gen-cpp/libmapkeeper.a	\
-	 sherpa/LSMServerHandler.cc bin/liblogstore.a			\
+	 sherpa/LSMServerHandler.cc bin/libblsm.a			\
 	../stasis/bin/libstasis.a
 endif
 
diff --git a/logstore.cpp b/blsm.cpp
similarity index 99%
rename from logstore.cpp
rename to blsm.cpp
index d0be4a9..14c9d18 100644
--- a/logstore.cpp
+++ b/blsm.cpp
@@ -16,7 +16,7 @@
  * limitations under the License.
  *
  */
-#include "logstore.h"
+#include "blsm.h"
 #include "merger.h"
 
 #include <stasis/transactional.h>
diff --git a/logstore.h b/blsm.h
similarity index 100%
rename from logstore.h
rename to blsm.h
diff --git a/datapage.cpp b/datapage.cpp
index e967a70..b583228 100644
--- a/datapage.cpp
+++ b/datapage.cpp
@@ -17,7 +17,7 @@
  *
  *      Author: makdere
  */
-#include "logstore.h"
+#include "blsm.h"
 #include "datapage.h"
 #include "regionAllocator.h"
 
diff --git a/logserver.cpp b/logserver.cpp
index 7ba19ac..dfeb74c 100644
--- a/logserver.cpp
+++ b/logserver.cpp
@@ -22,7 +22,7 @@
 #include "datatuple.h"
 #include "merger.h"
 
-#include "logstore.h"
+#include "blsm.h"
 #include "requestDispatch.h"
 
 #include <sys/types.h> 
diff --git a/logserver.h b/logserver.h
index 3caec35..5d67c08 100644
--- a/logserver.h
+++ b/logserver.h
@@ -27,7 +27,7 @@
 #include <stasis/transactional.h>
 #include <pthread.h>
 
-#include "logstore.h"
+#include "blsm.h"
 
 #define STATS_ENABLED 1
 
diff --git a/main/newserver.cpp b/main/newserver.cpp
index 843b82e..d728f73 100644
--- a/main/newserver.cpp
+++ b/main/newserver.cpp
@@ -25,7 +25,7 @@
 
 
 #include "merger.h"
-#include "logstore.h"
+#include "blsm.h"
 #include "simpleServer.h"
 
 int main(int argc, char *argv[])
diff --git a/main/server.cpp b/main/server.cpp
index 060c196..1b84823 100644
--- a/main/server.cpp
+++ b/main/server.cpp
@@ -21,7 +21,7 @@
 #include <vector>
 #include <iostream>
 #include <sstream>
-#include "logstore.h"
+#include "blsm.h"
 #include "logserver.h"
 #include "datapage.h"
 #include "merger.h"
diff --git a/mergeManager.cpp b/mergeManager.cpp
index 4c4dba3..233209d 100644
--- a/mergeManager.cpp
+++ b/mergeManager.cpp
@@ -21,7 +21,7 @@
 
 #include "mergeManager.h"
 #include "mergeStats.h"
-#include "logstore.h"
+#include "blsm.h"
 #include "math.h"
 #include "time.h"
 #include <stasis/transactional.h>
diff --git a/mergeStats.cpp b/mergeStats.cpp
index f3fff03..6a7dbc1 100644
--- a/mergeStats.cpp
+++ b/mergeStats.cpp
@@ -20,7 +20,7 @@
  */
 
 #include "mergeStats.h"
-#include "logstore.h"
+#include "blsm.h"
 #include "datatuple.h"
 
 
diff --git a/merger.h b/merger.h
index ef55c22..81f28c7 100644
--- a/merger.h
+++ b/merger.h
@@ -19,7 +19,7 @@
 #ifndef _MERGER_H_
 #define _MERGER_H_
 
-#include "logstore.h"
+#include "blsm.h"
 
 #include <stasis/common.h>
 
diff --git a/requestDispatch.h b/requestDispatch.h
index ae65bb5..c36b528 100644
--- a/requestDispatch.h
+++ b/requestDispatch.h
@@ -9,7 +9,7 @@
 #define REQUESTDISPATCH_H_
 #include "network.h"
 #include "datatuple.h"
-#include "logstore.h"
+#include "blsm.h"
 template<class HANDLE>
 class requestDispatch {
 private:
diff --git a/sherpa/LSMServerHandler.cc b/sherpa/LSMServerHandler.cc
index ba43a11..02efdb9 100644
--- a/sherpa/LSMServerHandler.cc
+++ b/sherpa/LSMServerHandler.cc
@@ -23,7 +23,7 @@
 #include <iostream>
 #include <signal.h>
 #include "merger.h"
-#include "logstore.h"
+#include "blsm.h"
 #include "LSMServerHandler.h"
 
 int blind_update = 0; // updates check preimage by default.
diff --git a/sherpa/main/lsm_server.cc b/sherpa/main/lsm_server.cc
index aa4b3f9..f57d2c0 100644
--- a/sherpa/main/lsm_server.cc
+++ b/sherpa/main/lsm_server.cc
@@ -7,7 +7,7 @@
 #include <transport/TBufferTransports.h>
 #include <concurrency/ThreadManager.h>
 #include <concurrency/PosixThreadFactory.h>
-#include "logstore.h"
+#include "blsm.h"
 #include "datatuple.h"
 #include "LSMServerHandler.h"
 
diff --git a/simpleServer.h b/simpleServer.h
index 7ba59e6..aee8438 100644
--- a/simpleServer.h
+++ b/simpleServer.h
@@ -21,7 +21,7 @@
 
 #ifndef SIMPLESERVER_H_
 #define SIMPLESERVER_H_
-#include "logstore.h"
+#include "blsm.h"
 
 class simpleServer {
 public:
diff --git a/test/check_datapage.cpp b/test/check_datapage.cpp
index 596e6da..5608523 100644
--- a/test/check_datapage.cpp
+++ b/test/check_datapage.cpp
@@ -22,7 +22,7 @@
 #include <iostream>
 #include <sstream>
 #include <algorithm>
-#include <logstore.h>
+#include <blsm.h>
 #include <datapage.h>
 
 #include <assert.h>
diff --git a/test/check_gen.cpp b/test/check_gen.cpp
index 0b3f3d1..484631c 100644
--- a/test/check_gen.cpp
+++ b/test/check_gen.cpp
@@ -18,7 +18,7 @@
  *      Author: sears
  */
 #include <stasis/transactional.h>
-#include "logstore.h"
+#include "blsm.h"
 #include "regionAllocator.h"
 
 int main(int argc, char **argv)
diff --git a/test/check_logtable.cpp b/test/check_logtable.cpp
index 8ce37c1..c2efbeb 100644
--- a/test/check_logtable.cpp
+++ b/test/check_logtable.cpp
@@ -22,7 +22,7 @@
 #include <iostream>
 #include <sstream>
 #include <algorithm>
-#include "logstore.h"
+#include "blsm.h"
 #include "datapage.h"
 #include <assert.h>
 #include <limits.h>
diff --git a/test/check_logtree.cpp b/test/check_logtree.cpp
index 0ab0218..66b4a35 100644
--- a/test/check_logtree.cpp
+++ b/test/check_logtree.cpp
@@ -22,7 +22,7 @@
 #include <iostream>
 #include <algorithm>
 #include <sstream>
-#include "logstore.h"
+#include "blsm.h"
 #include "regionAllocator.h"
 #include "diskTreeComponent.h"
 
diff --git a/test/check_merge.cpp b/test/check_merge.cpp
index cbef2d0..de667ff 100644
--- a/test/check_merge.cpp
+++ b/test/check_merge.cpp
@@ -22,7 +22,7 @@
 #include <iostream>
 #include <sstream>
 #include <algorithm>
-#include "logstore.h"
+#include "blsm.h"
 #include "datapage.h"
 #include "merger.h"
 #include <assert.h>
diff --git a/test/check_mergelarge.cpp b/test/check_mergelarge.cpp
index 8d35c96..89461b6 100644
--- a/test/check_mergelarge.cpp
+++ b/test/check_mergelarge.cpp
@@ -22,7 +22,7 @@
 #include <iostream>
 #include <sstream>
 #include <algorithm>
-#include "logstore.h"
+#include "blsm.h"
 #include "datapage.h"
 #include "merger.h"
 #include <assert.h>
diff --git a/test/check_mergetuple.cpp b/test/check_mergetuple.cpp
index 5edced0..6cbbd2c 100644
--- a/test/check_mergetuple.cpp
+++ b/test/check_mergetuple.cpp
@@ -22,7 +22,7 @@
 #include <iostream>
 #include <sstream>
 #include <algorithm>
-#include "logstore.h"
+#include "blsm.h"
 #include "datapage.h"
 #include "merger.h"
 #include <assert.h>
diff --git a/test/check_rbtree.cpp b/test/check_rbtree.cpp
index 1c11b09..3b62f59 100644
--- a/test/check_rbtree.cpp
+++ b/test/check_rbtree.cpp
@@ -22,7 +22,7 @@
 #include <iostream>
 #include <sstream>
 #include <algorithm>
-#include "logstore.h"
+#include "blsm.h"
 #include "datapage.h"
 #include "merger.h"
 #include <assert.h>
diff --git a/tuplemerger.cpp b/tuplemerger.cpp
index b6e30fb..e4487eb 100644
--- a/tuplemerger.cpp
+++ b/tuplemerger.cpp
@@ -17,7 +17,7 @@
  *
  */
 #include "tuplemerger.h"
-#include "logstore.h"
+#include "blsm.h"
 
 // t2 is the newer tuple.
 // we return deletes here.  our caller decides what to do with them.