diff --git a/servers/mapkeeper/Makefile b/servers/mapkeeper/Makefile
index 8242c64..8dc751d 100644
--- a/servers/mapkeeper/Makefile
+++ b/servers/mapkeeper/Makefile
@@ -16,7 +16,7 @@ all: main/blsm_client main/blsm_server
 
 main/blsm_client :
 
-main/blsm_server : LSMServerHandler.cc
+main/blsm_server : blsmRequestHandler.cpp
 
 clean:
 	rm -f main/blsm_client main/blsm_server
diff --git a/servers/mapkeeper/LSMServerHandler.cc b/servers/mapkeeper/blsmRequestHandler.cpp
similarity index 99%
rename from servers/mapkeeper/LSMServerHandler.cc
rename to servers/mapkeeper/blsmRequestHandler.cpp
index 02efdb9..e965f7b 100644
--- a/servers/mapkeeper/LSMServerHandler.cc
+++ b/servers/mapkeeper/blsmRequestHandler.cpp
@@ -24,7 +24,7 @@
 #include <signal.h>
 #include "merger.h"
 #include "blsm.h"
-#include "LSMServerHandler.h"
+#include "blsmRequestHandler.h"
 
 int blind_update = 0; // updates check preimage by default.
 
diff --git a/servers/mapkeeper/LSMServerHandler.h b/servers/mapkeeper/blsmRequestHandler.h
similarity index 100%
rename from servers/mapkeeper/LSMServerHandler.h
rename to servers/mapkeeper/blsmRequestHandler.h
diff --git a/servers/mapkeeper/main/blsm_client.cc b/servers/mapkeeper/main/blsm_client.cpp
similarity index 100%
rename from servers/mapkeeper/main/blsm_client.cc
rename to servers/mapkeeper/main/blsm_client.cpp
diff --git a/servers/mapkeeper/main/blsm_server.cc b/servers/mapkeeper/main/blsm_server.cpp
similarity index 97%
rename from servers/mapkeeper/main/blsm_server.cc
rename to servers/mapkeeper/main/blsm_server.cpp
index f57d2c0..d466610 100644
--- a/servers/mapkeeper/main/blsm_server.cc
+++ b/servers/mapkeeper/main/blsm_server.cpp
@@ -9,7 +9,7 @@
 #include <concurrency/PosixThreadFactory.h>
 #include "blsm.h"
 #include "datatuple.h"
-#include "LSMServerHandler.h"
+#include "blsmRequestHandler.h"
 
 using namespace ::apache::thrift;
 using namespace ::apache::thrift::protocol;
diff --git a/servers/mapkeeper/main/Makefile b/y/Makefile2.y
similarity index 100%
rename from servers/mapkeeper/main/Makefile
rename to y/Makefile2.y