diff --git a/src/intel/compiler/brw_fs_copy_propagation.cpp b/src/intel/compiler/brw_fs_copy_propagation.cpp
index 6c97e18c171..afb976b8430 100644
--- a/src/intel/compiler/brw_fs_copy_propagation.cpp
+++ b/src/intel/compiler/brw_fs_copy_propagation.cpp
@@ -974,14 +974,14 @@ try_constant_propagate_value(brw_reg val, brw_reg_type dst_type,
 
    if (inst->src[arg].abs) {
       if (is_logic_op(inst->opcode) ||
-          !fs_reg_abs_immediate(&val)) {
+          !brw_reg_abs_immediate(&val)) {
          return false;
       }
    }
 
    if (inst->src[arg].negate) {
       if (is_logic_op(inst->opcode) ||
-          !fs_reg_negate_immediate(&val)) {
+          !brw_reg_negate_immediate(&val)) {
          return false;
       }
    }
diff --git a/src/intel/compiler/brw_fs_opt_algebraic.cpp b/src/intel/compiler/brw_fs_opt_algebraic.cpp
index a45989304da..5186d0d059b 100644
--- a/src/intel/compiler/brw_fs_opt_algebraic.cpp
+++ b/src/intel/compiler/brw_fs_opt_algebraic.cpp
@@ -99,7 +99,7 @@ brw_fs_opt_algebraic(fs_visitor &s)
                 inst->src[0].type != BRW_TYPE_F)
                assert(!"unimplemented: saturate mixed types");
 
-            if (fs_reg_saturate_immediate(&inst->src[0])) {
+            if (brw_reg_saturate_immediate(&inst->src[0])) {
                inst->saturate = false;
                progress = true;
             }
diff --git a/src/intel/compiler/brw_fs_saturate_propagation.cpp b/src/intel/compiler/brw_fs_saturate_propagation.cpp
index 5bfda06e824..91001687df6 100644
--- a/src/intel/compiler/brw_fs_saturate_propagation.cpp
+++ b/src/intel/compiler/brw_fs_saturate_propagation.cpp
@@ -94,7 +94,7 @@ opt_saturate_propagation_local(fs_visitor &s, bblock_t *block)
                      } else if (scan_inst->opcode == BRW_OPCODE_MAD) {
                         for (int i = 0; i < 2; i++) {
                            if (scan_inst->src[i].file == IMM) {
-                              fs_reg_negate_immediate(&scan_inst->src[i]);
+                              brw_reg_negate_immediate(&scan_inst->src[i]);
                            } else {
                               scan_inst->src[i].negate = !scan_inst->src[i].negate;
                            }
@@ -102,7 +102,7 @@ opt_saturate_propagation_local(fs_visitor &s, bblock_t *block)
                         inst->src[0].negate = false;
                      } else if (scan_inst->opcode == BRW_OPCODE_ADD) {
                         if (scan_inst->src[1].file == IMM) {
-                           if (!fs_reg_negate_immediate(&scan_inst->src[1])) {
+                           if (!brw_reg_negate_immediate(&scan_inst->src[1])) {
                               break;
                            }
                         } else {
diff --git a/src/intel/compiler/brw_ir_fs.h b/src/intel/compiler/brw_ir_fs.h
index 5c3ee9f2ef9..c2ce0227fca 100644
--- a/src/intel/compiler/brw_ir_fs.h
+++ b/src/intel/compiler/brw_ir_fs.h
@@ -223,9 +223,9 @@ horiz_stride(brw_reg reg, unsigned s)
    return reg;
 }
 
-bool fs_reg_saturate_immediate(brw_reg *reg);
-bool fs_reg_negate_immediate(brw_reg *reg);
-bool fs_reg_abs_immediate(brw_reg *reg);
+bool brw_reg_saturate_immediate(brw_reg *reg);
+bool brw_reg_negate_immediate(brw_reg *reg);
+bool brw_reg_abs_immediate(brw_reg *reg);
 
 static const brw_reg reg_undef;
 
diff --git a/src/intel/compiler/brw_shader.cpp b/src/intel/compiler/brw_shader.cpp
index dfbd41a0a8d..b1aa49a792b 100644
--- a/src/intel/compiler/brw_shader.cpp
+++ b/src/intel/compiler/brw_shader.cpp
@@ -30,7 +30,7 @@
 #include "util/macros.h"
 
 bool
-fs_reg_saturate_immediate(brw_reg *reg)
+brw_reg_saturate_immediate(brw_reg *reg)
 {
    union {
       unsigned ud;
@@ -93,7 +93,7 @@ fs_reg_saturate_immediate(brw_reg *reg)
 }
 
 bool
-fs_reg_negate_immediate(brw_reg *reg)
+brw_reg_negate_immediate(brw_reg *reg)
 {
    switch (reg->type) {
    case BRW_TYPE_D:
@@ -136,7 +136,7 @@ fs_reg_negate_immediate(brw_reg *reg)
 }
 
 bool
-fs_reg_abs_immediate(brw_reg *reg)
+brw_reg_abs_immediate(brw_reg *reg)
 {
    switch (reg->type) {
    case BRW_TYPE_D: