diff --git a/src/mesa/drivers/dri/i965/intel_batchbuffer.c b/src/mesa/drivers/dri/i965/brw_batch.c
similarity index 99%
rename from src/mesa/drivers/dri/i965/intel_batchbuffer.c
rename to src/mesa/drivers/dri/i965/brw_batch.c
index b65e34ff89e..930f8de2e95 100644
--- a/src/mesa/drivers/dri/i965/intel_batchbuffer.c
+++ b/src/mesa/drivers/dri/i965/brw_batch.c
@@ -23,11 +23,11 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "intel_batchbuffer.h"
-#include "intel_buffer_objects.h"
+#include "brw_batch.h"
+#include "brw_buffer_objects.h"
 #include "brw_bufmgr.h"
-#include "intel_buffers.h"
-#include "intel_fbo.h"
+#include "brw_buffers.h"
+#include "brw_fbo.h"
 #include "brw_context.h"
 #include "brw_defines.h"
 #include "brw_state.h"
diff --git a/src/mesa/drivers/dri/i965/intel_batchbuffer.h b/src/mesa/drivers/dri/i965/brw_batch.h
similarity index 98%
rename from src/mesa/drivers/dri/i965/intel_batchbuffer.h
rename to src/mesa/drivers/dri/i965/brw_batch.h
index 97497822e13..60493854aa3 100644
--- a/src/mesa/drivers/dri/i965/intel_batchbuffer.h
+++ b/src/mesa/drivers/dri/i965/brw_batch.h
@@ -1,5 +1,5 @@
-#ifndef INTEL_BATCHBUFFER_H
-#define INTEL_BATCHBUFFER_H
+#ifndef BRW_BATCH_H
+#define BRW_BATCH_H
 
 #include "main/mtypes.h"
 
diff --git a/src/mesa/drivers/dri/i965/brw_binding_tables.c b/src/mesa/drivers/dri/i965/brw_binding_tables.c
index 73f5e56010b..768bd3ba831 100644
--- a/src/mesa/drivers/dri/i965/brw_binding_tables.c
+++ b/src/mesa/drivers/dri/i965/brw_binding_tables.c
@@ -42,7 +42,7 @@
 #include "brw_context.h"
 #include "brw_defines.h"
 #include "brw_state.h"
-#include "intel_batchbuffer.h"
+#include "brw_batch.h"
 
 /**
  * Upload a shader stage's binding table as indirect state.
diff --git a/src/mesa/drivers/dri/i965/intel_blit.c b/src/mesa/drivers/dri/i965/brw_blit.c
similarity index 99%
rename from src/mesa/drivers/dri/i965/intel_blit.c
rename to src/mesa/drivers/dri/i965/brw_blit.c
index aa664c49447..807af9f5bae 100644
--- a/src/mesa/drivers/dri/i965/intel_blit.c
+++ b/src/mesa/drivers/dri/i965/brw_blit.c
@@ -31,11 +31,11 @@
 
 #include "brw_context.h"
 #include "brw_defines.h"
-#include "intel_blit.h"
-#include "intel_buffers.h"
-#include "intel_fbo.h"
-#include "intel_batchbuffer.h"
-#include "intel_mipmap_tree.h"
+#include "brw_blit.h"
+#include "brw_buffers.h"
+#include "brw_fbo.h"
+#include "brw_batch.h"
+#include "brw_mipmap_tree.h"
 
 #define FILE_DEBUG_FLAG DEBUG_BLIT
 
diff --git a/src/mesa/drivers/dri/i965/intel_blit.h b/src/mesa/drivers/dri/i965/brw_blit.h
similarity index 98%
rename from src/mesa/drivers/dri/i965/intel_blit.h
rename to src/mesa/drivers/dri/i965/brw_blit.h
index 3eb50a0095c..ab714204245 100644
--- a/src/mesa/drivers/dri/i965/intel_blit.h
+++ b/src/mesa/drivers/dri/i965/brw_blit.h
@@ -23,8 +23,8 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef INTEL_BLIT_H
-#define INTEL_BLIT_H
+#ifndef BRW_BLIT_H
+#define BRW_BLIT_H
 
 #include "brw_context.h"
 
diff --git a/src/mesa/drivers/dri/i965/brw_blorp.c b/src/mesa/drivers/dri/i965/brw_blorp.c
index 1163679d6e4..042b85d0c11 100644
--- a/src/mesa/drivers/dri/i965/brw_blorp.c
+++ b/src/mesa/drivers/dri/i965/brw_blorp.c
@@ -36,8 +36,8 @@
 #include "brw_defines.h"
 #include "brw_meta_util.h"
 #include "brw_state.h"
-#include "intel_buffer_objects.h"
-#include "intel_fbo.h"
+#include "brw_buffer_objects.h"
+#include "brw_fbo.h"
 #include "dev/gen_debug.h"
 
 #define FILE_DEBUG_FLAG DEBUG_BLORP
diff --git a/src/mesa/drivers/dri/i965/brw_blorp.h b/src/mesa/drivers/dri/i965/brw_blorp.h
index b89db624b92..de214e6e1e5 100644
--- a/src/mesa/drivers/dri/i965/brw_blorp.h
+++ b/src/mesa/drivers/dri/i965/brw_blorp.h
@@ -25,7 +25,7 @@
 #define BRW_BLORP_H
 
 #include "blorp/blorp.h"
-#include "intel_mipmap_tree.h"
+#include "brw_mipmap_tree.h"
 #include "program/prog_instruction.h"
 
 #ifdef __cplusplus
diff --git a/src/mesa/drivers/dri/i965/intel_buffer_objects.c b/src/mesa/drivers/dri/i965/brw_buffer_objects.c
similarity index 99%
rename from src/mesa/drivers/dri/i965/intel_buffer_objects.c
rename to src/mesa/drivers/dri/i965/brw_buffer_objects.c
index 428c922d603..b7d44e42163 100644
--- a/src/mesa/drivers/dri/i965/intel_buffer_objects.c
+++ b/src/mesa/drivers/dri/i965/brw_buffer_objects.c
@@ -38,8 +38,8 @@
 
 #include "brw_context.h"
 #include "brw_blorp.h"
-#include "intel_buffer_objects.h"
-#include "intel_batchbuffer.h"
+#include "brw_buffer_objects.h"
+#include "brw_batch.h"
 
 static void
 mark_buffer_gpu_usage(struct brw_buffer_object *intel_obj,
diff --git a/src/mesa/drivers/dri/i965/intel_buffer_objects.h b/src/mesa/drivers/dri/i965/brw_buffer_objects.h
similarity index 98%
rename from src/mesa/drivers/dri/i965/intel_buffer_objects.h
rename to src/mesa/drivers/dri/i965/brw_buffer_objects.h
index 434ea49f829..fef07232e82 100644
--- a/src/mesa/drivers/dri/i965/intel_buffer_objects.h
+++ b/src/mesa/drivers/dri/i965/brw_buffer_objects.h
@@ -23,8 +23,8 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef INTEL_BUFFEROBJ_H
-#define INTEL_BUFFEROBJ_H
+#ifndef BRW_BUFFEROBJ_H
+#define BRW_BUFFEROBJ_H
 
 #include "main/mtypes.h"
 
diff --git a/src/mesa/drivers/dri/i965/intel_buffers.c b/src/mesa/drivers/dri/i965/brw_buffers.c
similarity index 96%
rename from src/mesa/drivers/dri/i965/intel_buffers.c
rename to src/mesa/drivers/dri/i965/brw_buffers.c
index 9bdb3599942..ea7aa6fca4b 100644
--- a/src/mesa/drivers/dri/i965/intel_buffers.c
+++ b/src/mesa/drivers/dri/i965/brw_buffers.c
@@ -24,9 +24,9 @@
  */
 
 #include "brw_context.h"
-#include "intel_buffers.h"
-#include "intel_fbo.h"
-#include "intel_mipmap_tree.h"
+#include "brw_buffers.h"
+#include "brw_fbo.h"
+#include "brw_mipmap_tree.h"
 
 #include "main/fbobject.h"
 #include "main/framebuffer.h"
diff --git a/src/mesa/drivers/dri/i965/intel_buffers.h b/src/mesa/drivers/dri/i965/brw_buffers.h
similarity index 94%
rename from src/mesa/drivers/dri/i965/intel_buffers.h
rename to src/mesa/drivers/dri/i965/brw_buffers.h
index fc14eaf3fbb..37c385f7a92 100644
--- a/src/mesa/drivers/dri/i965/intel_buffers.h
+++ b/src/mesa/drivers/dri/i965/brw_buffers.h
@@ -23,8 +23,8 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef INTEL_BUFFERS_H
-#define INTEL_BUFFERS_H
+#ifndef BRW_BUFFERS_H
+#define BRW_BUFFERS_H
 
 #include "dri_util.h"
 #include "drm-uapi/drm.h"
@@ -32,4 +32,4 @@
 
 extern void brw_init_buffer_functions(struct dd_function_table *functions);
 
-#endif /* INTEL_BUFFERS_H */
+#endif /* BRW_BUFFERS_H */
diff --git a/src/mesa/drivers/dri/i965/brw_bufmgr.h b/src/mesa/drivers/dri/i965/brw_bufmgr.h
index 32346ff8a30..9d9d5f0d5e2 100644
--- a/src/mesa/drivers/dri/i965/brw_bufmgr.h
+++ b/src/mesa/drivers/dri/i965/brw_bufmgr.h
@@ -31,8 +31,8 @@
  * Public definitions of Intel-specific bufmgr functions.
  */
 
-#ifndef INTEL_BUFMGR_H
-#define INTEL_BUFMGR_H
+#ifndef BRW_BUFMGR_H
+#define BRW_BUFMGR_H
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -402,4 +402,4 @@ bool brw_using_softpin(struct brw_bufmgr *bufmgr);
 #if defined(__cplusplus)
 }
 #endif
-#endif /* INTEL_BUFMGR_H */
+#endif /* BRW_BUFMGR_H */
diff --git a/src/mesa/drivers/dri/i965/brw_clear.c b/src/mesa/drivers/dri/i965/brw_clear.c
index 9d59c4ff71c..667d2dfc6ed 100644
--- a/src/mesa/drivers/dri/i965/brw_clear.c
+++ b/src/mesa/drivers/dri/i965/brw_clear.c
@@ -29,9 +29,9 @@
 #include "swrast/swrast.h"
 #include "drivers/common/meta.h"
 
-#include "intel_batchbuffer.h"
-#include "intel_fbo.h"
-#include "intel_mipmap_tree.h"
+#include "brw_batch.h"
+#include "brw_fbo.h"
+#include "brw_mipmap_tree.h"
 
 #include "brw_context.h"
 #include "brw_blorp.h"
diff --git a/src/mesa/drivers/dri/i965/brw_clip.c b/src/mesa/drivers/dri/i965/brw_clip.c
index 71e516026d5..238b4b423ed 100644
--- a/src/mesa/drivers/dri/i965/brw_clip.c
+++ b/src/mesa/drivers/dri/i965/brw_clip.c
@@ -32,7 +32,7 @@
 #include "main/macros.h"
 #include "main/enums.h"
 
-#include "intel_batchbuffer.h"
+#include "brw_batch.h"
 
 #include "brw_defines.h"
 #include "brw_context.h"
diff --git a/src/mesa/drivers/dri/i965/brw_compute.c b/src/mesa/drivers/dri/i965/brw_compute.c
index 3c2ef06b716..0b0ecbdef45 100644
--- a/src/mesa/drivers/dri/i965/brw_compute.c
+++ b/src/mesa/drivers/dri/i965/brw_compute.c
@@ -29,8 +29,8 @@
 #include "brw_context.h"
 #include "brw_draw.h"
 #include "brw_state.h"
-#include "intel_batchbuffer.h"
-#include "intel_buffer_objects.h"
+#include "brw_batch.h"
+#include "brw_buffer_objects.h"
 #include "brw_defines.h"
 
 
diff --git a/src/mesa/drivers/dri/i965/brw_conditional_render.c b/src/mesa/drivers/dri/i965/brw_conditional_render.c
index 463918f70e3..5996d366fb2 100644
--- a/src/mesa/drivers/dri/i965/brw_conditional_render.c
+++ b/src/mesa/drivers/dri/i965/brw_conditional_render.c
@@ -34,7 +34,7 @@
 
 #include "brw_context.h"
 #include "brw_defines.h"
-#include "intel_batchbuffer.h"
+#include "brw_batch.h"
 
 static void
 set_predicate_enable(struct brw_context *brw,
diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c
index 8a38fdb87cd..9064fcd102b 100644
--- a/src/mesa/drivers/dri/i965/brw_context.c
+++ b/src/mesa/drivers/dri/i965/brw_context.c
@@ -59,15 +59,15 @@
 #include "brw_draw.h"
 #include "brw_state.h"
 
-#include "intel_batchbuffer.h"
-#include "intel_buffer_objects.h"
-#include "intel_buffers.h"
-#include "intel_fbo.h"
-#include "intel_mipmap_tree.h"
-#include "intel_pixel.h"
-#include "intel_image.h"
-#include "intel_tex.h"
-#include "intel_tex_obj.h"
+#include "brw_batch.h"
+#include "brw_buffer_objects.h"
+#include "brw_buffers.h"
+#include "brw_fbo.h"
+#include "brw_mipmap_tree.h"
+#include "brw_pixel.h"
+#include "brw_image.h"
+#include "brw_tex.h"
+#include "brw_tex_obj.h"
 
 #include "swrast_setup/swrast_setup.h"
 #include "tnl/tnl.h"
diff --git a/src/mesa/drivers/dri/i965/brw_context.h b/src/mesa/drivers/dri/i965/brw_context.h
index 034b496838f..ef45e32d2a5 100644
--- a/src/mesa/drivers/dri/i965/brw_context.h
+++ b/src/mesa/drivers/dri/i965/brw_context.h
@@ -48,8 +48,8 @@
 
 #include "dev/gen_debug.h"
 #include "common/intel_decoder.h"
-#include "intel_screen.h"
-#include "intel_tex_obj.h"
+#include "brw_screen.h"
+#include "brw_tex_obj.h"
 #include "perf/gen_perf.h"
 #include "perf/gen_perf_query.h"
 
diff --git a/src/mesa/drivers/dri/i965/intel_copy_image.c b/src/mesa/drivers/dri/i965/brw_copy_image.c
similarity index 98%
rename from src/mesa/drivers/dri/i965/intel_copy_image.c
rename to src/mesa/drivers/dri/i965/brw_copy_image.c
index 5616f880505..ec14b9b9944 100644
--- a/src/mesa/drivers/dri/i965/intel_copy_image.c
+++ b/src/mesa/drivers/dri/i965/brw_copy_image.c
@@ -26,10 +26,10 @@
  */
 
 #include "brw_blorp.h"
-#include "intel_fbo.h"
-#include "intel_tex.h"
-#include "intel_blit.h"
-#include "intel_mipmap_tree.h"
+#include "brw_fbo.h"
+#include "brw_tex.h"
+#include "brw_blit.h"
+#include "brw_mipmap_tree.h"
 #include "main/formats.h"
 #include "main/teximage.h"
 #include "drivers/common/meta.h"
diff --git a/src/mesa/drivers/dri/i965/brw_cs.c b/src/mesa/drivers/dri/i965/brw_cs.c
index 990acabc80b..6f93ea3c06c 100644
--- a/src/mesa/drivers/dri/i965/brw_cs.c
+++ b/src/mesa/drivers/dri/i965/brw_cs.c
@@ -25,9 +25,9 @@
 #include "brw_context.h"
 #include "brw_cs.h"
 #include "brw_wm.h"
-#include "intel_mipmap_tree.h"
+#include "brw_mipmap_tree.h"
 #include "brw_state.h"
-#include "intel_batchbuffer.h"
+#include "brw_batch.h"
 #include "compiler/brw_nir.h"
 #include "brw_program.h"
 #include "compiler/glsl/ir_uniform.h"
diff --git a/src/mesa/drivers/dri/i965/brw_curbe.c b/src/mesa/drivers/dri/i965/brw_curbe.c
index 7bf558c9993..1225d09654b 100644
--- a/src/mesa/drivers/dri/i965/brw_curbe.c
+++ b/src/mesa/drivers/dri/i965/brw_curbe.c
@@ -58,8 +58,8 @@
 #include "program/prog_print.h"
 #include "program/prog_statevars.h"
 #include "util/bitscan.h"
-#include "intel_batchbuffer.h"
-#include "intel_buffer_objects.h"
+#include "brw_batch.h"
+#include "brw_buffer_objects.h"
 #include "brw_context.h"
 #include "brw_defines.h"
 #include "brw_state.h"
diff --git a/src/mesa/drivers/dri/i965/brw_draw.c b/src/mesa/drivers/dri/i965/brw_draw.c
index 7de4e0b6ac3..a4719839431 100644
--- a/src/mesa/drivers/dri/i965/brw_draw.c
+++ b/src/mesa/drivers/dri/i965/brw_draw.c
@@ -51,11 +51,11 @@
 #include "brw_context.h"
 #include "brw_state.h"
 
-#include "intel_batchbuffer.h"
-#include "intel_buffers.h"
-#include "intel_fbo.h"
-#include "intel_mipmap_tree.h"
-#include "intel_buffer_objects.h"
+#include "brw_batch.h"
+#include "brw_buffers.h"
+#include "brw_fbo.h"
+#include "brw_mipmap_tree.h"
+#include "brw_buffer_objects.h"
 
 #define FILE_DEBUG_FLAG DEBUG_PRIMS
 
diff --git a/src/mesa/drivers/dri/i965/brw_draw_upload.c b/src/mesa/drivers/dri/i965/brw_draw_upload.c
index 25437a76042..4fce53cb691 100644
--- a/src/mesa/drivers/dri/i965/brw_draw_upload.c
+++ b/src/mesa/drivers/dri/i965/brw_draw_upload.c
@@ -36,8 +36,8 @@
 #include "brw_context.h"
 #include "brw_state.h"
 
-#include "intel_batchbuffer.h"
-#include "intel_buffer_objects.h"
+#include "brw_batch.h"
+#include "brw_buffer_objects.h"
 
 static const GLuint double_types_float[5] = {
    0,
diff --git a/src/mesa/drivers/dri/i965/intel_extensions.c b/src/mesa/drivers/dri/i965/brw_extensions.c
similarity index 99%
rename from src/mesa/drivers/dri/i965/intel_extensions.c
rename to src/mesa/drivers/dri/i965/brw_extensions.c
index 710e81f531a..9c2a006a3cf 100644
--- a/src/mesa/drivers/dri/i965/intel_extensions.c
+++ b/src/mesa/drivers/dri/i965/brw_extensions.c
@@ -27,7 +27,7 @@
 
 #include "brw_context.h"
 #include "brw_defines.h"
-#include "intel_batchbuffer.h"
+#include "brw_batch.h"
 
 /**
  * Initializes potential list of extensions if ctx == NULL, or actually enables
diff --git a/src/mesa/drivers/dri/i965/intel_fbo.c b/src/mesa/drivers/dri/i965/brw_fbo.c
similarity index 99%
rename from src/mesa/drivers/dri/i965/intel_fbo.c
rename to src/mesa/drivers/dri/i965/brw_fbo.c
index bca416a6aef..f48b4e16f08 100644
--- a/src/mesa/drivers/dri/i965/intel_fbo.c
+++ b/src/mesa/drivers/dri/i965/brw_fbo.c
@@ -40,14 +40,14 @@
 #include "swrast/swrast.h"
 #include "drivers/common/meta.h"
 
-#include "intel_batchbuffer.h"
-#include "intel_buffers.h"
-#include "intel_blit.h"
-#include "intel_fbo.h"
-#include "intel_mipmap_tree.h"
-#include "intel_image.h"
-#include "intel_screen.h"
-#include "intel_tex.h"
+#include "brw_batch.h"
+#include "brw_buffers.h"
+#include "brw_blit.h"
+#include "brw_fbo.h"
+#include "brw_mipmap_tree.h"
+#include "brw_image.h"
+#include "brw_screen.h"
+#include "brw_tex.h"
 #include "brw_context.h"
 #include "brw_defines.h"
 
diff --git a/src/mesa/drivers/dri/i965/intel_fbo.h b/src/mesa/drivers/dri/i965/brw_fbo.h
similarity index 98%
rename from src/mesa/drivers/dri/i965/intel_fbo.h
rename to src/mesa/drivers/dri/i965/brw_fbo.h
index 0ce86c1f9c0..b4dcb9a4f2c 100644
--- a/src/mesa/drivers/dri/i965/intel_fbo.h
+++ b/src/mesa/drivers/dri/i965/brw_fbo.h
@@ -23,16 +23,16 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef INTEL_FBO_H
-#define INTEL_FBO_H
+#ifndef BRW_FBO_H
+#define BRW_FBO_H
 
 #include <stdbool.h>
 #include <assert.h>
 #include "main/formats.h"
 #include "main/macros.h"
 #include "brw_context.h"
-#include "intel_mipmap_tree.h"
-#include "intel_screen.h"
+#include "brw_mipmap_tree.h"
+#include "brw_screen.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -252,4 +252,4 @@ brw_quantize_num_samples(struct brw_screen *intel, unsigned num_samples);
 }
 #endif
 
-#endif /* INTEL_FBO_H */
+#endif /* BRW_FBO_H */
diff --git a/src/mesa/drivers/dri/i965/brw_ff_gs.c b/src/mesa/drivers/dri/i965/brw_ff_gs.c
index 760a3db2d40..e5cbbba6358 100644
--- a/src/mesa/drivers/dri/i965/brw_ff_gs.c
+++ b/src/mesa/drivers/dri/i965/brw_ff_gs.c
@@ -33,7 +33,7 @@
 #include "main/enums.h"
 #include "main/transformfeedback.h"
 
-#include "intel_batchbuffer.h"
+#include "brw_batch.h"
 
 #include "brw_defines.h"
 #include "brw_context.h"
diff --git a/src/mesa/drivers/dri/i965/brw_ff_gs_emit.c b/src/mesa/drivers/dri/i965/brw_ff_gs_emit.c
index 3cfbe15e558..5205c944844 100644
--- a/src/mesa/drivers/dri/i965/brw_ff_gs_emit.c
+++ b/src/mesa/drivers/dri/i965/brw_ff_gs_emit.c
@@ -34,7 +34,7 @@
 #include "main/enums.h"
 
 #include "program/program.h"
-#include "intel_batchbuffer.h"
+#include "brw_batch.h"
 
 #include "brw_defines.h"
 #include "brw_context.h"
diff --git a/src/mesa/drivers/dri/i965/brw_generate_mipmap.c b/src/mesa/drivers/dri/i965/brw_generate_mipmap.c
index b68a2393080..90f29e77e48 100644
--- a/src/mesa/drivers/dri/i965/brw_generate_mipmap.c
+++ b/src/mesa/drivers/dri/i965/brw_generate_mipmap.c
@@ -25,7 +25,7 @@
 #include "main/teximage.h"
 #include "brw_blorp.h"
 #include "brw_context.h"
-#include "intel_tex.h"
+#include "brw_tex.h"
 #include "drivers/common/meta.h"
 
 #define FILE_DEBUG_FLAG DEBUG_BLORP
diff --git a/src/mesa/drivers/dri/i965/intel_image.h b/src/mesa/drivers/dri/i965/brw_image.h
similarity index 98%
rename from src/mesa/drivers/dri/i965/intel_image.h
rename to src/mesa/drivers/dri/i965/brw_image.h
index 9b27e142430..6a976eb927e 100644
--- a/src/mesa/drivers/dri/i965/intel_image.h
+++ b/src/mesa/drivers/dri/i965/brw_image.h
@@ -23,8 +23,8 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef INTEL_IMAGE_H
-#define INTEL_IMAGE_H
+#ifndef BRW_IMAGE_H
+#define BRW_IMAGE_H
 
 /** @file intel_image.h
  *
diff --git a/src/mesa/drivers/dri/i965/brw_meta_util.c b/src/mesa/drivers/dri/i965/brw_meta_util.c
index 01c078dfe29..6d3cec41935 100644
--- a/src/mesa/drivers/dri/i965/brw_meta_util.c
+++ b/src/mesa/drivers/dri/i965/brw_meta_util.c
@@ -23,7 +23,7 @@
 
 #include "brw_context.h"
 #include "brw_defines.h"
-#include "intel_fbo.h"
+#include "brw_fbo.h"
 #include "brw_meta_util.h"
 #include "brw_state.h"
 #include "main/blend.h"
diff --git a/src/mesa/drivers/dri/i965/brw_meta_util.h b/src/mesa/drivers/dri/i965/brw_meta_util.h
index c330b68c79c..c469490ffca 100644
--- a/src/mesa/drivers/dri/i965/brw_meta_util.h
+++ b/src/mesa/drivers/dri/i965/brw_meta_util.h
@@ -26,7 +26,7 @@
 
 #include <stdbool.h>
 #include "main/mtypes.h"
-#include "intel_mipmap_tree.h"
+#include "brw_mipmap_tree.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c b/src/mesa/drivers/dri/i965/brw_mipmap_tree.c
similarity index 99%
rename from src/mesa/drivers/dri/i965/intel_mipmap_tree.c
rename to src/mesa/drivers/dri/i965/brw_mipmap_tree.c
index 3584c94b4a8..82295e6e845 100644
--- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
+++ b/src/mesa/drivers/dri/i965/brw_mipmap_tree.c
@@ -27,12 +27,12 @@
 #include <GL/internal/dri_interface.h>
 #include "drm-uapi/drm_fourcc.h"
 
-#include "intel_batchbuffer.h"
-#include "intel_image.h"
-#include "intel_mipmap_tree.h"
-#include "intel_tex.h"
-#include "intel_blit.h"
-#include "intel_fbo.h"
+#include "brw_batch.h"
+#include "brw_image.h"
+#include "brw_mipmap_tree.h"
+#include "brw_tex.h"
+#include "brw_blit.h"
+#include "brw_fbo.h"
 
 #include "brw_blorp.h"
 #include "brw_context.h"
diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.h b/src/mesa/drivers/dri/i965/brw_mipmap_tree.h
similarity index 99%
rename from src/mesa/drivers/dri/i965/intel_mipmap_tree.h
rename to src/mesa/drivers/dri/i965/brw_mipmap_tree.h
index f71ddf4135d..598ea643fd1 100644
--- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.h
+++ b/src/mesa/drivers/dri/i965/brw_mipmap_tree.h
@@ -41,8 +41,8 @@
  * that there's a single miptree for the complete texture.
  */
 
-#ifndef INTEL_MIPMAP_TREE_H
-#define INTEL_MIPMAP_TREE_H
+#ifndef BRW_MIPMAP_TREE_H
+#define BRW_MIPMAP_TREE_H
 
 #include <assert.h>
 
diff --git a/src/mesa/drivers/dri/i965/brw_misc_state.c b/src/mesa/drivers/dri/i965/brw_misc_state.c
index 2d4530a9580..c16cb4ff7d3 100644
--- a/src/mesa/drivers/dri/i965/brw_misc_state.c
+++ b/src/mesa/drivers/dri/i965/brw_misc_state.c
@@ -31,9 +31,9 @@
 
 
 
-#include "intel_batchbuffer.h"
-#include "intel_fbo.h"
-#include "intel_mipmap_tree.h"
+#include "brw_batch.h"
+#include "brw_fbo.h"
+#include "brw_mipmap_tree.h"
 
 #include "brw_context.h"
 #include "brw_state.h"
diff --git a/src/mesa/drivers/dri/i965/brw_object_purgeable.c b/src/mesa/drivers/dri/i965/brw_object_purgeable.c
index 29890832526..104454ed545 100644
--- a/src/mesa/drivers/dri/i965/brw_object_purgeable.c
+++ b/src/mesa/drivers/dri/i965/brw_object_purgeable.c
@@ -32,9 +32,9 @@
 #include "main/bufferobj.h"
 
 #include "brw_context.h"
-#include "intel_buffer_objects.h"
-#include "intel_fbo.h"
-#include "intel_mipmap_tree.h"
+#include "brw_buffer_objects.h"
+#include "brw_fbo.h"
+#include "brw_mipmap_tree.h"
 
 static GLenum
 brw_buffer_purgeable(struct brw_bo *buffer)
diff --git a/src/mesa/drivers/dri/i965/brw_performance_query.c b/src/mesa/drivers/dri/i965/brw_performance_query.c
index e0d9701292f..9936288cfb7 100644
--- a/src/mesa/drivers/dri/i965/brw_performance_query.c
+++ b/src/mesa/drivers/dri/i965/brw_performance_query.c
@@ -70,7 +70,7 @@
 
 #include "brw_context.h"
 #include "brw_defines.h"
-#include "intel_batchbuffer.h"
+#include "brw_batch.h"
 
 #include "perf/gen_perf.h"
 #include "perf/gen_perf_regs.h"
diff --git a/src/mesa/drivers/dri/i965/brw_pipe_control.c b/src/mesa/drivers/dri/i965/brw_pipe_control.c
index 6a64bbe5673..aa2c803ad6f 100644
--- a/src/mesa/drivers/dri/i965/brw_pipe_control.c
+++ b/src/mesa/drivers/dri/i965/brw_pipe_control.c
@@ -24,8 +24,8 @@
 #include "brw_context.h"
 #include "brw_defines.h"
 #include "brw_state.h"
-#include "intel_batchbuffer.h"
-#include "intel_fbo.h"
+#include "brw_batch.h"
+#include "brw_fbo.h"
 
 /**
  * Emit a PIPE_CONTROL with various flushing flags.
diff --git a/src/mesa/drivers/dri/i965/intel_pixel.c b/src/mesa/drivers/dri/i965/brw_pixel.c
similarity index 99%
rename from src/mesa/drivers/dri/i965/intel_pixel.c
rename to src/mesa/drivers/dri/i965/brw_pixel.c
index 9a1ef8d664c..b6a2c51e3dc 100644
--- a/src/mesa/drivers/dri/i965/intel_pixel.c
+++ b/src/mesa/drivers/dri/i965/brw_pixel.c
@@ -32,7 +32,7 @@
 #include "swrast/swrast.h"
 
 #include "brw_context.h"
-#include "intel_pixel.h"
+#include "brw_pixel.h"
 
 #define FILE_DEBUG_FLAG DEBUG_PIXEL
 
diff --git a/src/mesa/drivers/dri/i965/intel_pixel.h b/src/mesa/drivers/dri/i965/brw_pixel.h
similarity index 98%
rename from src/mesa/drivers/dri/i965/intel_pixel.h
rename to src/mesa/drivers/dri/i965/brw_pixel.h
index 927a74d6e5f..b6e3e6ec049 100644
--- a/src/mesa/drivers/dri/i965/intel_pixel.h
+++ b/src/mesa/drivers/dri/i965/brw_pixel.h
@@ -23,8 +23,8 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef INTEL_PIXEL_H
-#define INTEL_PIXEL_H
+#ifndef BRW_PIXEL_H
+#define BRW_PIXEL_H
 
 #include "main/mtypes.h"
 
diff --git a/src/mesa/drivers/dri/i965/intel_pixel_bitmap.c b/src/mesa/drivers/dri/i965/brw_pixel_bitmap.c
similarity index 98%
rename from src/mesa/drivers/dri/i965/intel_pixel_bitmap.c
rename to src/mesa/drivers/dri/i965/brw_pixel_bitmap.c
index 60e1414c274..563f3aec1f5 100644
--- a/src/mesa/drivers/dri/i965/intel_pixel_bitmap.c
+++ b/src/mesa/drivers/dri/i965/brw_pixel_bitmap.c
@@ -40,13 +40,13 @@
 #include "drivers/common/meta.h"
 
 #include "brw_context.h"
-#include "intel_screen.h"
-#include "intel_batchbuffer.h"
-#include "intel_blit.h"
-#include "intel_fbo.h"
-#include "intel_image.h"
-#include "intel_buffers.h"
-#include "intel_pixel.h"
+#include "brw_screen.h"
+#include "brw_batch.h"
+#include "brw_blit.h"
+#include "brw_fbo.h"
+#include "brw_image.h"
+#include "brw_buffers.h"
+#include "brw_pixel.h"
 
 
 #define FILE_DEBUG_FLAG DEBUG_PIXEL
diff --git a/src/mesa/drivers/dri/i965/intel_pixel_copy.c b/src/mesa/drivers/dri/i965/brw_pixel_copy.c
similarity index 97%
rename from src/mesa/drivers/dri/i965/intel_pixel_copy.c
rename to src/mesa/drivers/dri/i965/brw_pixel_copy.c
index 8f142576f3c..e869a5f9402 100644
--- a/src/mesa/drivers/dri/i965/intel_pixel_copy.c
+++ b/src/mesa/drivers/dri/i965/brw_pixel_copy.c
@@ -32,12 +32,12 @@
 #include "drivers/common/meta.h"
 
 #include "brw_context.h"
-#include "intel_buffers.h"
-#include "intel_mipmap_tree.h"
-#include "intel_pixel.h"
-#include "intel_fbo.h"
-#include "intel_blit.h"
-#include "intel_batchbuffer.h"
+#include "brw_buffers.h"
+#include "brw_mipmap_tree.h"
+#include "brw_pixel.h"
+#include "brw_fbo.h"
+#include "brw_blit.h"
+#include "brw_batch.h"
 
 #define FILE_DEBUG_FLAG DEBUG_PIXEL
 
diff --git a/src/mesa/drivers/dri/i965/intel_pixel_draw.c b/src/mesa/drivers/dri/i965/brw_pixel_draw.c
similarity index 96%
rename from src/mesa/drivers/dri/i965/intel_pixel_draw.c
rename to src/mesa/drivers/dri/i965/brw_pixel_draw.c
index bf56a135a75..abb53b0cc71 100644
--- a/src/mesa/drivers/dri/i965/intel_pixel_draw.c
+++ b/src/mesa/drivers/dri/i965/brw_pixel_draw.c
@@ -37,13 +37,13 @@
 #include "drivers/common/meta.h"
 
 #include "brw_context.h"
-#include "intel_screen.h"
-#include "intel_blit.h"
-#include "intel_buffers.h"
-#include "intel_fbo.h"
-#include "intel_mipmap_tree.h"
-#include "intel_pixel.h"
-#include "intel_buffer_objects.h"
+#include "brw_screen.h"
+#include "brw_blit.h"
+#include "brw_buffers.h"
+#include "brw_fbo.h"
+#include "brw_mipmap_tree.h"
+#include "brw_pixel.h"
+#include "brw_buffer_objects.h"
 
 #define FILE_DEBUG_FLAG DEBUG_PIXEL
 
diff --git a/src/mesa/drivers/dri/i965/intel_pixel_read.c b/src/mesa/drivers/dri/i965/brw_pixel_read.c
similarity index 98%
rename from src/mesa/drivers/dri/i965/intel_pixel_read.c
rename to src/mesa/drivers/dri/i965/brw_pixel_read.c
index 67ddcae091c..e61afdc2662 100644
--- a/src/mesa/drivers/dri/i965/intel_pixel_read.c
+++ b/src/mesa/drivers/dri/i965/brw_pixel_read.c
@@ -37,13 +37,13 @@
 
 #include "brw_context.h"
 #include "brw_blorp.h"
-#include "intel_screen.h"
-#include "intel_batchbuffer.h"
-#include "intel_buffers.h"
-#include "intel_fbo.h"
-#include "intel_mipmap_tree.h"
-#include "intel_pixel.h"
-#include "intel_buffer_objects.h"
+#include "brw_screen.h"
+#include "brw_batch.h"
+#include "brw_buffers.h"
+#include "brw_fbo.h"
+#include "brw_mipmap_tree.h"
+#include "brw_pixel.h"
+#include "brw_buffer_objects.h"
 
 #define FILE_DEBUG_FLAG DEBUG_PIXEL
 
diff --git a/src/mesa/drivers/dri/i965/brw_primitive_restart.c b/src/mesa/drivers/dri/i965/brw_primitive_restart.c
index 1f548a175b4..67734d395ad 100644
--- a/src/mesa/drivers/dri/i965/brw_primitive_restart.c
+++ b/src/mesa/drivers/dri/i965/brw_primitive_restart.c
@@ -33,7 +33,7 @@
 #include "brw_defines.h"
 #include "brw_draw.h"
 
-#include "intel_batchbuffer.h"
+#include "brw_batch.h"
 
 /**
  * Check if the hardware's cut index support can handle the primitive
diff --git a/src/mesa/drivers/dri/i965/brw_program.c b/src/mesa/drivers/dri/i965/brw_program.c
index 6a8cf7aef5e..5017ab821eb 100644
--- a/src/mesa/drivers/dri/i965/brw_program.c
+++ b/src/mesa/drivers/dri/i965/brw_program.c
@@ -47,7 +47,7 @@
 #include "brw_context.h"
 #include "compiler/brw_nir.h"
 #include "brw_defines.h"
-#include "intel_batchbuffer.h"
+#include "brw_batch.h"
 
 #include "brw_cs.h"
 #include "brw_gs.h"
diff --git a/src/mesa/drivers/dri/i965/brw_program_cache.c b/src/mesa/drivers/dri/i965/brw_program_cache.c
index 21cec900995..1478bd2b1b9 100644
--- a/src/mesa/drivers/dri/i965/brw_program_cache.c
+++ b/src/mesa/drivers/dri/i965/brw_program_cache.c
@@ -46,7 +46,7 @@
 
 #include "main/streaming-load-memcpy.h"
 #include "x86/common_x86_asm.h"
-#include "intel_batchbuffer.h"
+#include "brw_batch.h"
 #include "brw_state.h"
 #include "brw_wm.h"
 #include "brw_gs.h"
diff --git a/src/mesa/drivers/dri/i965/brw_queryobj.c b/src/mesa/drivers/dri/i965/brw_queryobj.c
index a7beab48587..0d00cdc1613 100644
--- a/src/mesa/drivers/dri/i965/brw_queryobj.c
+++ b/src/mesa/drivers/dri/i965/brw_queryobj.c
@@ -40,7 +40,7 @@
 #include "brw_context.h"
 #include "brw_defines.h"
 #include "brw_state.h"
-#include "intel_batchbuffer.h"
+#include "brw_batch.h"
 
 /* As best we know currently, the Gen HW timestamps are 36bits across
  * all platforms, which we need to account for when calculating a
diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/brw_screen.c
similarity index 99%
rename from src/mesa/drivers/dri/i965/intel_screen.c
rename to src/mesa/drivers/dri/i965/brw_screen.c
index 115880dd2dc..1d3a1882c5b 100644
--- a/src/mesa/drivers/dri/i965/intel_screen.c
+++ b/src/mesa/drivers/dri/i965/brw_screen.c
@@ -113,14 +113,14 @@ static const __DRIconfigOptionsExtension brw_config_options = {
    .getXml = brw_driconf_get_xml,
 };
 
-#include "intel_batchbuffer.h"
-#include "intel_buffers.h"
+#include "brw_batch.h"
+#include "brw_buffers.h"
 #include "brw_bufmgr.h"
-#include "intel_fbo.h"
-#include "intel_mipmap_tree.h"
-#include "intel_screen.h"
-#include "intel_tex.h"
-#include "intel_image.h"
+#include "brw_fbo.h"
+#include "brw_mipmap_tree.h"
+#include "brw_screen.h"
+#include "brw_tex.h"
+#include "brw_image.h"
 
 #include "brw_context.h"
 
diff --git a/src/mesa/drivers/dri/i965/intel_screen.h b/src/mesa/drivers/dri/i965/brw_screen.h
similarity index 100%
rename from src/mesa/drivers/dri/i965/intel_screen.h
rename to src/mesa/drivers/dri/i965/brw_screen.h
diff --git a/src/mesa/drivers/dri/i965/brw_sf.c b/src/mesa/drivers/dri/i965/brw_sf.c
index d6299460261..8905033db5a 100644
--- a/src/mesa/drivers/dri/i965/brw_sf.c
+++ b/src/mesa/drivers/dri/i965/brw_sf.c
@@ -36,7 +36,7 @@
 #include "main/fbobject.h"
 #include "main/state.h"
 
-#include "intel_batchbuffer.h"
+#include "brw_batch.h"
 
 #include "brw_defines.h"
 #include "brw_context.h"
diff --git a/src/mesa/drivers/dri/i965/intel_state.c b/src/mesa/drivers/dri/i965/brw_state.c
similarity index 99%
rename from src/mesa/drivers/dri/i965/intel_state.c
rename to src/mesa/drivers/dri/i965/brw_state.c
index efb63fb1bd1..9901746567a 100644
--- a/src/mesa/drivers/dri/i965/intel_state.c
+++ b/src/mesa/drivers/dri/i965/brw_state.c
@@ -28,7 +28,7 @@
 #include "main/enums.h"
 #include "main/dd.h"
 
-#include "intel_screen.h"
+#include "brw_screen.h"
 #include "brw_context.h"
 #include "brw_defines.h"
 
diff --git a/src/mesa/drivers/dri/i965/brw_state_upload.c b/src/mesa/drivers/dri/i965/brw_state_upload.c
index fb23aa74525..10f8885887f 100644
--- a/src/mesa/drivers/dri/i965/brw_state_upload.c
+++ b/src/mesa/drivers/dri/i965/brw_state_upload.c
@@ -36,8 +36,8 @@
 #include "brw_state.h"
 #include "brw_program.h"
 #include "drivers/common/meta.h"
-#include "intel_batchbuffer.h"
-#include "intel_buffers.h"
+#include "brw_batch.h"
+#include "brw_buffers.h"
 #include "brw_vs.h"
 #include "brw_ff_gs.h"
 #include "brw_gs.h"
diff --git a/src/mesa/drivers/dri/i965/brw_sync.c b/src/mesa/drivers/dri/i965/brw_sync.c
index 14a54128e2d..7c3980eb5da 100644
--- a/src/mesa/drivers/dri/i965/brw_sync.c
+++ b/src/mesa/drivers/dri/i965/brw_sync.c
@@ -43,7 +43,7 @@
 #include "util/os_file.h"
 
 #include "brw_context.h"
-#include "intel_batchbuffer.h"
+#include "brw_batch.h"
 
 struct brw_fence {
    struct brw_context *brw;
diff --git a/src/mesa/drivers/dri/i965/intel_tex.c b/src/mesa/drivers/dri/i965/brw_tex.c
similarity index 99%
rename from src/mesa/drivers/dri/i965/intel_tex.c
rename to src/mesa/drivers/dri/i965/brw_tex.c
index 9eff0cacd8e..1531cf2eead 100644
--- a/src/mesa/drivers/dri/i965/intel_tex.c
+++ b/src/mesa/drivers/dri/i965/brw_tex.c
@@ -6,10 +6,10 @@
 #include "drivers/common/meta.h"
 #include "brw_context.h"
 #include "brw_defines.h"
-#include "intel_buffer_objects.h"
-#include "intel_mipmap_tree.h"
-#include "intel_tex.h"
-#include "intel_fbo.h"
+#include "brw_buffer_objects.h"
+#include "brw_mipmap_tree.h"
+#include "brw_tex.h"
+#include "brw_fbo.h"
 #include "util/u_memory.h"
 
 #define FILE_DEBUG_FLAG DEBUG_TEXTURE
diff --git a/src/mesa/drivers/dri/i965/intel_tex.h b/src/mesa/drivers/dri/i965/brw_tex.h
similarity index 98%
rename from src/mesa/drivers/dri/i965/intel_tex.h
rename to src/mesa/drivers/dri/i965/brw_tex.h
index 77ecbed97e8..ee0837e0e29 100644
--- a/src/mesa/drivers/dri/i965/intel_tex.h
+++ b/src/mesa/drivers/dri/i965/brw_tex.h
@@ -29,7 +29,7 @@
 #include "main/mtypes.h"
 #include "main/formats.h"
 #include "brw_context.h"
-#include "intel_mipmap_tree.h"
+#include "brw_mipmap_tree.h"
 
 void brw_init_texture_functions(struct dd_function_table *functions);
 
diff --git a/src/mesa/drivers/dri/i965/intel_tex_copy.c b/src/mesa/drivers/dri/i965/brw_tex_copy.c
similarity index 95%
rename from src/mesa/drivers/dri/i965/intel_tex_copy.c
rename to src/mesa/drivers/dri/i965/brw_tex_copy.c
index 8d5506a334f..26c1fcdb8d8 100644
--- a/src/mesa/drivers/dri/i965/intel_tex_copy.c
+++ b/src/mesa/drivers/dri/i965/brw_tex_copy.c
@@ -33,10 +33,10 @@
 
 #include "drivers/common/meta.h"
 
-#include "intel_screen.h"
-#include "intel_mipmap_tree.h"
-#include "intel_fbo.h"
-#include "intel_tex.h"
+#include "brw_screen.h"
+#include "brw_mipmap_tree.h"
+#include "brw_fbo.h"
+#include "brw_tex.h"
 #include "brw_context.h"
 
 #define FILE_DEBUG_FLAG DEBUG_TEXTURE
diff --git a/src/mesa/drivers/dri/i965/intel_tex_image.c b/src/mesa/drivers/dri/i965/brw_tex_image.c
similarity index 99%
rename from src/mesa/drivers/dri/i965/intel_tex_image.c
rename to src/mesa/drivers/dri/i965/brw_tex_image.c
index 80a3ca37535..57c298c1f19 100644
--- a/src/mesa/drivers/dri/i965/intel_tex_image.c
+++ b/src/mesa/drivers/dri/i965/brw_tex_image.c
@@ -18,12 +18,12 @@
 
 #include "drivers/common/meta.h"
 
-#include "intel_mipmap_tree.h"
-#include "intel_buffer_objects.h"
-#include "intel_batchbuffer.h"
-#include "intel_tex.h"
-#include "intel_fbo.h"
-#include "intel_image.h"
+#include "brw_mipmap_tree.h"
+#include "brw_buffer_objects.h"
+#include "brw_batch.h"
+#include "brw_tex.h"
+#include "brw_fbo.h"
+#include "brw_image.h"
 #include "brw_context.h"
 #include "brw_blorp.h"
 
diff --git a/src/mesa/drivers/dri/i965/intel_tex_obj.h b/src/mesa/drivers/dri/i965/brw_tex_obj.h
similarity index 97%
rename from src/mesa/drivers/dri/i965/intel_tex_obj.h
rename to src/mesa/drivers/dri/i965/brw_tex_obj.h
index 114c948ebbe..794685101d5 100644
--- a/src/mesa/drivers/dri/i965/intel_tex_obj.h
+++ b/src/mesa/drivers/dri/i965/brw_tex_obj.h
@@ -23,8 +23,8 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef _INTEL_TEX_OBJ_H
-#define _INTEL_TEX_OBJ_H
+#ifndef _BRW_TEX_OBJ_H
+#define _BRW_TEX_OBJ_H
 
 #include "swrast/s_context.h"
 
@@ -98,4 +98,4 @@ brw_texture_image(struct gl_texture_image *img)
 }
 #endif
 
-#endif /* _INTEL_TEX_OBJ_H */
+#endif /* _BRW_TEX_OBJ_H */
diff --git a/src/mesa/drivers/dri/i965/intel_tex_validate.c b/src/mesa/drivers/dri/i965/brw_tex_validate.c
similarity index 99%
rename from src/mesa/drivers/dri/i965/intel_tex_validate.c
rename to src/mesa/drivers/dri/i965/brw_tex_validate.c
index 586309bce81..7f07a3594cc 100644
--- a/src/mesa/drivers/dri/i965/intel_tex_validate.c
+++ b/src/mesa/drivers/dri/i965/brw_tex_validate.c
@@ -28,8 +28,8 @@
 #include "main/texobj.h"
 
 #include "brw_context.h"
-#include "intel_mipmap_tree.h"
-#include "intel_tex.h"
+#include "brw_mipmap_tree.h"
+#include "brw_tex.h"
 
 #define FILE_DEBUG_FLAG DEBUG_TEXTURE
 
diff --git a/src/mesa/drivers/dri/i965/intel_upload.c b/src/mesa/drivers/dri/i965/brw_upload.c
similarity index 99%
rename from src/mesa/drivers/dri/i965/intel_upload.c
rename to src/mesa/drivers/dri/i965/brw_upload.c
index a4a353ed069..8f7acf01ca0 100644
--- a/src/mesa/drivers/dri/i965/intel_upload.c
+++ b/src/mesa/drivers/dri/i965/brw_upload.c
@@ -31,7 +31,7 @@
 #include "main/macros.h"
 #include "brw_bufmgr.h"
 #include "brw_context.h"
-#include "intel_buffer_objects.h"
+#include "brw_buffer_objects.h"
 
 void
 brw_upload_finish(struct brw_uploader *upload)
diff --git a/src/mesa/drivers/dri/i965/brw_urb.c b/src/mesa/drivers/dri/i965/brw_urb.c
index 1b10bfc4d67..d54b7f94d46 100644
--- a/src/mesa/drivers/dri/i965/brw_urb.c
+++ b/src/mesa/drivers/dri/i965/brw_urb.c
@@ -31,7 +31,7 @@
 
 
 
-#include "intel_batchbuffer.h"
+#include "brw_batch.h"
 #include "brw_context.h"
 #include "brw_state.h"
 #include "brw_defines.h"
diff --git a/src/mesa/drivers/dri/i965/brw_vs_surface_state.c b/src/mesa/drivers/dri/i965/brw_vs_surface_state.c
index 289c791b872..6fcf9c5660c 100644
--- a/src/mesa/drivers/dri/i965/brw_vs_surface_state.c
+++ b/src/mesa/drivers/dri/i965/brw_vs_surface_state.c
@@ -35,7 +35,7 @@
 
 #include "brw_context.h"
 #include "brw_state.h"
-#include "intel_buffer_objects.h"
+#include "brw_buffer_objects.h"
 
 
 /* Creates a new VS constant buffer reflecting the current VS program's
diff --git a/src/mesa/drivers/dri/i965/brw_wm.c b/src/mesa/drivers/dri/i965/brw_wm.c
index 90a75aac827..15b546dae4f 100644
--- a/src/mesa/drivers/dri/i965/brw_wm.c
+++ b/src/mesa/drivers/dri/i965/brw_wm.c
@@ -33,9 +33,9 @@
 #include "main/framebuffer.h"
 #include "program/prog_parameter.h"
 #include "program/program.h"
-#include "intel_mipmap_tree.h"
-#include "intel_image.h"
-#include "intel_fbo.h"
+#include "brw_mipmap_tree.h"
+#include "brw_image.h"
+#include "brw_fbo.h"
 #include "compiler/brw_nir.h"
 #include "brw_program.h"
 
diff --git a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
index fd020f22df9..fd51efba29e 100644
--- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
+++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
@@ -44,11 +44,11 @@
 
 #include "isl/isl.h"
 
-#include "intel_mipmap_tree.h"
-#include "intel_batchbuffer.h"
-#include "intel_tex.h"
-#include "intel_fbo.h"
-#include "intel_buffer_objects.h"
+#include "brw_mipmap_tree.h"
+#include "brw_batch.h"
+#include "brw_tex.h"
+#include "brw_fbo.h"
+#include "brw_buffer_objects.h"
 
 #include "brw_context.h"
 #include "brw_state.h"
diff --git a/src/mesa/drivers/dri/i965/gen6_clip_state.c b/src/mesa/drivers/dri/i965/gen6_clip_state.c
index 2fffb673bfc..67ab2eaa7e4 100644
--- a/src/mesa/drivers/dri/i965/gen6_clip_state.c
+++ b/src/mesa/drivers/dri/i965/gen6_clip_state.c
@@ -30,7 +30,7 @@
 #include "brw_defines.h"
 #include "compiler/brw_eu_defines.h"
 #include "brw_util.h"
-#include "intel_batchbuffer.h"
+#include "brw_batch.h"
 #include "main/fbobject.h"
 #include "main/framebuffer.h"
 
diff --git a/src/mesa/drivers/dri/i965/gen6_constant_state.c b/src/mesa/drivers/dri/i965/gen6_constant_state.c
index ade6d1af669..54831a2738f 100644
--- a/src/mesa/drivers/dri/i965/gen6_constant_state.c
+++ b/src/mesa/drivers/dri/i965/gen6_constant_state.c
@@ -26,8 +26,8 @@
 #include "brw_state.h"
 #include "brw_defines.h"
 #include "brw_program.h"
-#include "intel_batchbuffer.h"
-#include "intel_buffer_objects.h"
+#include "brw_batch.h"
+#include "brw_buffer_objects.h"
 #include "program/prog_parameter.h"
 #include "main/shaderapi.h"
 
diff --git a/src/mesa/drivers/dri/i965/gen6_multisample_state.c b/src/mesa/drivers/dri/i965/gen6_multisample_state.c
index 785fc21eeaa..df13946643f 100644
--- a/src/mesa/drivers/dri/i965/gen6_multisample_state.c
+++ b/src/mesa/drivers/dri/i965/gen6_multisample_state.c
@@ -21,7 +21,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "intel_batchbuffer.h"
+#include "brw_batch.h"
 
 #include "brw_context.h"
 #include "brw_defines.h"
diff --git a/src/mesa/drivers/dri/i965/gen6_queryobj.c b/src/mesa/drivers/dri/i965/gen6_queryobj.c
index df5a41488a3..965d061c174 100644
--- a/src/mesa/drivers/dri/i965/gen6_queryobj.c
+++ b/src/mesa/drivers/dri/i965/gen6_queryobj.c
@@ -35,8 +35,8 @@
 #include "brw_defines.h"
 #include "brw_state.h"
 #include "perf/gen_perf_regs.h"
-#include "intel_batchbuffer.h"
-#include "intel_buffer_objects.h"
+#include "brw_batch.h"
+#include "brw_buffer_objects.h"
 
 static inline void
 set_query_availability(struct brw_context *brw, struct brw_query_object *query,
diff --git a/src/mesa/drivers/dri/i965/gen6_sampler_state.c b/src/mesa/drivers/dri/i965/gen6_sampler_state.c
index 3f49e3bcc23..f7b47a2f034 100644
--- a/src/mesa/drivers/dri/i965/gen6_sampler_state.c
+++ b/src/mesa/drivers/dri/i965/gen6_sampler_state.c
@@ -28,7 +28,7 @@
 #include "brw_context.h"
 #include "brw_state.h"
 #include "brw_defines.h"
-#include "intel_batchbuffer.h"
+#include "brw_batch.h"
 
 static void
 upload_sampler_state_pointers(struct brw_context *brw)
diff --git a/src/mesa/drivers/dri/i965/gen6_sol.c b/src/mesa/drivers/dri/i965/gen6_sol.c
index d6fa28d32b6..4c70c538fa6 100644
--- a/src/mesa/drivers/dri/i965/gen6_sol.c
+++ b/src/mesa/drivers/dri/i965/gen6_sol.c
@@ -29,7 +29,7 @@
 #include "main/bufferobj.h"
 #include "main/macros.h"
 #include "brw_context.h"
-#include "intel_batchbuffer.h"
+#include "brw_batch.h"
 #include "brw_defines.h"
 #include "brw_state.h"
 #include "main/transformfeedback.h"
diff --git a/src/mesa/drivers/dri/i965/gen6_urb.c b/src/mesa/drivers/dri/i965/gen6_urb.c
index aaff0851d2f..1c9e6e77ed6 100644
--- a/src/mesa/drivers/dri/i965/gen6_urb.c
+++ b/src/mesa/drivers/dri/i965/gen6_urb.c
@@ -26,7 +26,7 @@
  */
 
 #include "main/macros.h"
-#include "intel_batchbuffer.h"
+#include "brw_batch.h"
 #include "brw_context.h"
 #include "brw_state.h"
 #include "brw_defines.h"
diff --git a/src/mesa/drivers/dri/i965/gen7_l3_state.c b/src/mesa/drivers/dri/i965/gen7_l3_state.c
index 9285b337244..6bfe5f89898 100644
--- a/src/mesa/drivers/dri/i965/gen7_l3_state.c
+++ b/src/mesa/drivers/dri/i965/gen7_l3_state.c
@@ -26,7 +26,7 @@
 #include "brw_context.h"
 #include "brw_defines.h"
 #include "brw_state.h"
-#include "intel_batchbuffer.h"
+#include "brw_batch.h"
 
 /**
  * Calculate the desired L3 partitioning based on the current state of the
diff --git a/src/mesa/drivers/dri/i965/gen7_sol_state.c b/src/mesa/drivers/dri/i965/gen7_sol_state.c
index b4aac9f8f05..3fcdb0adf6b 100644
--- a/src/mesa/drivers/dri/i965/gen7_sol_state.c
+++ b/src/mesa/drivers/dri/i965/gen7_sol_state.c
@@ -31,8 +31,8 @@
 #include "brw_context.h"
 #include "brw_state.h"
 #include "brw_defines.h"
-#include "intel_batchbuffer.h"
-#include "intel_buffer_objects.h"
+#include "brw_batch.h"
+#include "brw_buffer_objects.h"
 #include "main/transformfeedback.h"
 
 void
diff --git a/src/mesa/drivers/dri/i965/gen7_urb.c b/src/mesa/drivers/dri/i965/gen7_urb.c
index c945f832500..59ad1080e39 100644
--- a/src/mesa/drivers/dri/i965/gen7_urb.c
+++ b/src/mesa/drivers/dri/i965/gen7_urb.c
@@ -22,7 +22,7 @@
  */
 
 #include "main/macros.h"
-#include "intel_batchbuffer.h"
+#include "brw_batch.h"
 #include "brw_context.h"
 #include "brw_state.h"
 #include "brw_defines.h"
diff --git a/src/mesa/drivers/dri/i965/gen8_depth_state.c b/src/mesa/drivers/dri/i965/gen8_depth_state.c
index 5bc07665814..f217dc327e5 100644
--- a/src/mesa/drivers/dri/i965/gen8_depth_state.c
+++ b/src/mesa/drivers/dri/i965/gen8_depth_state.c
@@ -21,9 +21,9 @@
  * IN THE SOFTWARE.
  */
 
-#include "intel_batchbuffer.h"
-#include "intel_mipmap_tree.h"
-#include "intel_fbo.h"
+#include "brw_batch.h"
+#include "brw_mipmap_tree.h"
+#include "brw_fbo.h"
 #include "brw_context.h"
 #include "brw_state.h"
 #include "brw_defines.h"
diff --git a/src/mesa/drivers/dri/i965/gen8_multisample_state.c b/src/mesa/drivers/dri/i965/gen8_multisample_state.c
index 3afa5862757..04a68758837 100644
--- a/src/mesa/drivers/dri/i965/gen8_multisample_state.c
+++ b/src/mesa/drivers/dri/i965/gen8_multisample_state.c
@@ -21,7 +21,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "intel_batchbuffer.h"
+#include "brw_batch.h"
 
 #include "brw_context.h"
 #include "brw_defines.h"
diff --git a/src/mesa/drivers/dri/i965/genX_blorp_exec.c b/src/mesa/drivers/dri/i965/genX_blorp_exec.c
index 0807e79978e..198d6b7c660 100644
--- a/src/mesa/drivers/dri/i965/genX_blorp_exec.c
+++ b/src/mesa/drivers/dri/i965/genX_blorp_exec.c
@@ -23,9 +23,9 @@
 
 #include <assert.h>
 
-#include "intel_batchbuffer.h"
-#include "intel_mipmap_tree.h"
-#include "intel_fbo.h"
+#include "brw_batch.h"
+#include "brw_mipmap_tree.h"
+#include "brw_fbo.h"
 
 #include "brw_context.h"
 #include "brw_state.h"
diff --git a/src/mesa/drivers/dri/i965/genX_boilerplate.h b/src/mesa/drivers/dri/i965/genX_boilerplate.h
index b4c6d4073cf..b4567df6d5e 100644
--- a/src/mesa/drivers/dri/i965/genX_boilerplate.h
+++ b/src/mesa/drivers/dri/i965/genX_boilerplate.h
@@ -28,7 +28,7 @@
 #include "genxml/gen_macros.h"
 
 #include "brw_context.h"
-#include "intel_batchbuffer.h"
+#include "brw_batch.h"
 
 UNUSED static void *
 emit_dwords(struct brw_context *brw, unsigned n)
diff --git a/src/mesa/drivers/dri/i965/genX_state_upload.c b/src/mesa/drivers/dri/i965/genX_state_upload.c
index e1e619da263..33a429a09f8 100644
--- a/src/mesa/drivers/dri/i965/genX_state_upload.c
+++ b/src/mesa/drivers/dri/i965/genX_state_upload.c
@@ -46,9 +46,9 @@
 #include "brw_wm.h"
 #include "brw_util.h"
 
-#include "intel_batchbuffer.h"
-#include "intel_buffer_objects.h"
-#include "intel_fbo.h"
+#include "brw_batch.h"
+#include "brw_buffer_objects.h"
+#include "brw_fbo.h"
 
 #include "main/enums.h"
 #include "main/fbobject.h"
diff --git a/src/mesa/drivers/dri/i965/hsw_queryobj.c b/src/mesa/drivers/dri/i965/hsw_queryobj.c
index 21495f323a5..81c354b515c 100644
--- a/src/mesa/drivers/dri/i965/hsw_queryobj.c
+++ b/src/mesa/drivers/dri/i965/hsw_queryobj.c
@@ -28,8 +28,8 @@
  */
 #include "brw_context.h"
 #include "brw_defines.h"
-#include "intel_batchbuffer.h"
-#include "intel_buffer_objects.h"
+#include "brw_batch.h"
+#include "brw_buffer_objects.h"
 
 /*
  * GPR0 = 80 * GPR0;
diff --git a/src/mesa/drivers/dri/i965/hsw_sol.c b/src/mesa/drivers/dri/i965/hsw_sol.c
index d4ca01210ce..4186eeb109b 100644
--- a/src/mesa/drivers/dri/i965/hsw_sol.c
+++ b/src/mesa/drivers/dri/i965/hsw_sol.c
@@ -31,8 +31,8 @@
 #include "brw_context.h"
 #include "brw_state.h"
 #include "brw_defines.h"
-#include "intel_batchbuffer.h"
-#include "intel_buffer_objects.h"
+#include "brw_batch.h"
+#include "brw_buffer_objects.h"
 #include "main/transformfeedback.h"
 
 /**
diff --git a/src/mesa/drivers/dri/i965/meson.build b/src/mesa/drivers/dri/i965/meson.build
index f4bdb38ca15..9d44c7f320d 100644
--- a/src/mesa/drivers/dri/i965/meson.build
+++ b/src/mesa/drivers/dri/i965/meson.build
@@ -96,37 +96,37 @@ files_i965 = files(
   'gen8_multisample_state.c',
   'hsw_queryobj.c',
   'hsw_sol.c',
-  'intel_batchbuffer.c',
-  'intel_batchbuffer.h',
-  'intel_blit.c',
-  'intel_blit.h',
-  'intel_buffer_objects.c',
-  'intel_buffer_objects.h',
-  'intel_buffers.c',
-  'intel_buffers.h',
-  'intel_copy_image.c',
-  'intel_extensions.c',
-  'intel_fbo.c',
-  'intel_fbo.h',
-  'intel_image.h',
-  'intel_mipmap_tree.c',
-  'intel_mipmap_tree.h',
-  'intel_pixel_bitmap.c',
-  'intel_pixel.c',
-  'intel_pixel_copy.c',
-  'intel_pixel_draw.c',
-  'intel_pixel.h',
-  'intel_pixel_read.c',
-  'intel_screen.c',
-  'intel_screen.h',
-  'intel_state.c',
-  'intel_tex.c',
-  'intel_tex_copy.c',
-  'intel_tex.h',
-  'intel_tex_image.c',
-  'intel_tex_obj.h',
-  'intel_tex_validate.c',
-  'intel_upload.c',
+  'brw_batch.c',
+  'brw_batch.h',
+  'brw_blit.c',
+  'brw_blit.h',
+  'brw_buffer_objects.c',
+  'brw_buffer_objects.h',
+  'brw_buffers.c',
+  'brw_buffers.h',
+  'brw_copy_image.c',
+  'brw_extensions.c',
+  'brw_fbo.c',
+  'brw_fbo.h',
+  'brw_image.h',
+  'brw_mipmap_tree.c',
+  'brw_mipmap_tree.h',
+  'brw_pixel_bitmap.c',
+  'brw_pixel.c',
+  'brw_pixel_copy.c',
+  'brw_pixel_draw.c',
+  'brw_pixel.h',
+  'brw_pixel_read.c',
+  'brw_screen.c',
+  'brw_screen.h',
+  'brw_state.c',
+  'brw_tex.c',
+  'brw_tex_copy.c',
+  'brw_tex.h',
+  'brw_tex_image.c',
+  'brw_tex_obj.h',
+  'brw_tex_validate.c',
+  'brw_upload.c',
   'libdrm_macros.h',
 )