diff --git a/src/Service/KeeperServer.cpp b/src/Service/KeeperServer.cpp
index 4a7ca346261..34447322f21 100644
--- a/src/Service/KeeperServer.cpp
+++ b/src/Service/KeeperServer.cpp
@@ -1,14 +1,17 @@
 #include <chrono>
 #include <string>
+
+#include <Poco/NumberFormatter.h>
+
+#include <Common/Stopwatch.h>
+#include <libnuraft/async.hxx>
+
 #include <Service/KeeperServer.h>
 #include <Service/LoggerWrapper.h>
 #include <Service/NuRaftStateMachine.h>
 #include <Service/NuRaftStateManager.h>
-#include <Service/ReadBufferFromNuraftBuffer.h>
+#include <Service/ReadBufferFromNuRaftBuffer.h>
 #include <ZooKeeper/ZooKeeperIO.h>
-#include <libnuraft/async.hxx>
-#include <Poco/NumberFormatter.h>
-#include <Common/Stopwatch.h>
 
 namespace RK
 {
@@ -205,7 +208,7 @@ bool KeeperServer::updateSessionTimeout(int64_t session_id, int64_t session_time
     if (!result->get())
         throw Exception(ErrorCodes::RAFT_ERROR, "Received nullptr when updating session timeout");
 
-    auto buffer = ReadBufferFromNuraftBuffer(*result->get());
+    auto buffer = ReadBufferFromNuRaftBuffer(*result->get());
     int8_t is_success;
     Coordination::read(is_success, buffer);
 
diff --git a/src/Service/NuRaftLogSnapshot.cpp b/src/Service/NuRaftLogSnapshot.cpp
index ba3f04a0398..77bae3b2e0f 100644
--- a/src/Service/NuRaftLogSnapshot.cpp
+++ b/src/Service/NuRaftLogSnapshot.cpp
@@ -17,7 +17,7 @@
 
 #include <Service/KeeperUtils.h>
 #include <Service/NuRaftLogSnapshot.h>
-#include <Service/ReadBufferFromNuraftBuffer.h>
+#include <Service/ReadBufferFromNuRaftBuffer.h>
 #include <Service/WriteBufferFromNuraftBuffer.h>
 #include <ZooKeeper/ZooKeeperIO.h>
 
@@ -710,7 +710,7 @@ bool KeeperSnapshotStore::parseObject(String obj_path, KeeperStore & store)
                     //buf->put(data.data(), data.size());
                     buf->put(data);
                     buf->pos(0);
-                    ReadBufferFromNuraftBuffer in(buf);
+                    ReadBufferFromNuRaftBuffer in(buf);
                     ptr<KeeperNode> node = cs_new<KeeperNode>();
                     String key;
                     try
@@ -778,7 +778,7 @@ bool KeeperSnapshotStore::parseObject(String obj_path, KeeperStore & store)
                     ptr<buffer> buf = buffer::alloc(data.size() + 1);
                     buf->put(data);
                     buf->pos(0);
-                    ReadBufferFromNuraftBuffer in(buf);
+                    ReadBufferFromNuRaftBuffer in(buf);
                     int64_t session_id;
                     int64_t timeout;
                     try
@@ -823,7 +823,7 @@ bool KeeperSnapshotStore::parseObject(String obj_path, KeeperStore & store)
                         ptr<buffer> buf = buffer::alloc(data.size() + 1);
                         buf->put(data);
                         buf->pos(0);
-                        ReadBufferFromNuraftBuffer in(buf);
+                        ReadBufferFromNuRaftBuffer in(buf);
 
                         uint64_t acl_id;
                         Coordination::ACLs acls;
@@ -845,7 +845,7 @@ bool KeeperSnapshotStore::parseObject(String obj_path, KeeperStore & store)
                     ptr<buffer> buf = buffer::alloc(data.size() + 1);
                     buf->put(data);
                     buf->pos(0);
-                    ReadBufferFromNuraftBuffer in(buf);
+                    ReadBufferFromNuRaftBuffer in(buf);
                     String key;
                     int64_t value;
                     try
diff --git a/src/Service/NuRaftStateMachine.cpp b/src/Service/NuRaftStateMachine.cpp
index 06d9995546a..89de1d379f5 100644
--- a/src/Service/NuRaftStateMachine.cpp
+++ b/src/Service/NuRaftStateMachine.cpp
@@ -9,7 +9,7 @@
 
 #include <Service/NuRaftFileLogStore.h>
 #include <Service/NuRaftStateMachine.h>
-#include <Service/ReadBufferFromNuraftBuffer.h>
+#include <Service/ReadBufferFromNuRaftBuffer.h>
 #include <Service/RequestProcessor.h>
 #include <Service/ThreadSafeQueue.h>
 #include <Service/WriteBufferFromNuraftBuffer.h>
@@ -104,7 +104,7 @@ ptr<RequestForSession> NuRaftStateMachine::createRequestSession(ptr<log_entry> &
     if (entry->get_val_type() != nuraft::log_val_type::app_log)
         return nullptr;
 
-    ReadBufferFromNuraftBuffer buffer(entry->get_buf());
+    ReadBufferFromNuRaftBuffer buffer(entry->get_buf());
     ptr<RequestForSession> request_for_session = cs_new<RequestForSession>();
 
     readIntBinary(request_for_session->session_id, buffer);
@@ -178,7 +178,7 @@ void NuRaftStateMachine::snapThread()
 
 RequestForSession NuRaftStateMachine::parseRequest(nuraft::buffer & data)
 {
-    ReadBufferFromNuraftBuffer buffer(data);
+    ReadBufferFromNuRaftBuffer buffer(data);
     RequestForSession request_for_session;
     /// TODO unify digital encoding mode
     readIntBinary(request_for_session.session_id, buffer);
diff --git a/src/Service/ReadBufferFromNuraftBuffer.h b/src/Service/ReadBufferFromNuRaftBuffer.h
similarity index 59%
rename from src/Service/ReadBufferFromNuraftBuffer.h
rename to src/Service/ReadBufferFromNuRaftBuffer.h
index 29fc7961823..96ebe9461b8 100644
--- a/src/Service/ReadBufferFromNuraftBuffer.h
+++ b/src/Service/ReadBufferFromNuRaftBuffer.h
@@ -6,11 +6,11 @@
 namespace RK
 {
 
-class ReadBufferFromNuraftBuffer : public ReadBufferFromMemory
+class ReadBufferFromNuRaftBuffer : public ReadBufferFromMemory
 {
 public:
-    explicit ReadBufferFromNuraftBuffer(nuraft::ptr<nuraft::buffer> buffer) : ReadBufferFromMemory(buffer->data_begin(), buffer->size()) { }
-    explicit ReadBufferFromNuraftBuffer(nuraft::buffer & buffer) : ReadBufferFromMemory(buffer.data_begin(), buffer.size()) { }
+    explicit ReadBufferFromNuRaftBuffer(nuraft::ptr<nuraft::buffer> buffer) : ReadBufferFromMemory(buffer->data_begin(), buffer->size()) { }
+    explicit ReadBufferFromNuRaftBuffer(nuraft::buffer & buffer) : ReadBufferFromMemory(buffer.data_begin(), buffer.size()) { }
 };
 
 }