diff --git a/src/gallium/drivers/iris/iris_batch.c b/src/gallium/drivers/iris/iris_batch.c
index 5289e33bb18..6eee1e34208 100644
--- a/src/gallium/drivers/iris/iris_batch.c
+++ b/src/gallium/drivers/iris/iris_batch.c
@@ -232,7 +232,7 @@ iris_init_batch(struct iris_context *ice,
       const unsigned decode_flags = INTEL_BATCH_DECODE_DEFAULT_FLAGS |
          (INTEL_DEBUG(DEBUG_COLOR) ? INTEL_BATCH_DECODE_IN_COLOR : 0);
 
-      intel_batch_decode_ctx_init_brw(&batch->decoder, &screen->compiler->isa,
+      intel_batch_decode_ctx_init_brw(&batch->decoder, &screen->brw->isa,
                                       screen->devinfo,
                                       stderr, decode_flags, NULL,
                                       decode_get_bo, decode_get_state_size, batch);
diff --git a/src/gallium/drivers/iris/iris_blorp.c b/src/gallium/drivers/iris/iris_blorp.c
index 94865f7b0ba..30ed2795f9e 100644
--- a/src/gallium/drivers/iris/iris_blorp.c
+++ b/src/gallium/drivers/iris/iris_blorp.c
@@ -509,7 +509,7 @@ genX(init_blorp)(struct iris_context *ice)
 {
    struct iris_screen *screen = (struct iris_screen *)ice->ctx.screen;
 
-   blorp_init_brw(&ice->blorp, ice, &screen->isl_dev, screen->compiler, NULL);
+   blorp_init_brw(&ice->blorp, ice, &screen->isl_dev, screen->brw, NULL);
    ice->blorp.lookup_shader = iris_blorp_lookup_shader;
    ice->blorp.upload_shader = iris_blorp_upload_shader;
    ice->blorp.exec = iris_blorp_exec;
diff --git a/src/gallium/drivers/iris/iris_disk_cache.c b/src/gallium/drivers/iris/iris_disk_cache.c
index a99005871a6..060e23da55d 100644
--- a/src/gallium/drivers/iris/iris_disk_cache.c
+++ b/src/gallium/drivers/iris/iris_disk_cache.c
@@ -280,7 +280,7 @@ iris_disk_cache_init(struct iris_screen *screen)
    /* array length = strlen("iris_") + sha + nul char */
    char renderer[5 + 40 + 1] = {0};
    char device_info_sha[41];
-   brw_device_sha1(device_info_sha, screen->compiler->devinfo);
+   brw_device_sha1(device_info_sha, screen->brw->devinfo);
    memcpy(renderer, "iris_", 5);
    memcpy(renderer + 5, device_info_sha, 40);
 
@@ -295,7 +295,7 @@ iris_disk_cache_init(struct iris_screen *screen)
    _mesa_sha1_format(timestamp, id_sha1);
 
    const uint64_t driver_flags =
-      brw_get_compiler_config_value(screen->compiler);
+      brw_get_compiler_config_value(screen->brw);
    screen->disk_cache = disk_cache_create(renderer, timestamp, driver_flags);
 #endif
 }
diff --git a/src/gallium/drivers/iris/iris_indirect_gen.c b/src/gallium/drivers/iris/iris_indirect_gen.c
index 7a22ac5d713..f536e189dad 100644
--- a/src/gallium/drivers/iris/iris_indirect_gen.c
+++ b/src/gallium/drivers/iris/iris_indirect_gen.c
@@ -73,7 +73,7 @@ static nir_shader *
 load_shader_lib(struct iris_screen *screen, void *mem_ctx)
 {
    const nir_shader_compiler_options *nir_options =
-      screen->compiler->nir_options[MESA_SHADER_KERNEL];
+      screen->brw->nir_options[MESA_SHADER_KERNEL];
 
    struct blob_reader blob;
    blob_reader_init(&blob, (void *)genX(intel_shaders_nir),
diff --git a/src/gallium/drivers/iris/iris_program.c b/src/gallium/drivers/iris/iris_program.c
index e840802c0db..43662135640 100644
--- a/src/gallium/drivers/iris/iris_program.c
+++ b/src/gallium/drivers/iris/iris_program.c
@@ -1300,7 +1300,7 @@ iris_debug_recompile(struct iris_screen *screen,
             || list_is_singular(&ish->variants))
       return;
 
-   const struct brw_compiler *c = screen->compiler;
+   const struct brw_compiler *c = screen->brw;
    const struct shader_info *info = &ish->nir->info;
 
    brw_shader_perf_log(c, dbg, "Recompiling %s shader for program %s: %s\n",
@@ -1490,7 +1490,7 @@ iris_compile_vs(struct iris_screen *screen,
                 struct iris_uncompiled_shader *ish,
                 struct iris_compiled_shader *shader)
 {
-   const struct brw_compiler *compiler = screen->compiler;
+   const struct brw_compiler *compiler = screen->brw;
    const struct intel_device_info *devinfo = screen->devinfo;
    void *mem_ctx = ralloc_context(NULL);
    uint32_t *system_values;
@@ -1677,7 +1677,7 @@ iris_compile_tcs(struct iris_screen *screen,
                  struct iris_uncompiled_shader *ish,
                  struct iris_compiled_shader *shader)
 {
-   const struct brw_compiler *compiler = screen->compiler;
+   const struct brw_compiler *compiler = screen->brw;
    void *mem_ctx = ralloc_context(NULL);
    const struct intel_device_info *devinfo = screen->devinfo;
    uint32_t *system_values = NULL;
@@ -1838,7 +1838,7 @@ iris_compile_tes(struct iris_screen *screen,
                  struct iris_uncompiled_shader *ish,
                  struct iris_compiled_shader *shader)
 {
-   const struct brw_compiler *compiler = screen->compiler;
+   const struct brw_compiler *compiler = screen->brw;
    void *mem_ctx = ralloc_context(NULL);
    uint32_t *system_values;
    const struct intel_device_info *devinfo = screen->devinfo;
@@ -1982,7 +1982,7 @@ iris_compile_gs(struct iris_screen *screen,
                 struct iris_uncompiled_shader *ish,
                 struct iris_compiled_shader *shader)
 {
-   const struct brw_compiler *compiler = screen->compiler;
+   const struct brw_compiler *compiler = screen->brw;
    const struct intel_device_info *devinfo = screen->devinfo;
    void *mem_ctx = ralloc_context(NULL);
    uint32_t *system_values;
@@ -2122,7 +2122,7 @@ iris_compile_fs(struct iris_screen *screen,
                 struct iris_compiled_shader *shader,
                 struct intel_vue_map *vue_map)
 {
-   const struct brw_compiler *compiler = screen->compiler;
+   const struct brw_compiler *compiler = screen->brw;
    void *mem_ctx = ralloc_context(NULL);
    uint32_t *system_values;
    const struct intel_device_info *devinfo = screen->devinfo;
@@ -2420,7 +2420,7 @@ iris_compile_cs(struct iris_screen *screen,
                 struct iris_uncompiled_shader *ish,
                 struct iris_compiled_shader *shader)
 {
-   const struct brw_compiler *compiler = screen->compiler;
+   const struct brw_compiler *compiler = screen->brw;
    void *mem_ctx = ralloc_context(NULL);
    uint32_t *system_values;
    const struct intel_device_info *devinfo = screen->devinfo;
@@ -2677,7 +2677,7 @@ iris_create_compute_state(struct pipe_context *ctx,
    struct iris_screen *screen = (void *) ctx->screen;
    struct u_upload_mgr *uploader = ice->shaders.uploader_unsync;
    const nir_shader_compiler_options *options =
-      screen->compiler->nir_options[MESA_SHADER_COMPUTE];
+      screen->brw->nir_options[MESA_SHADER_COMPUTE];
 
    nir_shader *nir;
    switch (state->ir_type) {
@@ -3158,7 +3158,7 @@ iris_finalize_nir(struct pipe_screen *_screen, void *nirptr)
    NIR_PASS_V(nir, iris_fix_edge_flags);
 
    struct brw_nir_compiler_opts opts = {};
-   brw_preprocess_nir(screen->compiler, nir, &opts);
+   brw_preprocess_nir(screen->brw, nir, &opts);
 
    NIR_PASS_V(nir, brw_nir_lower_storage_image,
               &(struct brw_nir_lower_storage_image_opts) {
@@ -3279,7 +3279,7 @@ iris_fs_barycentric_modes(const struct iris_compiled_shader *shader,
 bool
 iris_use_tcs_multi_patch(struct iris_screen *screen)
 {
-   return screen->compiler->use_tcs_multi_patch;
+   return screen->brw->use_tcs_multi_patch;
 }
 
 bool
@@ -3332,7 +3332,7 @@ iris_get_compiler_options(struct pipe_screen *pscreen,
    gl_shader_stage stage = stage_from_pipe(pstage);
    assert(ir == PIPE_SHADER_IR_NIR);
 
-   return screen->compiler->nir_options[stage];
+   return screen->brw->nir_options[stage];
 }
 
 void
@@ -3341,9 +3341,9 @@ iris_compiler_init(struct iris_screen *screen)
    STATIC_ASSERT(IRIS_MAX_DRAW_BUFFERS == BRW_MAX_DRAW_BUFFERS);
    STATIC_ASSERT(IRIS_MAX_SOL_BINDINGS == BRW_MAX_SOL_BINDINGS);
 
-   screen->compiler = brw_compiler_create(screen, screen->devinfo);
-   screen->compiler->shader_debug_log = iris_shader_debug_log;
-   screen->compiler->shader_perf_log = iris_shader_perf_log;
-   screen->compiler->supports_shader_constants = true;
-   screen->compiler->indirect_ubos_use_sampler = iris_indirect_ubos_use_sampler(screen);
+   screen->brw = brw_compiler_create(screen, screen->devinfo);
+   screen->brw->shader_debug_log = iris_shader_debug_log;
+   screen->brw->shader_perf_log = iris_shader_perf_log;
+   screen->brw->supports_shader_constants = true;
+   screen->brw->indirect_ubos_use_sampler = iris_indirect_ubos_use_sampler(screen);
 }
diff --git a/src/gallium/drivers/iris/iris_program_cache.c b/src/gallium/drivers/iris/iris_program_cache.c
index 6fb1ad90a93..af0323dc5fd 100644
--- a/src/gallium/drivers/iris/iris_program_cache.c
+++ b/src/gallium/drivers/iris/iris_program_cache.c
@@ -180,7 +180,7 @@ iris_upload_shader(struct iris_screen *screen,
          .value = shader_data_addr >> 32,
       },
    };
-   brw_write_shader_relocs(&screen->compiler->isa, shader->map,
+   brw_write_shader_relocs(&screen->brw->isa, shader->map,
                            shader->brw_prog_data, reloc_values,
                            ARRAY_SIZE(reloc_values));
 
@@ -331,7 +331,7 @@ iris_ensure_indirect_generation_shader(struct iris_batch *batch)
    if (ice->draw.generation.shader != NULL)
       return;
 
-   struct brw_compiler *compiler = screen->compiler;
+   struct brw_compiler *compiler = screen->brw;
    const nir_shader_compiler_options *nir_options =
       compiler->nir_options[MESA_SHADER_FRAGMENT];
 
diff --git a/src/gallium/drivers/iris/iris_screen.h b/src/gallium/drivers/iris/iris_screen.h
index a41b14ee6a0..ed8ced96afc 100644
--- a/src/gallium/drivers/iris/iris_screen.h
+++ b/src/gallium/drivers/iris/iris_screen.h
@@ -225,7 +225,7 @@ struct iris_screen {
    const struct intel_device_info *devinfo;
    struct isl_device isl_dev;
    struct iris_bufmgr *bufmgr;
-   struct brw_compiler *compiler;
+   struct brw_compiler *brw;
    struct intel_perf_config *perf_cfg;
 
    const struct intel_l3_config *l3_config_3d;