diff --git a/libraries/base/ring/src/vhdl/ring_pkg.vhd b/libraries/base/ring/src/vhdl/ring_pkg.vhd
index 0dbb79b3173c17a562c187e044916d2e4c59080b..11a4e1e5c20b1aaf5c469d77a27f5ffdda3d67ea 100644
--- a/libraries/base/ring/src/vhdl/ring_pkg.vhd
+++ b/libraries/base/ring/src/vhdl/ring_pkg.vhd
@@ -137,7 +137,7 @@ PACKAGE BODY ring_pkg IS
 
   FUNCTION func_nof_hops_to_source_rn(hops, this_rn, N_rn : STD_LOGIC_VECTOR; lane_dir : NATURAL) RETURN STD_LOGIC_VECTOR IS
   BEGIN
-    RETURN TO_UVEC(nof_hops_to_source_rn(TO_UINT(hops), TO_UINT(N_rn), TO_UINT(N_rn), lane_dir),hops'LENGTH);
+    RETURN TO_UVEC(func_nof_hops_to_source_rn(TO_UINT(hops), TO_UINT(N_rn), TO_UINT(N_rn), lane_dir),hops'LENGTH);
   END;
   
 END ring_pkg;
diff --git a/libraries/base/ring/src/vhdl/ring_tx.vhd b/libraries/base/ring/src/vhdl/ring_tx.vhd
index 113e3f92de94972c076ccac7bae68f6417f3ef05..4e8d6c7d3ff2173ccc915aa0ce8182c2744c4459 100644
--- a/libraries/base/ring/src/vhdl/ring_tx.vhd
+++ b/libraries/base/ring/src/vhdl/ring_tx.vhd
@@ -115,7 +115,7 @@ BEGIN
   p_hop: PROCESS(validated_sosi)
   BEGIN
     tx_sosi <= validated_sosi;
-    IF TO_UINT(validate_sosi.channel) >= TO_UINT(N_rn)-1 THEN
+    IF TO_UINT(validated_sosi.channel) >= TO_UINT(N_rn)-1 THEN
       tx_sosi.channel <= (OTHERS => '0');
     ELSE
       tx_sosi.channel <= INCR_DP_CHANNEL(validated_sosi.channel, 1, c_dp_stream_channel_w);
@@ -194,7 +194,7 @@ BEGIN
     p_hop_to_src_rn: PROCESS(validated_sosi, this_rn, N_rn)
     BEGIN
       monitor_sosi <= validated_sosi;
-      monitor_sosi.channel <= nof_hops_to_source_rn(validated_sosi.channel, this_rn, N_rn, g_lane_direction);
+      monitor_sosi.channel <= func_nof_hops_to_source_rn(validated_sosi.channel, this_rn, N_rn, g_lane_direction);
     END PROCESS;
 
     u_dp_demux : ENTITY dp_lib.dp_demux