diff --git a/libraries/technology/ip_arria10/eth_10g/ip_arria10_eth_10g.vhd b/libraries/technology/ip_arria10/eth_10g/ip_arria10_eth_10g.vhd
index 9c2474c77330ef24017509c9734273de89a4f703..2b52096438579180952ae2466c2b0435169312e0 100644
--- a/libraries/technology/ip_arria10/eth_10g/ip_arria10_eth_10g.vhd
+++ b/libraries/technology/ip_arria10/eth_10g/ip_arria10_eth_10g.vhd
@@ -21,7 +21,7 @@
 --------------------------------------------------------------------------------
 
 
--- Purpose: Combine mac_10g and 10gbase_r for c_tech_arria10
+-- Purpose: Combine mac_10g and 10gbase_r for c_tech_arria10_proto
 -- Description 
 --   
 --   The clocks come from an external central fPLL:
@@ -193,7 +193,7 @@ BEGIN
     
     u_tech_mac_10g : ENTITY tech_mac_10g_lib.tech_mac_10g
     GENERIC MAP (
-      g_technology          => c_tech_arria10,
+      g_technology          => c_tech_arria10_proto,
       g_pre_header_padding  => g_pre_header_padding
     )
     PORT MAP (
@@ -227,7 +227,7 @@ BEGIN
   
   u_tech_10gbase_r: ENTITY tech_10gbase_r_lib.tech_10gbase_r
   GENERIC MAP (
-    g_technology     => c_tech_arria10,
+    g_technology     => c_tech_arria10_proto,
     g_sim            => g_sim,
     g_sim_level      => g_sim_level,
     g_nof_channels   => g_nof_channels
@@ -290,7 +290,7 @@ BEGIN
   u_common_mem_mux_mac : ENTITY common_lib.common_mem_mux
   GENERIC MAP (    
     g_nof_mosi    => g_nof_channels,
-    g_mult_addr_w => func_tech_mac_10g_csr_addr_w(c_tech_arria10) 
+    g_mult_addr_w => func_tech_mac_10g_csr_addr_w(c_tech_arria10_proto)
   )
   PORT MAP (
     mosi     => mac_mosi,
diff --git a/libraries/technology/ip_arria10_e1sg/eth_10g/ip_arria10_e1sg_eth_10g.vhd b/libraries/technology/ip_arria10_e1sg/eth_10g/ip_arria10_e1sg_eth_10g.vhd
index c840de488e2342ffa58f0be21fbffab03f91257e..a3af9d8892acd71132a8e727d39a44050b113efc 100644
--- a/libraries/technology/ip_arria10_e1sg/eth_10g/ip_arria10_e1sg_eth_10g.vhd
+++ b/libraries/technology/ip_arria10_e1sg/eth_10g/ip_arria10_e1sg_eth_10g.vhd
@@ -310,7 +310,7 @@ BEGIN
   u_common_mem_mux_mac : ENTITY common_lib.common_mem_mux
   GENERIC MAP (    
     g_nof_mosi    => g_nof_channels,
-    g_mult_addr_w => func_tech_mac_10g_csr_addr_w(c_tech_arria10) 
+    g_mult_addr_w => func_tech_mac_10g_csr_addr_w(c_tech_arria10_e1sg)
   )
   PORT MAP (
     mosi     => mac_mosi,
diff --git a/libraries/technology/ip_arria10_e2sg/eth_10g/ip_arria10_e2sg_eth_10g.vhd b/libraries/technology/ip_arria10_e2sg/eth_10g/ip_arria10_e2sg_eth_10g.vhd
index 85914052e686eabfef3bed39a8870ac6b0e50617..cdb3620492abf7f80d5e4b6b0664812173f5c817 100644
--- a/libraries/technology/ip_arria10_e2sg/eth_10g/ip_arria10_e2sg_eth_10g.vhd
+++ b/libraries/technology/ip_arria10_e2sg/eth_10g/ip_arria10_e2sg_eth_10g.vhd
@@ -310,7 +310,7 @@ BEGIN
   u_common_mem_mux_mac : ENTITY common_lib.common_mem_mux
   GENERIC MAP (    
     g_nof_mosi    => g_nof_channels,
-    g_mult_addr_w => func_tech_mac_10g_csr_addr_w(c_tech_arria10) 
+    g_mult_addr_w => func_tech_mac_10g_csr_addr_w(c_tech_arria10_e2sg)
   )
   PORT MAP (
     mosi     => mac_mosi,
diff --git a/libraries/technology/ip_arria10_e3sge3/eth_10g/ip_arria10_e3sge3_eth_10g.vhd b/libraries/technology/ip_arria10_e3sge3/eth_10g/ip_arria10_e3sge3_eth_10g.vhd
index c1e19809c2116bd83cd976fb2744d3662944bea8..0ea7f65859e5cc9e7455b3e071b452f11c5b1216 100644
--- a/libraries/technology/ip_arria10_e3sge3/eth_10g/ip_arria10_e3sge3_eth_10g.vhd
+++ b/libraries/technology/ip_arria10_e3sge3/eth_10g/ip_arria10_e3sge3_eth_10g.vhd
@@ -300,7 +300,7 @@ BEGIN
   u_common_mem_mux_mac : ENTITY common_lib.common_mem_mux
   GENERIC MAP (    
     g_nof_mosi    => g_nof_channels,
-    g_mult_addr_w => func_tech_mac_10g_csr_addr_w(c_tech_arria10) 
+    g_mult_addr_w => func_tech_mac_10g_csr_addr_w(c_tech_arria10_e3sge3)
   )
   PORT MAP (
     mosi     => mac_mosi,
diff --git a/libraries/technology/mac_10g/tech_mac_10g_arria10.vhd b/libraries/technology/mac_10g/tech_mac_10g_arria10.vhd
index b91cbb6a470e08946216fd768b6a5e2d753919a7..66d4f1f7fd0ad26ffec79596c6afff309f6370e3 100644
--- a/libraries/technology/mac_10g/tech_mac_10g_arria10.vhd
+++ b/libraries/technology/mac_10g/tech_mac_10g_arria10.vhd
@@ -63,7 +63,7 @@ END tech_mac_10g_arria10;
 
 ARCHITECTURE str OF tech_mac_10g_arria10 IS  
  
-  CONSTANT c_mac_10g_csr_addr_w   : NATURAL := func_tech_mac_10g_csr_addr_w(c_tech_arria10);  -- = 13
+  CONSTANT c_mac_10g_csr_addr_w   : NATURAL := func_tech_mac_10g_csr_addr_w(c_tech_arria10_proto);  -- = 13
   
   SIGNAL mm_rst_n     : STD_LOGIC;
   SIGNAL tx_rst_n     : STD_LOGIC;
diff --git a/libraries/technology/mac_10g/tech_mac_10g_arria10_e1sg.vhd b/libraries/technology/mac_10g/tech_mac_10g_arria10_e1sg.vhd
index 2acea7c3c25f19121043b8f93f1cab9106542cb6..9583c3522c493f8464939e0668f6b015065cb8cc 100644
--- a/libraries/technology/mac_10g/tech_mac_10g_arria10_e1sg.vhd
+++ b/libraries/technology/mac_10g/tech_mac_10g_arria10_e1sg.vhd
@@ -63,7 +63,7 @@ END tech_mac_10g_arria10_e1sg;
 
 ARCHITECTURE str OF tech_mac_10g_arria10_e1sg IS  
  
-  CONSTANT c_mac_10g_csr_addr_w   : NATURAL := func_tech_mac_10g_csr_addr_w(c_tech_arria10);  -- = 13
+  CONSTANT c_mac_10g_csr_addr_w   : NATURAL := func_tech_mac_10g_csr_addr_w(c_tech_arria10_e1sg);  -- = 13
   
   SIGNAL mm_rst_n     : STD_LOGIC;
   SIGNAL tx_rst_n     : STD_LOGIC;
diff --git a/libraries/technology/mac_10g/tech_mac_10g_arria10_e2sg.vhd b/libraries/technology/mac_10g/tech_mac_10g_arria10_e2sg.vhd
index f7a598b09f70b591d1df86710e3bfb7619cf30d9..aa139fa18a37e8c2a24eeab40c037a4dd5b9c19a 100644
--- a/libraries/technology/mac_10g/tech_mac_10g_arria10_e2sg.vhd
+++ b/libraries/technology/mac_10g/tech_mac_10g_arria10_e2sg.vhd
@@ -63,7 +63,7 @@ END tech_mac_10g_arria10_e2sg;
 
 ARCHITECTURE str OF tech_mac_10g_arria10_e2sg IS  
  
-  CONSTANT c_mac_10g_csr_addr_w   : NATURAL := func_tech_mac_10g_csr_addr_w(c_tech_arria10);  -- = 13
+  CONSTANT c_mac_10g_csr_addr_w   : NATURAL := func_tech_mac_10g_csr_addr_w(c_tech_arria10_e2sg);  -- = 13
   
   SIGNAL mm_rst_n     : STD_LOGIC;
   SIGNAL tx_rst_n     : STD_LOGIC;
diff --git a/libraries/technology/mac_10g/tech_mac_10g_arria10_e3sge3.vhd b/libraries/technology/mac_10g/tech_mac_10g_arria10_e3sge3.vhd
index ae3eb9657aba055fa36401bfc72b2b97d53a3893..6327dad72ca81220d676b6c85c1f6fc5b52c8295 100644
--- a/libraries/technology/mac_10g/tech_mac_10g_arria10_e3sge3.vhd
+++ b/libraries/technology/mac_10g/tech_mac_10g_arria10_e3sge3.vhd
@@ -63,7 +63,7 @@ END tech_mac_10g_arria10_e3sge3;
 
 ARCHITECTURE str OF tech_mac_10g_arria10_e3sge3 IS  
  
-  CONSTANT c_mac_10g_csr_addr_w   : NATURAL := func_tech_mac_10g_csr_addr_w(c_tech_arria10);  -- = 13
+  CONSTANT c_mac_10g_csr_addr_w   : NATURAL := func_tech_mac_10g_csr_addr_w(c_tech_arria10_e3sge3);  -- = 13
   
   SIGNAL mm_rst_n     : STD_LOGIC;
   SIGNAL tx_rst_n     : STD_LOGIC;
diff --git a/libraries/technology/technology_select_pkg.vhd b/libraries/technology/technology_select_pkg.vhd
index a0f1f68ebf692d648077f036d76af0b70e82b69a..277134226066837465ece762caff74f3f5780c6a 100644
--- a/libraries/technology/technology_select_pkg.vhd
+++ b/libraries/technology/technology_select_pkg.vhd
@@ -31,8 +31,5 @@ USE work.technology_pkg.ALL;
 PACKAGE technology_select_pkg IS
 
   CONSTANT c_tech_select_default : INTEGER := c_tech_stratixiv;
-  --CONSTANT c_tech_select_default : INTEGER := c_tech_arria10;
-  --CONSTANT c_tech_select_default : INTEGER := c_tech_arria10_e3sge3;
-  --CONSTANT c_tech_select_default : INTEGER := c_tech_arria10_e1sg;
   
 END technology_select_pkg;
diff --git a/libraries/technology/technology_select_pkg_unb1.vhd b/libraries/technology/technology_select_pkg_unb1.vhd
index 430ecaccbc3629c453c7658bcaf3c4a0efb83583..277134226066837465ece762caff74f3f5780c6a 100644
--- a/libraries/technology/technology_select_pkg_unb1.vhd
+++ b/libraries/technology/technology_select_pkg_unb1.vhd
@@ -30,9 +30,6 @@ USE work.technology_pkg.ALL;
 
 PACKAGE technology_select_pkg IS
 
- CONSTANT c_tech_select_default : INTEGER := c_tech_stratixiv;
- --CONSTANT c_tech_select_default : INTEGER := c_tech_arria10;
- --CONSTANT c_tech_select_default : INTEGER := c_tech_arria10_e3sge3;
- --CONSTANT c_tech_select_default : INTEGER := c_tech_arria10_e1sg;
+  CONSTANT c_tech_select_default : INTEGER := c_tech_stratixiv;
   
 END technology_select_pkg;
diff --git a/libraries/technology/technology_select_pkg_unb2b.vhd b/libraries/technology/technology_select_pkg_unb2b.vhd
index c917c75addffbec503cff882baed27ca9a3c529b..ea1dbe677526c2f66fdb91be99ebc786c337eac5 100644
--- a/libraries/technology/technology_select_pkg_unb2b.vhd
+++ b/libraries/technology/technology_select_pkg_unb2b.vhd
@@ -30,9 +30,6 @@ USE work.technology_pkg.ALL;
 
 PACKAGE technology_select_pkg IS
 
- --CONSTANT c_tech_select_default : INTEGER := c_tech_stratixiv;
- --CONSTANT c_tech_select_default : INTEGER := c_tech_arria10;
- --CONSTANT c_tech_select_default : INTEGER := c_tech_arria10_e3sge3;
- CONSTANT c_tech_select_default : INTEGER := c_tech_arria10_e1sg;
+  CONSTANT c_tech_select_default : INTEGER := c_tech_arria10_e1sg;
   
 END technology_select_pkg;
diff --git a/libraries/technology/technology_select_pkg_unb2c.vhd b/libraries/technology/technology_select_pkg_unb2c.vhd
index 90c39c8ce2d697b0858047605e8fb2d48f33736b..97a93feecc1318d3410349519d3489050de29e89 100644
--- a/libraries/technology/technology_select_pkg_unb2c.vhd
+++ b/libraries/technology/technology_select_pkg_unb2c.vhd
@@ -30,9 +30,6 @@ USE work.technology_pkg.ALL;
 
 PACKAGE technology_select_pkg IS
 
- --CONSTANT c_tech_select_default : INTEGER := c_tech_stratixiv;
- --CONSTANT c_tech_select_default : INTEGER := c_tech_arria10;
- --CONSTANT c_tech_select_default : INTEGER := c_tech_arria10_e3sge3;
- CONSTANT c_tech_select_default : INTEGER := c_tech_arria10_e2sg;
+  CONSTANT c_tech_select_default : INTEGER := c_tech_arria10_e2sg;
   
 END technology_select_pkg;