diff --git a/cogl/cogl-context.c b/cogl/cogl-context.c
index bc6f34d72..074c3c61c 100644
--- a/cogl/cogl-context.c
+++ b/cogl/cogl-context.c
@@ -132,7 +132,7 @@ cogl_create_context (void)
   _context->opaque_color_pipeline = cogl_pipeline_new ();
   _context->blended_color_pipeline = cogl_pipeline_new ();
   _context->texture_pipeline = cogl_pipeline_new ();
-  _context->arbfp_source_buffer = g_string_new ("");
+  _context->fragment_source_buffer = g_string_new ("");
   _context->source_stack = NULL;
 
   _context->legacy_state_set = 0;
diff --git a/cogl/cogl-context.h b/cogl/cogl-context.h
index 75fcd22ec..3b06f1425 100644
--- a/cogl/cogl-context.h
+++ b/cogl/cogl-context.h
@@ -86,7 +86,7 @@ typedef struct
   CoglPipeline     *opaque_color_pipeline; /* used for set_source_color */
   CoglPipeline     *blended_color_pipeline; /* used for set_source_color */
   CoglPipeline     *texture_pipeline; /* used for set_source_texture */
-  GString          *arbfp_source_buffer;
+  GString          *fragment_source_buffer;
   GList            *source_stack;
 
   int               legacy_state_set;
diff --git a/cogl/cogl-pipeline-arbfp.c b/cogl/cogl-pipeline-arbfp.c
index 97b5e3693..fb2c72ac6 100644
--- a/cogl/cogl-pipeline-arbfp.c
+++ b/cogl/cogl-pipeline-arbfp.c
@@ -396,9 +396,9 @@ _cogl_pipeline_backend_arbfp_start (CoglPipeline *pipeline,
         {
           int i;
 
-          /* We reuse a single grow-only GString for ARBfp code-gen */
-          g_string_set_size (ctx->arbfp_source_buffer, 0);
-          arbfp_program_state->source = ctx->arbfp_source_buffer;
+          /* We reuse a single grow-only GString for code-gen */
+          g_string_set_size (ctx->fragment_source_buffer, 0);
+          arbfp_program_state->source = ctx->fragment_source_buffer;
           g_string_append (arbfp_program_state->source,
                            "!!ARBfp1.0\n"
                            "TEMP output;\n"