diff --git a/switchapi/es2k/CMakeLists.txt b/switchapi/es2k/CMakeLists.txt
index 0882f9d..8211098 100644
--- a/switchapi/es2k/CMakeLists.txt
+++ b/switchapi/es2k/CMakeLists.txt
@@ -16,6 +16,8 @@ target_sources(switchapi_o PRIVATE
   switch_pd_fdb.c
   switch_pd_lag.h
   switch_pd_p4_name_mapping.h
+  switch_pd_p4_name_routing.h
+  switch_pd_routing.h
   switch_pd_tunnel.c
   switch_pd_utils.c
   switch_pd_utils.h
diff --git a/switchapi/es2k/lnw_v2/CMakeLists.txt b/switchapi/es2k/lnw_v2/CMakeLists.txt
index 30952a2..c8d640c 100644
--- a/switchapi/es2k/lnw_v2/CMakeLists.txt
+++ b/switchapi/es2k/lnw_v2/CMakeLists.txt
@@ -9,6 +9,5 @@ target_sources(switchapi_o PRIVATE
   lnw_nexthop_table.h
   switch_pd_lag.c
   switch_pd_lag.h
-  switch_pd_p4_name_routing.h
   switch_pd_routing.c
 )
diff --git a/switchapi/es2k/lnw_v2/switch_pd_lag.c b/switchapi/es2k/lnw_v2/switch_pd_lag.c
index 83510ad..596ba34 100644
--- a/switchapi/es2k/lnw_v2/switch_pd_lag.c
+++ b/switchapi/es2k/lnw_v2/switch_pd_lag.c
@@ -18,6 +18,7 @@
 #include "switch_pd_lag.h"
 
 #include "switchapi/es2k/switch_pd_p4_name_mapping.h"
+#include "switchapi/es2k/switch_pd_p4_name_routing.h"
 #include "switchapi/es2k/switch_pd_utils.h"
 #include "switchapi/switch_internal.h"
 #include "switchapi/switch_lag.h"
diff --git a/switchapi/es2k/lnw_v2/switch_pd_routing.c b/switchapi/es2k/lnw_v2/switch_pd_routing.c
index d8f36a5..9bd6746 100644
--- a/switchapi/es2k/lnw_v2/switch_pd_routing.c
+++ b/switchapi/es2k/lnw_v2/switch_pd_routing.c
@@ -22,6 +22,7 @@
 #include "switchapi/es2k/lnw_v2/lnw_neighbor_mod_table.h"
 #include "switchapi/es2k/lnw_v2/lnw_nexthop_table.h"
 #include "switchapi/es2k/switch_pd_p4_name_mapping.h"
+#include "switchapi/es2k/switch_pd_p4_name_routing.h"
 #include "switchapi/es2k/switch_pd_utils.h"
 #include "switchapi/switch_base_types.h"
 #include "switchapi/switch_internal.h"
diff --git a/switchapi/es2k/lnw_v3/CMakeLists.txt b/switchapi/es2k/lnw_v3/CMakeLists.txt
index 0f56a50..5111b20 100644
--- a/switchapi/es2k/lnw_v3/CMakeLists.txt
+++ b/switchapi/es2k/lnw_v3/CMakeLists.txt
@@ -9,6 +9,5 @@ target_sources(switchapi_o PRIVATE
   lnw_nexthop_table.h
   switch_pd_lag.c
   switch_pd_lag.h
-  switch_pd_p4_name_routing.h
   switch_pd_routing.c
 )
diff --git a/switchapi/es2k/lnw_v3/switch_pd_lag.c b/switchapi/es2k/lnw_v3/switch_pd_lag.c
index 2f79c68..bd29361 100644
--- a/switchapi/es2k/lnw_v3/switch_pd_lag.c
+++ b/switchapi/es2k/lnw_v3/switch_pd_lag.c
@@ -18,6 +18,7 @@
 #include "switch_pd_lag.h"
 
 #include "switchapi/es2k/switch_pd_p4_name_mapping.h"
+#include "switchapi/es2k/switch_pd_p4_name_routing.h"
 #include "switchapi/es2k/switch_pd_utils.h"
 #include "switchapi/switch_internal.h"
 #include "switchapi/switch_lag.h"
diff --git a/switchapi/es2k/lnw_v3/switch_pd_p4_name_routing.h b/switchapi/es2k/lnw_v3/switch_pd_p4_name_routing.h
deleted file mode 100644
index d808ff2..0000000
--- a/switchapi/es2k/lnw_v3/switch_pd_p4_name_routing.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright (c) 2013-2021 Barefoot Networks, Inc.
- * Copyright 2022-2024 Intel Corporation.
- * SPDX-License-Identifier: Apache-2.0
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __SWITCH_PD_P4_NAME_ROUTING_MAPPING__
-#define __SWITCH_PD_P4_NAME_ROUTING_MAPPING__
-
-#define LNW_KEY_MATCH_PRIORITY "$MATCH_PRIORITY"
-/* List of tables and corresponding actions */
-
-/* RIF_MOD_TABLE */
-// Verified for ES2K - 3 tables instead of 1
-#define LNW_RIF_MOD_TABLE_START "linux_networking_control.rif_mod_table_start"
-
-#define LNW_RIF_MOD_TABLE_START_KEY_RIF_MOD_MAP_ID0 "rif_mod_map_id0"
-
-#define LNW_RIF_MOD_TABLE_START_ACTION_SET_SRC_MAC_START \
-  "linux_networking_control.set_src_mac_start"
-
-#define LNW_RIF_MOD_TABLE_MID "linux_networking_control.rif_mod_table_mid"
-
-#define LNW_RIF_MOD_TABLE_MID_KEY_RIF_MOD_MAP_ID1 "rif_mod_map_id1"
-
-#define LNW_RIF_MOD_TABLE_MID_ACTION_SET_SRC_MAC_MID \
-  "linux_networking_control.set_src_mac_mid"
-
-#define LNW_RIF_MOD_TABLE_LAST "linux_networking_control.rif_mod_table_last"
-
-#define LNW_RIF_MOD_TABLE_LAST_KEY_RIF_MOD_MAP_ID2 "rif_mod_map_id2"
-
-#define LNW_RIF_MOD_TABLE_LAST_ACTION_SET_SRC_MAC_LAST \
-  "linux_networking_control.set_src_mac_last"
-
-#define LNW_ACTION_SET_SRC_MAC_PARAM_SRC_MAC_ADDR "arg"
-
-/* RX_LAG_TABLE */
-#define LNW_RX_LAG_TABLE "linux_networking_control.rx_lag_table"
-
-#define LNW_RX_LAG_TABLE_KEY_PORT_ID "vmeta.common.port_id"
-#define LNW_RX_LAG_TABLE_KEY_LAG_ID "user_meta.cmeta.lag_group_id"
-
-#define LNW_RX_LAG_TABLE_ACTION_FWD_TO_VSI "linux_networking_control.fwd_to_vsi"
-#define LNW_ACTION_FWD_TO_VSI_PARAM_PORT "port"
-
-/* TX_LAG_TABLE */
-#define LNW_TX_LAG_TABLE "linux_networking_control.tx_lag_table"
-
-#define LNW_TX_LAG_TABLE_KEY_LAG_ID "user_meta.cmeta.lag_group_id"
-#define LNW_TX_LAG_TABLE_KEY_VMETA_COMMON_HASH "hash"
-
-#define LNW_TX_LAG_TABLE_ACTION_SET_EGRESS_PORT \
-  "linux_networking_control.set_egress_port"
-
-#define ACTION_SET_EGRESS_PORT_PARAM_EGRESS_PORT "egress_port"
-
-#define LNW_LAG_HASH_SIZE 65536
-
-/* Only 3 bits is allocated for hash size per group in LNW.p4
- * check LNW_TX_LAG_TABLE_KEY_VMETA_COMMON_HASH */
-#define LNW_LAG_PER_GROUP_HASH_SIZE 8
-
-/* IPV4_TABLE */
-#define LNW_IPV4_TABLE "linux_networking_control.ipv4_table"
-
-// TODO_LNW_ES2K: One additional key for ES2K(ipv4_table has 2 keys for ES2K)
-#define LNW_IPV4_TABLE_KEY_IPV4_TABLE_LPM_ROOT "ipv4_table_lpm_root"
-
-#define LNW_IPV4_TABLE_KEY_IPV4_DST_MATCH "ipv4_dst_match"
-
-#define LNW_IPV4_TABLE_ACTION_IPV4_SET_NEXTHOP_ID \
-  "linux_networking_control.ipv4_set_nexthop_id"
-#define LNW_ACTION_SET_NEXTHOP_ID_PARAM_NEXTHOP_ID "nexthop_id"
-
-#define LNW_IPV4_TABLE_ACTION_IPV4_SET_NEXTHOP_ID_WITH_MIRROR \
-  "linux_networking_control.ipv4_set_nexthop_id_with_mirror"
-
-#define LNW_IPV4_TABLE_ACTION_ECMP_HASH_ACTION \
-  "linux_networking_control.ecmp_hash_action"
-#define LNW_ACTION_ECMP_HASH_ACTION_PARAM_ECMP_GROUP_ID "ecmp_group_id"
-
-/* IPV6_TABLE */
-#define LNW_IPV6_TABLE "linux_networking_control.ipv6_table"
-
-// TODO_LNW_ES2K: One additional key for ES2K(ipv6_table has 2 keys for ES2K)
-#define LNW_IPV6_TABLE_KEY_IPV6_TABLE_LPM_ROOT "ipv6_table_lpm_root"
-
-#define LNW_IPV6_TABLE_KEY_IPV6_DST_MATCH "ipv6_dst_match"
-
-#define LNW_IPV6_TABLE_ACTION_IPV6_SET_NEXTHOP_ID \
-  "linux_networking_control.ipv6_set_nexthop_id"
-
-#define LNW_IPV6_TABLE_ACTION_IPV6_SET_NEXTHOP_ID_WITH_MIRROR \
-  "linux_networking_control.ipv6_set_nexthop_id_with_mirror"
-
-#define LNW_IPV6_TABLE_ACTION_ECMP_V6_HASH_ACTION \
-  "linux_networking_control.ecmp_v6_hash_action"
-
-#endif /* __SWITCH_PD_P4_NAME_ROUTING_MAPPING__ */
diff --git a/switchapi/es2k/lnw_v3/switch_pd_routing.c b/switchapi/es2k/lnw_v3/switch_pd_routing.c
index 1799a55..72c3be2 100644
--- a/switchapi/es2k/lnw_v3/switch_pd_routing.c
+++ b/switchapi/es2k/lnw_v3/switch_pd_routing.c
@@ -22,6 +22,7 @@
 #include "switchapi/es2k/lnw_v3/lnw_ecmp_nexthop_table.h"
 #include "switchapi/es2k/lnw_v3/lnw_nexthop_table.h"
 #include "switchapi/es2k/switch_pd_p4_name_mapping.h"
+#include "switchapi/es2k/switch_pd_p4_name_routing.h"
 #include "switchapi/es2k/switch_pd_utils.h"
 #include "switchapi/switch_base_types.h"
 #include "switchapi/switch_internal.h"
diff --git a/switchapi/es2k/lnw_v2/switch_pd_p4_name_routing.h b/switchapi/es2k/switch_pd_p4_name_routing.h
similarity index 96%
rename from switchapi/es2k/lnw_v2/switch_pd_p4_name_routing.h
rename to switchapi/es2k/switch_pd_p4_name_routing.h
index d808ff2..3e069dd 100644
--- a/switchapi/es2k/lnw_v2/switch_pd_p4_name_routing.h
+++ b/switchapi/es2k/switch_pd_p4_name_routing.h
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
-#ifndef __SWITCH_PD_P4_NAME_ROUTING_MAPPING__
-#define __SWITCH_PD_P4_NAME_ROUTING_MAPPING__
+#ifndef __SWITCH_PD_P4_NAME_ROUTING_H__
+#define __SWITCH_PD_P4_NAME_ROUTING_H__
 
 #define LNW_KEY_MATCH_PRIORITY "$MATCH_PRIORITY"
 /* List of tables and corresponding actions */
@@ -109,4 +109,4 @@
 #define LNW_IPV6_TABLE_ACTION_ECMP_V6_HASH_ACTION \
   "linux_networking_control.ecmp_v6_hash_action"
 
-#endif /* __SWITCH_PD_P4_NAME_ROUTING_MAPPING__ */
+#endif /* __SWITCH_PD_P4_NAME_ROUTING_H__ */
diff --git a/switchapi/es2k/switch_pd_routing.h b/switchapi/es2k/switch_pd_routing.h
index 6f18be5..bca28fb 100644
--- a/switchapi/es2k/switch_pd_routing.h
+++ b/switchapi/es2k/switch_pd_routing.h
@@ -19,14 +19,7 @@
 #ifndef __SWITCH_PD_ROUTING_H__
 #define __SWITCH_PD_ROUTING_H__
 
-#if defined(LNW_V2)
-#include "switchapi/es2k/lnw_v2/switch_pd_p4_name_routing.h"
-#elif defined(LNW_V3)
-#include "switchapi/es2k/lnw_v3/switch_pd_p4_name_routing.h"
-#else
-#error "ASSERT: Unknown LNW version!"
-#endif
-
+#include "switch_pd_p4_name_routing.h"
 #include "switchapi/switch_base_types.h"
 #include "switchapi/switch_handle.h"
 #include "switchapi/switch_l3.h"