diff --git a/libraries/technology/ddr3/tech_ddr3.vhd b/libraries/technology/ddr/tech_ddr.vhd
similarity index 97%
rename from libraries/technology/ddr3/tech_ddr3.vhd
rename to libraries/technology/ddr/tech_ddr.vhd
index 09a3b5ab52438333fdbef8d18eba11502407d884..c9b3de81afbdef615d94e395380446c3d5909a9c 100644
--- a/libraries/technology/ddr3/tech_ddr3.vhd
+++ b/libraries/technology/ddr/tech_ddr.vhd
@@ -26,7 +26,7 @@ USE technology_lib.technology_pkg.ALL;
 USE technology_lib.technology_select_pkg.ALL;
 USE tech_ddr_lib.tech_ddr_pkg.ALL;
 
-ENTITY tech_ddr3 IS
+ENTITY tech_ddr IS
   GENERIC (
     g_technology : NATURAL := c_tech_select_default;
     g_tech_ddr   : t_c_tech_ddr
@@ -52,10 +52,10 @@ ENTITY tech_ddr3 IS
     phy_io            : INOUT t_tech_ddr_phy_io;
     phy_ou            : OUT   t_tech_ddr_phy_ou
   );
-END tech_ddr3;
+END tech_ddr;
 
 
-ARCHITECTURE str OF tech_ddr3 IS
+ARCHITECTURE str OF tech_ddr IS
 
 BEGIN
  
diff --git a/libraries/technology/ddr3/tech_ddr3_component_pkg.vhd b/libraries/technology/ddr/tech_ddr_component_pkg.vhd
similarity index 97%
rename from libraries/technology/ddr3/tech_ddr3_component_pkg.vhd
rename to libraries/technology/ddr/tech_ddr_component_pkg.vhd
index ed7ad267eebfe3edaecf7267a419fca9529231c6..ddbd7908defaf73ab38f7da18c65aa835c782c7f 100644
--- a/libraries/technology/ddr3/tech_ddr3_component_pkg.vhd
+++ b/libraries/technology/ddr/tech_ddr_component_pkg.vhd
@@ -26,7 +26,7 @@ LIBRARY IEEE, technology_lib;
 USE IEEE.std_logic_1164.ALL;
 USE technology_lib.technology_pkg.ALL;
 
-PACKAGE tech_ddr3_component_pkg IS
+PACKAGE tech_ddr_component_pkg IS
 
   ------------------------------------------------------------------------------
   -- ip_stratixiv
@@ -135,9 +135,9 @@ PACKAGE tech_ddr3_component_pkg IS
   );
   END COMPONENT;
   
-END tech_ddr3_component_pkg;
+END tech_ddr_component_pkg;
 
-PACKAGE BODY tech_ddr3_component_pkg IS
+PACKAGE BODY tech_ddr_component_pkg IS
 
 
-END tech_ddr3_component_pkg;
+END tech_ddr_component_pkg;
diff --git a/libraries/technology/ddr3/tech_ddr3_stratixiv.vhd b/libraries/technology/ddr/tech_ddr_stratixiv.vhd
similarity index 96%
rename from libraries/technology/ddr3/tech_ddr3_stratixiv.vhd
rename to libraries/technology/ddr/tech_ddr_stratixiv.vhd
index 40220af65e5bc9b3c2299e929ab2184005239e4e..284727598e02da01303a6798819ebc9ed2da0c4c 100644
--- a/libraries/technology/ddr3/tech_ddr3_stratixiv.vhd
+++ b/libraries/technology/ddr/tech_ddr_stratixiv.vhd
@@ -28,9 +28,9 @@ LIBRARY IEEE, technology_lib, tech_ddr_lib, common_lib;
 USE IEEE.STD_LOGIC_1164.ALL;
 USE technology_lib.technology_pkg.ALL;
 USE tech_ddr_lib.tech_ddr_pkg.ALL;
-USE work.tech_ddr3_component_pkg.ALL;
+USE work.tech_ddr_component_pkg.ALL;
 
-ENTITY tech_ddr3_stratixiv IS
+ENTITY tech_ddr_stratixiv IS
   GENERIC (
     g_tech_ddr   : t_c_tech_ddr
   );
@@ -55,17 +55,19 @@ ENTITY tech_ddr3_stratixiv IS
     phy_io            : INOUT t_tech_ddr_phy_io;
     phy_ou            : OUT   t_tech_ddr_phy_ou
   );
-END tech_ddr3_stratixiv;
+END tech_ddr_stratixiv;
 
 
-ARCHITECTURE str OF tech_ddr3_stratixiv IS
+ARCHITECTURE str OF tech_ddr_stratixiv IS
+
+  CONSTANT c_gigabytes             : NATURAL := func_tech_ddr_module_size(g_tech_ddr)
 
   SIGNAL i_ctlr_gen_rst            : STD_LOGIC;
   SIGNAL i_ctlr_gen_clk_2x         : STD_LOGIC;
 
 BEGIN
 
-  gen_ip_stratixiv_ddr3_uphy_4g_800_master : IF func_tech_ddr_module_size(g_tech_ddr)=4 AND g_tech_ddr.mts=800 AND g_tech_ddr.master=TRUE GENERATE
+  gen_ip_stratixiv_ddr3_uphy_4g_800_master : IF g_tech_ddr.name="DDR3" AND c_gigabytes=4 AND g_tech_ddr.mts=800 AND g_tech_ddr.master=TRUE GENERATE
     u_ip_stratixiv_ddr3_uphy_4g_800_master : ip_stratixiv_ddr3_uphy_4g_800_master
     PORT MAP (
       pll_ref_clk                => ctlr_ref_clk,                                                                   --  pll_ref_clk.clk
@@ -117,7 +119,7 @@ BEGIN
     );
   END GENERATE;
 
-  gen_ip_stratixiv_ddr3_uphy_4g_800_slave : IF func_tech_ddr_module_size(g_tech_ddr)=4 AND g_tech_ddr.mts=800 AND g_tech_ddr.master=FALSE GENERATE
+  gen_ip_stratixiv_ddr3_uphy_4g_800_slave : IF g_tech_ddr.name="DDR3" AND c_gigabytes=4 AND g_tech_ddr.mts=800 AND g_tech_ddr.master=FALSE GENERATE
     u_ip_stratixiv_ddr3_uphy_4g_800_slave : ip_stratixiv_ddr3_uphy_4g_800_slave
     PORT MAP (
       pll_ref_clk                => ctlr_ref_clk,                                                                   --  pll_ref_clk.clk