diff --git a/blink/rtl/blink.vhd b/blink/rtl/blink.vhd
index 31f9479..7236d7a 100644
--- a/blink/rtl/blink.vhd
+++ b/blink/rtl/blink.vhd
@@ -32,8 +32,8 @@ architecture rtl of blink is
   signal s_pll_lock : std_logic;
   signal s_clk_en   : boolean;
 
-  signal s_rst_n   : std_logic;
-  signal s_cfg_end : std_logic;
+  signal s_rst_n    : std_logic;
+  signal s_usr_rstn : std_logic;
 
   signal s_sys_rst_n : std_logic;
 
@@ -59,13 +59,13 @@ begin
     CLK_REF_OUT         => open
   );
 
-  cfg_end_inst : CC_CFG_END
+  cc_usr_rstn_inst : CC_USR_RSTN
   port map (
-    CFG_END => s_cfg_end
+    USR_RSTN => s_usr_rstn
   );
 
   -- This works
-  s_rst_n <= rst_n_i and s_pll_lock and s_cfg_end;
+  s_rst_n <= rst_n_i and s_pll_lock and s_usr_rstn;
 
   -- This doesn't work.
   -- The reset module seems to be removed during Yosys flatten pass, even
@@ -79,7 +79,7 @@ begin
   )
   port map (
     clk_i => s_pll_clk,
-    rst_i => rst_n_i and s_pll_lock and s_cfg_end,
+    rst_i => rst_n_i and s_pll_lock and s_usr_rstn,
     rst_o => s_sys_rst_n
   );
 
diff --git a/lib/rtl_components.vhd b/lib/rtl_components.vhd
index d799239..c50e9eb 100644
--- a/lib/rtl_components.vhd
+++ b/lib/rtl_components.vhd
@@ -492,6 +492,12 @@ package components is
   );
   end component;
 
+  component CC_USR_RSTN
+  port (
+    USR_RSTN : out std_logic
+  );
+  end component;
+
   component CC_BUFG
   port (
     I : in  std_logic;
diff --git a/lib/sim_components.vhd b/lib/sim_components.vhd
index a835cc6..8a40376 100644
--- a/lib/sim_components.vhd
+++ b/lib/sim_components.vhd
@@ -61,16 +61,16 @@ library ieee ;
 use ieee.std_logic_1164.all;
 
 
-entity CC_CFG_END is
-port (
-  CFG_END : out std_logic
-);
+entity CC_USR_RSTN
+  port (
+    USR_RSTN : out std_logic
+  );
 end entity;
 
 
-architecture sim of CC_CFG_END is
+architecture sim of CC_USR_RSTN is
 begin
 
-  CFG_END <= '1';
+  USR_RSTN <= '1';
 
 end architecture;
diff --git a/uart_aes/rtl/uart_aes.vhd b/uart_aes/rtl/uart_aes.vhd
index 3fc9fad..0ac9c24 100644
--- a/uart_aes/rtl/uart_aes.vhd
+++ b/uart_aes/rtl/uart_aes.vhd
@@ -33,8 +33,8 @@ architecture rtl of uart_aes is
   signal s_pll_clk  : std_logic;
   signal s_pll_lock : std_logic;
 
-  signal s_rst_n   : std_logic;
-  signal s_cfg_end : std_logic;
+  signal s_rst_n    : std_logic;
+  signal s_usr_rstn : std_logic;
 
   signal s_uart_rx_tdata  : std_logic_vector(7 downto 0);
   signal s_uart_rx_tvalid : std_logic;
@@ -71,9 +71,9 @@ begin
     CLK_REF_OUT         => open
   );
 
-  cfg_end_inst : CC_CFG_END
+  cc_usr_rstn_inst : CC_USR_RSTN
   port map (
-    CFG_END => s_cfg_end
+    USR_RSTN => s_usr_rstn
   );
 
   uart_rx : entity work.uart_rx
@@ -144,7 +144,7 @@ begin
     tx_o     => uart_tx_o
   );
 
-  s_rst_n <= rst_n_i and s_pll_lock and s_cfg_end;
+  s_rst_n <= rst_n_i and s_pll_lock and s_usr_rstn;
 
   -- Lets some LEDs blink
   led_n_o(0) <= rst_n_i;                                -- reset button
diff --git a/uart_loop/rtl/uart_loop.vhd b/uart_loop/rtl/uart_loop.vhd
index 0c58ecc..0ae5252 100644
--- a/uart_loop/rtl/uart_loop.vhd
+++ b/uart_loop/rtl/uart_loop.vhd
@@ -25,8 +25,8 @@ architecture rtl of uart_loop is
   signal s_pll_clk  : std_logic;
   signal s_pll_lock : std_logic;
 
-  signal s_rst_n   : std_logic;
-  signal s_cfg_end : std_logic;
+  signal s_rst_n    : std_logic;
+  signal s_usr_rstn : std_logic;
 
   signal s_uart_rx_tdata  : std_logic_vector(7 downto 0);
   signal s_uart_rx_tvalid : std_logic;
@@ -58,9 +58,9 @@ begin
     CLK_REF_OUT         => open
   );
 
-  cfg_end_inst : CC_CFG_END
+  cc_usr_rstn_inst : CC_USR_RSTN
   port map (
-    CFG_END => s_cfg_end
+    USR_RSTN => s_usr_rstn
   );
 
   uart_rx : entity work.uart_rx
@@ -118,6 +118,6 @@ begin
     tx_o     => uart_tx_o
   );
 
-  s_rst_n <= rst_n_i and s_pll_lock and s_cfg_end;
+  s_rst_n <= rst_n_i and s_pll_lock and s_usr_rstn;
 
 end architecture;
diff --git a/uart_reg/rtl/uart_reg.vhd b/uart_reg/rtl/uart_reg.vhd
index 8efc7d4..774d5cb 100644
--- a/uart_reg/rtl/uart_reg.vhd
+++ b/uart_reg/rtl/uart_reg.vhd
@@ -28,8 +28,8 @@ architecture rtl of uart_reg is
   signal s_pll_clk  : std_logic;
   signal s_pll_lock : std_logic;
 
-  signal s_rst_n   : std_logic;
-  signal s_cfg_end : std_logic;
+  signal s_rst_n    : std_logic;
+  signal s_usr_rstn : std_logic;
 
   signal s_uart_rx_tdata  : std_logic_vector(7 downto 0);
   signal s_uart_rx_tvalid : std_logic;
@@ -61,9 +61,9 @@ begin
     CLK_REF_OUT         => open
   );
 
-  cfg_end_inst : CC_CFG_END
+  cc_usr_rstn_inst : CC_USR_RSTN
   port map (
-    CFG_END => s_cfg_end
+    USR_RSTN => s_usr_rstn
   );
 
   uart_rx : entity work.uart_rx
@@ -113,6 +113,6 @@ begin
     tx_o     => uart_tx_o
   );
 
-  s_rst_n <= rst_n_i and s_pll_lock and s_cfg_end;
+  s_rst_n <= rst_n_i and s_pll_lock and s_usr_rstn;
 
 end architecture;
diff --git a/uart_trng/rtl/uart_trng.vhd b/uart_trng/rtl/uart_trng.vhd
index 6d1de33..911a139 100644
--- a/uart_trng/rtl/uart_trng.vhd
+++ b/uart_trng/rtl/uart_trng.vhd
@@ -31,8 +31,8 @@ architecture rtl of uart_trng is
   signal s_pll_clk  : std_logic;
   signal s_pll_lock : std_logic;
 
-  signal s_rst_n   : std_logic;
-  signal s_cfg_end : std_logic;
+  signal s_rst_n    : std_logic;
+  signal s_usr_rstn : std_logic;
 
   signal s_uart_tx_tdata  : std_logic_vector(7 downto 0);
   signal s_uart_tx_tvalid : std_logic;
@@ -63,9 +63,9 @@ begin
     CLK_REF_OUT         => open
   );
 
-  cfg_end_inst : CC_CFG_END
+  cc_usr_rstn_inst : CC_USR_RSTN
   port map (
-    CFG_END => s_cfg_end
+    USR_RSTN => s_usr_rstn
   );
 
   firo_ctrl : entity work.firo_ctrl 
@@ -132,6 +132,6 @@ begin
     tx_o     => uart_tx_o
   );
 
-  s_rst_n <= rst_n_i and s_pll_lock and s_cfg_end;
+  s_rst_n <= rst_n_i and s_pll_lock and s_usr_rstn;
 
 end architecture;