diff --git a/src/intel/tools/aub_write.c b/src/intel/tools/aub_write.c
index aa99355d89c..ca3592ffdb7 100644
--- a/src/intel/tools/aub_write.c
+++ b/src/intel/tools/aub_write.c
@@ -462,17 +462,17 @@ engine_from_engine_class(enum drm_i915_gem_engine_class engine_class)
 
 static void
 get_context_init(const struct intel_device_info *devinfo,
-                 const struct gen_context_parameters *params,
+                 const struct intel_context_parameters *params,
                  enum drm_i915_gem_engine_class engine_class,
                  uint32_t *data,
                  uint32_t *size)
 {
-   static const gen_context_init_t gfx8_contexts[] = {
+   static const intel_context_init_t gfx8_contexts[] = {
       [I915_ENGINE_CLASS_RENDER] = gfx8_render_context_init,
       [I915_ENGINE_CLASS_COPY] = gfx8_blitter_context_init,
       [I915_ENGINE_CLASS_VIDEO] = gfx8_video_context_init,
    };
-   static const gen_context_init_t gfx10_contexts[] = {
+   static const intel_context_init_t gfx10_contexts[] = {
       [I915_ENGINE_CLASS_RENDER] = gfx10_render_context_init,
       [I915_ENGINE_CLASS_COPY] = gfx10_blitter_context_init,
       [I915_ENGINE_CLASS_VIDEO] = gfx10_video_context_init,
@@ -553,7 +553,7 @@ write_engine_execlist_setup(struct aub_file *aub,
       dword_out(aub, 0);
 
    /* CONTEXT */
-   struct gen_context_parameters params = {
+   struct intel_context_parameters params = {
       .ring_addr = hw_ctx->ring_addr,
       .ring_size = RING_SIZE,
       .pml4_addr = aub->pml4.phys_addr,
diff --git a/src/intel/tools/gfx10_context.h b/src/intel/tools/gfx10_context.h
index 13c016a2fa3..a18278f6baa 100644
--- a/src/intel/tools/gfx10_context.h
+++ b/src/intel/tools/gfx10_context.h
@@ -24,7 +24,7 @@
 #ifndef GFX10_CONTEXT_H
 #define GFX10_CONTEXT_H
 
-static inline void gfx10_render_context_init(const struct gen_context_parameters *params,
+static inline void gfx10_render_context_init(const struct intel_context_parameters *params,
                                              uint32_t *data, uint32_t *size)
 {
    *size = CONTEXT_RENDER_SIZE;
@@ -75,7 +75,7 @@ static inline void gfx10_render_context_init(const struct gen_context_parameters
    *data++ = MI_BATCH_BUFFER_END | 1 /* End Context */;
 }
 
-static inline void gfx10_blitter_context_init(const struct gen_context_parameters *params,
+static inline void gfx10_blitter_context_init(const struct intel_context_parameters *params,
                                               uint32_t *data, uint32_t *size)
 {
    *size = CONTEXT_OTHER_SIZE;
@@ -125,7 +125,7 @@ static inline void gfx10_blitter_context_init(const struct gen_context_parameter
    *data++ = MI_BATCH_BUFFER_END | 1 /* End Context */;
 }
 
-static inline void gfx10_video_context_init(const struct gen_context_parameters *params,
+static inline void gfx10_video_context_init(const struct intel_context_parameters *params,
                                             uint32_t *data, uint32_t *size)
 {
    *size = CONTEXT_OTHER_SIZE;
diff --git a/src/intel/tools/gfx8_context.h b/src/intel/tools/gfx8_context.h
index 7357ea44d90..41eb6436a81 100644
--- a/src/intel/tools/gfx8_context.h
+++ b/src/intel/tools/gfx8_context.h
@@ -24,7 +24,7 @@
 #ifndef GFX8_CONTEXT_H
 #define GFX8_CONTEXT_H
 
-static inline void gfx8_render_context_init(const struct gen_context_parameters *params,
+static inline void gfx8_render_context_init(const struct intel_context_parameters *params,
                                             uint32_t *data, uint32_t *size)
 {
    *size = CONTEXT_RENDER_SIZE;
@@ -73,7 +73,7 @@ static inline void gfx8_render_context_init(const struct gen_context_parameters
    *data++ = MI_BATCH_BUFFER_END;
 }
 
-static inline void gfx8_blitter_context_init(const struct gen_context_parameters *params,
+static inline void gfx8_blitter_context_init(const struct intel_context_parameters *params,
                                              uint32_t *data, uint32_t *size)
 {
    *size = CONTEXT_OTHER_SIZE;
@@ -115,7 +115,7 @@ static inline void gfx8_blitter_context_init(const struct gen_context_parameters
    *data++ = MI_BATCH_BUFFER_END;
 }
 
-static inline void gfx8_video_context_init(const struct gen_context_parameters *params,
+static inline void gfx8_video_context_init(const struct intel_context_parameters *params,
                                            uint32_t *data, uint32_t *size)
 {
    *size = CONTEXT_OTHER_SIZE;
diff --git a/src/intel/tools/intel_context.h b/src/intel/tools/intel_context.h
index 39041408b71..d03c210c607 100644
--- a/src/intel/tools/intel_context.h
+++ b/src/intel/tools/intel_context.h
@@ -90,13 +90,13 @@
    } while (0)
 
 
-struct gen_context_parameters {
+struct intel_context_parameters {
    uint64_t pml4_addr;
    uint64_t ring_addr;
    uint32_t ring_size;
 };
 
-typedef void (*gen_context_init_t)(const struct gen_context_parameters *, uint32_t *, uint32_t *);
+typedef void (*intel_context_init_t)(const struct intel_context_parameters *, uint32_t *, uint32_t *);
 
 #include "gfx8_context.h"
 #include "gfx10_context.h"