diff --git a/src/hip/rtl/us/taxi_gt_rx_reset.sv b/src/hip/rtl/us/taxi_gt_rx_reset.sv
index 10ea6ec..c88877a 100644
--- a/src/hip/rtl/us/taxi_gt_rx_reset.sv
+++ b/src/hip/rtl/us/taxi_gt_rx_reset.sv
@@ -116,14 +116,16 @@ reset_sync_inst (
     .out(rx_reset_sync)
 );
 
-localparam [2:0]
-    STATE_RESET = 3'd0,
-    STATE_WAIT_LOCK = 3'd1,
-    STATE_WAIT_CDR = 3'd2,
-    STATE_WAIT_USRCLK = 3'd3,
-    STATE_DONE = 3'd4;
+typedef enum logic [2:0] {
+    STATE_RESET,
+    STATE_WAIT_LOCK,
+    STATE_WAIT_CDR,
+    STATE_WAIT_USRCLK,
+    STATE_DONE
+} state_t;
+
+state_t state_reg = STATE_RESET, state_next;
 
-logic [2:0] state_reg = STATE_RESET;
 logic [CNT_W-1:0] rx_reset_cnt_reg = '0;
 logic [CDR_CNT_W-1:0] rx_reset_cdr_cnt_reg = '0;
 logic rx_reset_done_reg = 1'b0;
diff --git a/src/hip/rtl/us/taxi_gt_tx_reset.sv b/src/hip/rtl/us/taxi_gt_tx_reset.sv
index 6ba3dae..887b325 100644
--- a/src/hip/rtl/us/taxi_gt_tx_reset.sv
+++ b/src/hip/rtl/us/taxi_gt_tx_reset.sv
@@ -103,13 +103,15 @@ reset_sync_inst (
     .out(tx_reset_sync)
 );
 
-localparam [1:0]
-    STATE_RESET = 2'd0,
-    STATE_WAIT_LOCK = 2'd1,
-    STATE_WAIT_USRCLK = 2'd2,
-    STATE_DONE = 2'd3;
+typedef enum logic [1:0] {
+    STATE_RESET,
+    STATE_WAIT_LOCK,
+    STATE_WAIT_USRCLK,
+    STATE_DONE
+} state_t;
+
+state_t state_reg = STATE_RESET, state_next;
 
-logic [1:0] state_reg = STATE_RESET;
 logic [CNT_W-1:0] tx_reset_cnt_reg = '0;
 logic tx_reset_done_reg = 1'b0;