diff --git a/controller.sv b/controller.sv
index e830e33d..b6dbeaf8 100644
--- a/controller.sv
+++ b/controller.sv
@@ -289,7 +289,7 @@ module controller
         // hwloop detected, jump to start address!
         // Attention: This has to be done in the DECODE and the FIRST_FETCH states
         if (hwloop_jump_i == 1'b1)
-          pc_mux_sel_o  = `HWLOOP_ADDR;
+          pc_mux_sel_o  = `PC_HWLOOP;
       end
 
       DECODE:
diff --git a/if_stage.sv b/if_stage.sv
index 5f550569..88abf8e4 100644
--- a/if_stage.sv
+++ b/if_stage.sv
@@ -118,7 +118,7 @@ module if_stage
       `PC_NO_INCR:      next_pc = current_pc_if_o;          // PC is not incremented
       `PC_EXCEPTION:    next_pc = exc_pc;                   // PC that points to the exception
       `PC_ERET:         next_pc = exception_pc_reg_i;       // PC is restored when returning from IRQ/exception
-      `HWLOOP_ADDR:     next_pc = pc_from_hwloop_i;         // PC is taken from hwloop start addr
+      `PC_HWLOOP:       next_pc = pc_from_hwloop_i;         // PC is taken from hwloop start addr
        default:
        begin
          next_pc = current_pc_if_o;