diff --git a/src/intel/compiler/brw_opt_copy_propagation.cpp b/src/intel/compiler/brw_opt_copy_propagation.cpp
index 34695352719..6b112d79e82 100644
--- a/src/intel/compiler/brw_opt_copy_propagation.cpp
+++ b/src/intel/compiler/brw_opt_copy_propagation.cpp
@@ -209,7 +209,7 @@ struct acp {
 
 struct block_data {
    /**
-    * Which entries in the fs_copy_prop_dataflow acp table are live at the
+    * Which entries in the brw_copy_prop_dataflow acp table are live at the
     * start of this block.  This is the useful output of the analysis, since
     * it lets us plug those into the local copy propagation on the second
     * pass.
@@ -217,40 +217,40 @@ struct block_data {
    BITSET_WORD *livein;
 
    /**
-    * Which entries in the fs_copy_prop_dataflow acp table are live at the end
+    * Which entries in the brw_copy_prop_dataflow acp table are live at the end
     * of this block.  This is done in initial setup from the per-block acps
     * returned by the first local copy prop pass.
     */
    BITSET_WORD *liveout;
 
    /**
-    * Which entries in the fs_copy_prop_dataflow acp table are generated by
+    * Which entries in the brw_copy_prop_dataflow acp table are generated by
     * instructions in this block which reach the end of the block without
     * being killed.
     */
    BITSET_WORD *copy;
 
    /**
-    * Which entries in the fs_copy_prop_dataflow acp table are killed over the
+    * Which entries in the brw_copy_prop_dataflow acp table are killed over the
     * course of this block.
     */
    BITSET_WORD *kill;
 
    /**
-    * Which entries in the fs_copy_prop_dataflow acp table are guaranteed to
+    * Which entries in the brw_copy_prop_dataflow acp table are guaranteed to
     * have a fully uninitialized destination at the end of this block.
     */
    BITSET_WORD *undef;
 
    /**
-    * Which entries in the fs_copy_prop_dataflow acp table can the
+    * Which entries in the brw_copy_prop_dataflow acp table can the
     * start of this block be reached from.  Note that this is a weaker
     * condition than livein.
     */
    BITSET_WORD *reachin;
 
    /**
-    * Which entries in the fs_copy_prop_dataflow acp table are
+    * Which entries in the brw_copy_prop_dataflow acp table are
     * overwritten by an instruction with channel masks inconsistent
     * with the copy instruction (e.g. due to force_writemask_all).
     * Such an overwrite can cause the copy entry to become invalid
@@ -262,12 +262,12 @@ struct block_data {
    BITSET_WORD *exec_mismatch;
 };
 
-class fs_copy_prop_dataflow
+class brw_copy_prop_dataflow
 {
 public:
-   fs_copy_prop_dataflow(linear_ctx *lin_ctx, cfg_t *cfg,
-                         const brw_live_variables &live,
-                         struct acp *out_acp);
+   brw_copy_prop_dataflow(linear_ctx *lin_ctx, cfg_t *cfg,
+                          const brw_live_variables &live,
+                          struct acp *out_acp);
 
    void setup_initial_values();
    void run();
@@ -285,9 +285,9 @@ public:
 };
 } /* anonymous namespace */
 
-fs_copy_prop_dataflow::fs_copy_prop_dataflow(linear_ctx *lin_ctx, cfg_t *cfg,
-                                             const brw_live_variables &live,
-                                             struct acp *out_acp)
+brw_copy_prop_dataflow::brw_copy_prop_dataflow(linear_ctx *lin_ctx, cfg_t *cfg,
+                                              const brw_live_variables &live,
+                                              struct acp *out_acp)
    : cfg(cfg), live(live)
 {
    bd = linear_zalloc_array(lin_ctx, struct block_data, cfg->num_blocks);
@@ -361,7 +361,7 @@ grf_regions_overlap(const brw_reg &r, unsigned dr, const brw_reg &s, unsigned ds
  * the fixed-point algorithm.
  */
 void
-fs_copy_prop_dataflow::setup_initial_values()
+brw_copy_prop_dataflow::setup_initial_values()
 {
    /* Initialize the COPY and KILL sets. */
    {
@@ -443,7 +443,7 @@ fs_copy_prop_dataflow::setup_initial_values()
  * are killed by the block.
  */
 void
-fs_copy_prop_dataflow::run()
+brw_copy_prop_dataflow::run()
 {
    bool progress;
 
@@ -541,7 +541,7 @@ fs_copy_prop_dataflow::run()
 }
 
 void
-fs_copy_prop_dataflow::dump_block_data() const
+brw_copy_prop_dataflow::dump_block_data() const
 {
    foreach_block (block, cfg) {
       fprintf(stderr, "Block %d [%d, %d] (parents ", block->num,
@@ -1515,7 +1515,7 @@ brw_opt_copy_propagation(brw_shader &s)
    }
 
    /* Do dataflow analysis for those available copies. */
-   fs_copy_prop_dataflow dataflow(lin_ctx, s.cfg, live, out_acp);
+   brw_copy_prop_dataflow dataflow(lin_ctx, s.cfg, live, out_acp);
 
    /* Next, re-run local copy propagation, this time with the set of copies
     * provided by the dataflow analysis available at the start of a block.