diff --git a/libraries/base/common/src/vhdl/common_network_layers_pkg.vhd b/libraries/base/common/src/vhdl/common_network_layers_pkg.vhd
index c835020efd35ae0699d47e5c740bdf9ae68af782..e1a39d1818f73a2edcff94cdf628462bb47b721c 100644
--- a/libraries/base/common/src/vhdl/common_network_layers_pkg.vhd
+++ b/libraries/base/common/src/vhdl/common_network_layers_pkg.vhd
@@ -26,7 +26,7 @@ USE IEEE.numeric_std.ALL;
 USE common_lib.common_pkg.ALL;
 
 
-PACKAGE eth_layers_pkg IS
+PACKAGE common_network_layers_pkg IS
 
   -- All *_len constants are in nof octets = nof bytes
   CONSTANT c_8                     : NATURAL := c_octet_w;  -- = 8
@@ -445,10 +445,10 @@ PACKAGE eth_layers_pkg IS
   FUNCTION func_eth_icmp_response_header(icmp : t_eth_total_header_arr; mac_addr : STD_LOGIC_VECTOR(c_eth_mac_addr_w-1 DOWNTO 0)) RETURN t_eth_total_header_arr;
   FUNCTION func_eth_udp_response_header( udp  : t_eth_total_header_arr; mac_addr : STD_LOGIC_VECTOR(c_eth_mac_addr_w-1 DOWNTO 0)) RETURN t_eth_total_header_arr;
   
-END eth_layers_pkg;
+END common_network_layers_pkg;
 
 
-PACKAGE BODY eth_layers_pkg IS
+PACKAGE BODY common_network_layers_pkg IS
 
   ------------------------------------------------------------------------------
   -- Total Ethernet Header
@@ -736,4 +736,4 @@ PACKAGE BODY eth_layers_pkg IS
     RETURN v_response;
   END;
   
-END eth_layers_pkg;
+END common_network_layers_pkg;
diff --git a/libraries/io/eth/src/vhdl/eth.vhd b/libraries/io/eth/src/vhdl/eth.vhd
index b9378d07df959594d9f14a6883a2d0429d99c8b8..41199495c1cfd74b367837908891f8ff212ad539 100644
--- a/libraries/io/eth/src/vhdl/eth.vhd
+++ b/libraries/io/eth/src/vhdl/eth.vhd
@@ -25,7 +25,7 @@ USE IEEE.std_logic_1164.ALL;
 USE common_lib.common_pkg.ALL;
 USE common_lib.common_mem_pkg.ALL;
 USE dp_lib.dp_stream_pkg.ALL;
-USE common_lib.eth_layers_pkg.ALL;
+USE common_lib.common_network_layers_pkg.ALL;
 USE tech_tse_lib.tech_tse_pkg.ALL;
 USE work.eth_pkg.ALL;
 USE technology_lib.technology_select_pkg.ALL;
diff --git a/libraries/io/eth/src/vhdl/eth_control.vhd b/libraries/io/eth/src/vhdl/eth_control.vhd
index 912840e7f78ed2d4c1232ef36f56d641e01b86f9..1f42b2725b711a4c364bfe55fa188455e1598f28 100644
--- a/libraries/io/eth/src/vhdl/eth_control.vhd
+++ b/libraries/io/eth/src/vhdl/eth_control.vhd
@@ -26,7 +26,7 @@ USE IEEE.numeric_std.ALL;
 USE common_lib.common_pkg.ALL;
 USE common_lib.common_mem_pkg.ALL;
 USE dp_lib.dp_stream_pkg.ALL;
-USE common_lib.eth_layers_pkg.ALL;
+USE common_lib.common_network_layers_pkg.ALL;
 USE work.eth_pkg.ALL;
 
 ENTITY eth_control IS
diff --git a/libraries/io/eth/src/vhdl/eth_hdr.vhd b/libraries/io/eth/src/vhdl/eth_hdr.vhd
index cf8e08a1cbea4a2f9b98ebfe1f395a0c3a174800..1cfb2aea159bd484ed6bbb2b11634f788ea20625 100644
--- a/libraries/io/eth/src/vhdl/eth_hdr.vhd
+++ b/libraries/io/eth/src/vhdl/eth_hdr.vhd
@@ -25,7 +25,7 @@ USE IEEE.std_logic_1164.ALL;
 USE IEEE.numeric_std.ALL;
 USE common_lib.common_pkg.ALL;
 USE dp_lib.dp_stream_pkg.ALL;
-USE common_lib.eth_layers_pkg.ALL;
+USE common_lib.common_network_layers_pkg.ALL;
 USE work.eth_pkg.ALL;
 
 -- Description:
diff --git a/libraries/io/eth/src/vhdl/eth_hdr_ctrl.vhd b/libraries/io/eth/src/vhdl/eth_hdr_ctrl.vhd
index 55260a2ca594acd1b827a66dc718349c7b42fe56..721f5a77e4f852a6f82284713df7c3bee32427f9 100644
--- a/libraries/io/eth/src/vhdl/eth_hdr_ctrl.vhd
+++ b/libraries/io/eth/src/vhdl/eth_hdr_ctrl.vhd
@@ -25,7 +25,7 @@ USE IEEE.std_logic_1164.ALL;
 USE IEEE.numeric_std.ALL;
 USE common_lib.common_pkg.ALL;
 USE dp_lib.dp_stream_pkg.ALL;
-USE common_lib.eth_layers_pkg.ALL;
+USE common_lib.common_network_layers_pkg.ALL;
 USE work.eth_pkg.ALL;
 
 -- Description:
diff --git a/libraries/io/eth/src/vhdl/eth_hdr_status.vhd b/libraries/io/eth/src/vhdl/eth_hdr_status.vhd
index d729f14b85f887f344d14649e54a3c4a45846f51..841a1ddbc4bb341d6aca9b6534b2c9e0f0b489a5 100644
--- a/libraries/io/eth/src/vhdl/eth_hdr_status.vhd
+++ b/libraries/io/eth/src/vhdl/eth_hdr_status.vhd
@@ -25,7 +25,7 @@ USE IEEE.std_logic_1164.ALL;
 USE IEEE.numeric_std.ALL;
 USE common_lib.common_pkg.ALL;
 USE dp_lib.dp_stream_pkg.ALL;
-USE common_lib.eth_layers_pkg.ALL;
+USE common_lib.common_network_layers_pkg.ALL;
 USE work.eth_pkg.ALL;
 
 -- Purpose:
diff --git a/libraries/io/eth/src/vhdl/eth_hdr_store.vhd b/libraries/io/eth/src/vhdl/eth_hdr_store.vhd
index 8bd70fdd4445d42306bb2180f0f990354786c749..ea5c60da95f4ac22abc1cb4cb3100395306f565a 100644
--- a/libraries/io/eth/src/vhdl/eth_hdr_store.vhd
+++ b/libraries/io/eth/src/vhdl/eth_hdr_store.vhd
@@ -24,7 +24,7 @@ LIBRARY IEEE, common_lib, dp_lib;
 USE IEEE.std_logic_1164.ALL;
 USE common_lib.common_pkg.ALL;
 USE dp_lib.dp_stream_pkg.ALL;
-USE common_lib.eth_layers_pkg.ALL;
+USE common_lib.common_network_layers_pkg.ALL;
 USE work.eth_pkg.ALL;
 
 -- Purpose:
diff --git a/libraries/io/eth/src/vhdl/eth_ihl_to_20.vhd b/libraries/io/eth/src/vhdl/eth_ihl_to_20.vhd
index edaae16bb9a6f33ce938e3910725b704b3fcd60f..facba955de5297860015c3d65f6b1c4b003b370e 100644
--- a/libraries/io/eth/src/vhdl/eth_ihl_to_20.vhd
+++ b/libraries/io/eth/src/vhdl/eth_ihl_to_20.vhd
@@ -25,7 +25,7 @@ USE IEEE.std_logic_1164.ALL;
 USE IEEE.numeric_std.ALL;
 USE common_lib.common_pkg.ALL;
 USE dp_lib.dp_stream_pkg.ALL;
-USE common_lib.eth_layers_pkg.ALL;
+USE common_lib.common_network_layers_pkg.ALL;
 USE work.eth_pkg.ALL;
 
 -- Purpose:
diff --git a/libraries/io/eth/src/vhdl/eth_mm_reg_frame.vhd b/libraries/io/eth/src/vhdl/eth_mm_reg_frame.vhd
index 2c2d537dc3f692c6b52a6b9a6e1dec65638e46d4..cbf329ade11a989aca897d26e7be66cbeed42d26 100644
--- a/libraries/io/eth/src/vhdl/eth_mm_reg_frame.vhd
+++ b/libraries/io/eth/src/vhdl/eth_mm_reg_frame.vhd
@@ -24,7 +24,7 @@ LIBRARY IEEE, common_lib;
 USE IEEE.std_logic_1164.ALL;
 USE IEEE.numeric_std.ALL;
 USE common_lib.common_pkg.ALL;
-USE common_lib.eth_layers_pkg.ALL;
+USE common_lib.common_network_layers_pkg.ALL;
 USE work.eth_pkg.ALL;
 
 ENTITY eth_mm_reg_frame IS
diff --git a/libraries/io/eth/src/vhdl/eth_pkg.vhd b/libraries/io/eth/src/vhdl/eth_pkg.vhd
index a9a45752bb2fdcc83509d683e634237e43084bc4..c4f2ffa4cc1079bdb14bc0ed6eb244a979a855fb 100644
--- a/libraries/io/eth/src/vhdl/eth_pkg.vhd
+++ b/libraries/io/eth/src/vhdl/eth_pkg.vhd
@@ -25,7 +25,7 @@ USE IEEE.std_logic_1164.ALL;
 USE IEEE.numeric_std.ALL;
 USE common_lib.common_pkg.ALL;
 USE dp_lib.dp_stream_pkg.ALL;
-USE common_lib.eth_layers_pkg.ALL;
+USE common_lib.common_network_layers_pkg.ALL;
 USE tech_tse_lib.tech_tse_pkg.ALL;
 
 
diff --git a/libraries/io/eth/tb/vhdl/tb_eth.vhd b/libraries/io/eth/tb/vhdl/tb_eth.vhd
index a2b905b6188bd1c4cf3ce57a43b28f4b39ca5859..8c4833a5137445fbc59e8ec5ff8ab220381b359b 100644
--- a/libraries/io/eth/tb/vhdl/tb_eth.vhd
+++ b/libraries/io/eth/tb/vhdl/tb_eth.vhd
@@ -47,7 +47,7 @@ USE common_lib.common_pkg.ALL;
 USE common_lib.common_mem_pkg.ALL;
 USE common_lib.tb_common_mem_pkg.ALL;
 USE dp_lib.dp_stream_pkg.ALL;
-USE common_lib.eth_layers_pkg.ALL;
+USE common_lib.common_network_layers_pkg.ALL;
 USE WORK.eth_pkg.ALL;
 USE tech_tse_lib.tech_tse_pkg.ALL;
 USE tech_tse_lib.tb_tech_tse_pkg.ALL;
diff --git a/libraries/io/eth/tb/vhdl/tb_eth_ihl_to_20.vhd b/libraries/io/eth/tb/vhdl/tb_eth_ihl_to_20.vhd
index 93f909bb4283ccb66d88d63d08983be0dc2bef80..965e42b78e9d39703569f110450c33a6cbd76243 100644
--- a/libraries/io/eth/tb/vhdl/tb_eth_ihl_to_20.vhd
+++ b/libraries/io/eth/tb/vhdl/tb_eth_ihl_to_20.vhd
@@ -31,7 +31,7 @@ USE IEEE.std_logic_1164.ALL;
 USE IEEE.numeric_std.ALL;
 USE common_lib.common_pkg.ALL;
 USE dp_lib.dp_stream_pkg.ALL;
-USE common_lib.eth_layers_pkg.ALL;
+USE common_lib.common_network_layers_pkg.ALL;
 USE work.eth_pkg.ALL;
 
 
diff --git a/libraries/io/eth/tb/vhdl/tb_eth_udp_offload.vhd b/libraries/io/eth/tb/vhdl/tb_eth_udp_offload.vhd
index ae6547cac31c6ee26b7f547a537b111a0db191c3..4f82a69c10095264b771fc03a1fa5a5f2965cc48 100644
--- a/libraries/io/eth/tb/vhdl/tb_eth_udp_offload.vhd
+++ b/libraries/io/eth/tb/vhdl/tb_eth_udp_offload.vhd
@@ -33,7 +33,7 @@ USE dp_lib.dp_stream_pkg.ALL;
 USE dp_lib.tb_dp_pkg.ALL;
 USE tech_tse_lib.tech_tse_pkg.ALL;
 USE tech_tse_lib.tb_tech_tse_pkg.ALL;
-USE common_lib.eth_layers_pkg.ALL;
+USE common_lib.common_network_layers_pkg.ALL;
 USE WORK.eth_pkg.ALL;
 
 ENTITY tb_eth_udp_offload IS
diff --git a/libraries/technology/tse/tb_tech_tse.vhd b/libraries/technology/tse/tb_tech_tse.vhd
index b5d21665853b5d4e6b19de7b9da7b9667f41c53c..d8ef19e2d5b29a2facaa83304ef6556d52d3b0ef 100644
--- a/libraries/technology/tse/tb_tech_tse.vhd
+++ b/libraries/technology/tse/tb_tech_tse.vhd
@@ -35,7 +35,7 @@ USE technology_lib.technology_pkg.ALL;
 USE common_lib.common_pkg.ALL;
 USE common_lib.common_mem_pkg.ALL;
 USE dp_lib.dp_stream_pkg.ALL;
-USE common_lib.eth_layers_pkg.ALL;
+USE common_lib.common_network_layers_pkg.ALL;
 USE WORK.tech_tse_pkg.ALL;
 USE WORK.tb_tech_tse_pkg.ALL;
 
diff --git a/libraries/technology/tse/tb_tech_tse_pkg.vhd b/libraries/technology/tse/tb_tech_tse_pkg.vhd
index c982b27dd234745688fd25f2d2b0704f2902ac5c..ee503fe27b5800c70d1d41dba05dd6d23b8ac39e 100644
--- a/libraries/technology/tse/tb_tech_tse_pkg.vhd
+++ b/libraries/technology/tse/tb_tech_tse_pkg.vhd
@@ -28,7 +28,7 @@ USE common_lib.common_mem_pkg.ALL;
 USE common_lib.tb_common_mem_pkg.ALL;
 USE dp_lib.dp_stream_pkg.ALL;
 USE dp_lib.tb_dp_pkg.ALL;
-USE common_lib.eth_layers_pkg.ALL;
+USE common_lib.common_network_layers_pkg.ALL;
 USE WORK.tech_tse_pkg.ALL;