diff --git a/src/intel/vulkan/anv_cmd_buffer.c b/src/intel/vulkan/anv_cmd_buffer.c
index 15d3035555b..9f15ef75f4a 100644
--- a/src/intel/vulkan/anv_cmd_buffer.c
+++ b/src/intel/vulkan/anv_cmd_buffer.c
@@ -619,11 +619,11 @@ void anv_CmdBindPipeline(
                                 &gfx_pipeline->shaders[stage]->bind_map);
       }
 
-      /* Apply the dynamic state from the pipeline */
+      /* Apply the non dynamic state from the pipeline */
       cmd_buffer->state.gfx.dirty |=
          anv_dynamic_state_copy(&cmd_buffer->state.gfx.dynamic,
-                                &gfx_pipeline->dynamic_state,
-                                gfx_pipeline->dynamic_state_mask);
+                                &gfx_pipeline->non_dynamic_state,
+                                gfx_pipeline->non_dynamic_state_mask);
 
       state = &cmd_buffer->state.gfx.base;
       stages = gfx_pipeline->active_stages;
diff --git a/src/intel/vulkan/anv_pipeline.c b/src/intel/vulkan/anv_pipeline.c
index 5c495536e63..4fc938d365d 100644
--- a/src/intel/vulkan/anv_pipeline.c
+++ b/src/intel/vulkan/anv_pipeline.c
@@ -2082,11 +2082,11 @@ copy_non_dynamic_state(struct anv_graphics_pipeline *pipeline,
 {
    anv_cmd_dirty_mask_t states = ANV_CMD_DIRTY_DYNAMIC_ALL;
 
-   anv_dynamic_state_init(&pipeline->dynamic_state);
+   anv_dynamic_state_init(&pipeline->non_dynamic_state);
 
    states &= ~pipeline->dynamic_states;
 
-   struct anv_dynamic_state *dynamic = &pipeline->dynamic_state;
+   struct anv_dynamic_state *dynamic = &pipeline->non_dynamic_state;
 
    bool raster_discard =
       pCreateInfo->pRasterizationState->rasterizerDiscardEnable &&
@@ -2363,7 +2363,7 @@ copy_non_dynamic_state(struct anv_graphics_pipeline *pipeline,
    }
 
 
-   pipeline->dynamic_state_mask = states;
+   pipeline->non_dynamic_state_mask = states;
 }
 
 /**
diff --git a/src/intel/vulkan/anv_private.h b/src/intel/vulkan/anv_private.h
index f8867608f9c..27b6a61f898 100644
--- a/src/intel/vulkan/anv_private.h
+++ b/src/intel/vulkan/anv_private.h
@@ -3335,9 +3335,9 @@ struct anv_graphics_pipeline {
     * This might cover more than the dynamic states specified at pipeline
     * creation.
     */
-   anv_cmd_dirty_mask_t                         dynamic_state_mask;
+   anv_cmd_dirty_mask_t                         non_dynamic_state_mask;
 
-   struct anv_dynamic_state                     dynamic_state;
+   struct anv_dynamic_state                     non_dynamic_state;
 
    uint32_t                                     topology;
 
diff --git a/src/intel/vulkan/genX_pipeline.c b/src/intel/vulkan/genX_pipeline.c
index 988fc744ce2..2522a6a3ca0 100644
--- a/src/intel/vulkan/genX_pipeline.c
+++ b/src/intel/vulkan/genX_pipeline.c
@@ -2134,7 +2134,7 @@ has_color_buffer_write_enabled(const struct anv_graphics_pipeline *pipeline,
    if (!shader_bin)
       return false;
 
-   if (!pipeline->dynamic_state.color_writes)
+   if (!pipeline->non_dynamic_state.color_writes)
       return false;
 
    const struct anv_pipeline_bind_map *bind_map = &shader_bin->bind_map;