diff --git a/src/asahi/compiler/agx_compile.c b/src/asahi/compiler/agx_compile.c
index 718d374e22a..680406f4139 100644
--- a/src/asahi/compiler/agx_compile.c
+++ b/src/asahi/compiler/agx_compile.c
@@ -1720,7 +1720,7 @@ agx_emit_intrinsic(agx_builder *b, nir_intrinsic_instr *instr)
       agx_emit_store_scratch(b, instr);
       return NULL;
 
-   case nir_intrinsic_load_core_id_agx:
+   case nir_intrinsic_load_core_id:
       return agx_get_sr_to(b, dst, AGX_SR_CORE_ID);
 
    case nir_intrinsic_load_helper_op_id_agx:
diff --git a/src/asahi/libagx/helper.cl b/src/asahi/libagx/helper.cl
index aa3eb84fa28..77643639fab 100644
--- a/src/asahi/libagx/helper.cl
+++ b/src/asahi/libagx/helper.cl
@@ -27,7 +27,7 @@ libagx_helper(void)
    global struct agx_helper_header *hdr =
       (global struct agx_helper_header *)arg;
 
-   uint32_t core_index = nir_load_core_id_agx();
+   uint32_t core_index = nir_load_core_id();
    uint32_t subgroups = hdr->subgroups;
    global struct agx_helper_core *core = &hdr->cores[core_index];
 
diff --git a/src/asahi/libagx/libagx_intrinsics.h b/src/asahi/libagx/libagx_intrinsics.h
index c4731402eb4..fdad0a60c41 100644
--- a/src/asahi/libagx/libagx_intrinsics.h
+++ b/src/asahi/libagx/libagx_intrinsics.h
@@ -11,7 +11,7 @@ uint32_t nir_interleave_agx(uint16_t x, uint16_t y);
 void nir_doorbell_agx(uint8_t value);
 void nir_stack_map_agx(uint16_t index, uint32_t address);
 uint32_t nir_stack_unmap_agx(uint16_t index);
-uint32_t nir_load_core_id_agx(void);
+uint32_t nir_load_core_id(void);
 uint32_t nir_load_helper_op_id_agx(void);
 uint32_t nir_load_helper_arg_lo_agx(void);
 uint32_t nir_load_helper_arg_hi_agx(void);
diff --git a/src/compiler/nir/nir_divergence_analysis.c b/src/compiler/nir/nir_divergence_analysis.c
index 640073c1823..cd74195a446 100644
--- a/src/compiler/nir/nir_divergence_analysis.c
+++ b/src/compiler/nir/nir_divergence_analysis.c
@@ -344,7 +344,7 @@ visit_intrinsic(nir_intrinsic_instr *instr, struct divergence_state *state)
    case nir_intrinsic_load_tcs_mem_attrib_stride:
    case nir_intrinsic_load_printf_buffer_address:
    case nir_intrinsic_load_printf_buffer_size:
-   case nir_intrinsic_load_core_id_agx:
+   case nir_intrinsic_load_core_id:
    case nir_intrinsic_load_samples_log2_agx:
    case nir_intrinsic_load_active_subgroup_count_agx:
    case nir_intrinsic_load_root_agx:
diff --git a/src/compiler/nir/nir_intrinsics.py b/src/compiler/nir/nir_intrinsics.py
index b8c8c16b6e1..dd25e22e8d1 100644
--- a/src/compiler/nir/nir_intrinsics.py
+++ b/src/compiler/nir/nir_intrinsics.py
@@ -2320,7 +2320,7 @@ intrinsic("stack_map_agx", src_comp=[1, 1])
 intrinsic("stack_unmap_agx", src_comp=[1], dest_comp=1, bit_sizes=[32])
 
 # dst[] = { GPU core ID }.
-system_value("core_id_agx", 1, bit_sizes=[32])
+system_value("core_id", 1, bit_sizes=[32])
 
 # dst[] = { Helper operation type }.
 load("helper_op_id_agx", [], [], [CAN_ELIMINATE])