diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 0615b91df543890745e5aeb9f5f687aaead81ae8..a3da6a740948958190273e4526f997a6872a0cb1 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -44,6 +44,10 @@ target_link_libraries(dummy ${PLUGIN_NAME})
 
 # ------- First Core classes ----------
 
+# BufferFrame
+wolf_add_gtest(gtest_buffer_frame gtest_buffer_frame.cpp)
+target_link_libraries(gtest_buffer_frame ${PLUGIN_NAME} dummy)
+
 # CaptureBase class test
 wolf_add_gtest(gtest_capture_base gtest_capture_base.cpp)
 target_link_libraries(gtest_capture_base ${PLUGIN_NAME})
@@ -104,10 +108,6 @@ target_link_libraries(gtest_logging ${PLUGIN_NAME})
 wolf_add_gtest(gtest_motion_buffer gtest_motion_buffer.cpp)
 target_link_libraries(gtest_motion_buffer ${PLUGIN_NAME})
 
-# PackKFBuffer
-wolf_add_gtest(gtest_pack_KF_buffer gtest_pack_KF_buffer.cpp)
-target_link_libraries(gtest_pack_KF_buffer ${PLUGIN_NAME} dummy)
-
 # Parameters server
 wolf_add_gtest(gtest_param_server gtest_param_server.cpp ${CMAKE_CURRENT_LIST_DIR})
 target_link_libraries(gtest_param_server ${PLUGIN_NAME})
diff --git a/test/gtest_pack_KF_buffer.cpp b/test/gtest_buffer_frame.cpp
similarity index 99%
rename from test/gtest_pack_KF_buffer.cpp
rename to test/gtest_buffer_frame.cpp
index d8c41241a477e05195d023b1de147e48682bd467..a6b63cf2b677f58d5051936cc7b247211f5a3ef2 100644
--- a/test/gtest_pack_KF_buffer.cpp
+++ b/test/gtest_buffer_frame.cpp
@@ -20,7 +20,7 @@
 //
 //--------LICENSE_END--------
 /*
- * gtest_pack_KF_buffer.cpp
+ * gtest_buffer_frame.cpp
  *
  *  Created on: Mar 5, 2018
  *      Author: jsola
@@ -94,7 +94,7 @@ TEST_F(BufferFrameTest, clear)
     ASSERT_TRUE(buffer_kf.empty());
 }
 
-//TEST_F(BufferPackKeyFrameTest, print)
+//TEST_F(BufferFrameTest, print)
 //{
 //    kfpackbuffer.clear();
 //    kfpackbuffer.add(f10, tt10);