diff --git a/lib/src/asn1/CMakeLists.txt b/lib/src/asn1/CMakeLists.txt
index 566ed56c8..f358a97af 100644
--- a/lib/src/asn1/CMakeLists.txt
+++ b/lib/src/asn1/CMakeLists.txt
@@ -67,7 +67,7 @@ target_compile_options(nas_5g_msg PRIVATE "-Os")
 target_link_libraries(nas_5g_msg asn1_utils srsran_common)
 install(TARGETS nas_5g_msg DESTINATION ${LIBRARY_DIR} OPTIONAL)
 ## ORAN E2 RIC
-add_library(ric_e2 STATIC e2sm_kpm.cpp e2ap.cpp e2sm.cpp)
+add_library(ric_e2 STATIC e2sm_kpm_v2.cpp e2ap.cpp e2sm.cpp)
 target_compile_options(ric_e2 PRIVATE "-Os")
 target_link_libraries(ric_e2 asn1_utils srsran_common)
 install(TARGETS ric_e2 DESTINATION ${LIBRARY_DIR} OPTIONAL)
diff --git a/lib/src/asn1/e2sm_kpm_v2.cpp b/lib/src/asn1/e2sm_kpm_v2.cpp
index 8751cf43a..387b5448d 100644
--- a/lib/src/asn1/e2sm_kpm_v2.cpp
+++ b/lib/src/asn1/e2sm_kpm_v2.cpp
@@ -8,7 +8,7 @@
  *
  */
 
-#include "srsran/asn1/e2sm_kpm.h"
+#include "srsran/asn1/e2sm_kpm_v2.h"
 #include <sstream>
 
 using namespace asn1;
diff --git a/srsgnb/hdr/stack/ric/e2ap.h b/srsgnb/hdr/stack/ric/e2ap.h
index 4e0612650..a6b73091f 100644
--- a/srsgnb/hdr/stack/ric/e2ap.h
+++ b/srsgnb/hdr/stack/ric/e2ap.h
@@ -13,7 +13,7 @@
 
 #include "e2sm_kpm.h"
 #include "srsran/asn1/e2ap.h"
-#include "srsran/asn1/e2sm_kpm.h"
+#include "srsran/asn1/e2sm_kpm_v2.h"
 #include "srsran/interfaces/e2_metrics_interface.h"
 #include "srsran/interfaces/enb_metrics_interface.h"
 #include "srsran/srsran.h"
diff --git a/srsgnb/hdr/stack/ric/e2sm_kpm.h b/srsgnb/hdr/stack/ric/e2sm_kpm.h
index 40da47c33..c2c5c6b2b 100644
--- a/srsgnb/hdr/stack/ric/e2sm_kpm.h
+++ b/srsgnb/hdr/stack/ric/e2sm_kpm.h
@@ -11,7 +11,7 @@
  *
  */
 #include "srsran/asn1/e2sm.h"
-#include "srsran/asn1/e2sm_kpm.h"
+#include "srsran/asn1/e2sm_kpm_v2.h"
 #include "srsran/srsran.h"
 
 #ifndef RIC_E2SM_KPM_H