diff --git a/src/gallium/frontends/dri/dri_context.c b/src/gallium/frontends/dri/dri_context.c
index 95f701dcd94..6b2b2753b86 100644
--- a/src/gallium/frontends/dri/dri_context.c
+++ b/src/gallium/frontends/dri/dri_context.c
@@ -197,7 +197,7 @@ dri_create_context(struct dri_screen *screen,
       }
       goto fail;
    }
-   ctx->st->st_manager_private = (void *) ctx;
+   ctx->st->frontend_context = (void *) ctx;
 
    if (ctx->st->cso_context) {
       ctx->pp = pp_init(ctx->st->pipe, screen->pp_enabled, ctx->st->cso_context,
@@ -345,7 +345,7 @@ dri_get_current(void)
 {
    struct st_context_iface *st = st_api_get_current();
 
-   return (struct dri_context *) st ? st->st_manager_private : NULL;
+   return (struct dri_context *) st ? st->frontend_context : NULL;
 }
 
 /* vim: set sw=3 ts=8 sts=3 expandtab: */
diff --git a/src/gallium/frontends/dri/dri_drawable.c b/src/gallium/frontends/dri/dri_drawable.c
index 07a9ca05c1e..2de80ac2ca5 100644
--- a/src/gallium/frontends/dri/dri_drawable.c
+++ b/src/gallium/frontends/dri/dri_drawable.c
@@ -47,7 +47,7 @@ dri_st_framebuffer_validate(struct st_context_iface *stctx,
                             unsigned count,
                             struct pipe_resource **out)
 {
-   struct dri_context *ctx = (struct dri_context *)stctx->st_manager_private;
+   struct dri_context *ctx = (struct dri_context *)stctx->frontend_context;
    struct dri_drawable *drawable =
       (struct dri_drawable *) stfbi->st_manager_private;
    struct dri_screen *screen = drawable->screen;
@@ -114,7 +114,7 @@ dri_st_framebuffer_flush_front(struct st_context_iface *stctx,
                                struct st_framebuffer_iface *stfbi,
                                enum st_attachment_type statt)
 {
-   struct dri_context *ctx = (struct dri_context *)stctx->st_manager_private;
+   struct dri_context *ctx = (struct dri_context *)stctx->frontend_context;
    struct dri_drawable *drawable =
       (struct dri_drawable *) stfbi->st_manager_private;
 
@@ -129,7 +129,7 @@ static bool
 dri_st_framebuffer_flush_swapbuffers(struct st_context_iface *stctx,
                                      struct st_framebuffer_iface *stfbi)
 {
-   struct dri_context *ctx = (struct dri_context *)stctx->st_manager_private;
+   struct dri_context *ctx = (struct dri_context *)stctx->frontend_context;
    struct dri_drawable *drawable =
       (struct dri_drawable *) stfbi->st_manager_private;
 
diff --git a/src/gallium/frontends/dri/dri_screen.c b/src/gallium/frontends/dri/dri_screen.c
index 235c991cd6a..16c32806bfd 100644
--- a/src/gallium/frontends/dri/dri_screen.c
+++ b/src/gallium/frontends/dri/dri_screen.c
@@ -811,7 +811,7 @@ static void
 dri_set_background_context(struct st_context_iface *st,
                            struct util_queue_monitoring *queue_info)
 {
-   struct dri_context *ctx = (struct dri_context *)st->st_manager_private;
+   struct dri_context *ctx = (struct dri_context *)st->frontend_context;
    const __DRIbackgroundCallableExtension *backgroundCallable =
       ctx->screen->dri2.backgroundCallable;
 
diff --git a/src/gallium/frontends/glx/xlib/xm_api.c b/src/gallium/frontends/glx/xlib/xm_api.c
index fc0987e0e24..cdafc89dc85 100644
--- a/src/gallium/frontends/glx/xlib/xm_api.c
+++ b/src/gallium/frontends/glx/xlib/xm_api.c
@@ -1009,7 +1009,7 @@ XMesaContext XMesaCreateContext( XMesaVisual v, XMesaContext share_list,
    if (c->st == NULL)
       goto no_st;
 
-   c->st->st_manager_private = (void *) c;
+   c->st->frontend_context = (void *) c;
 
    c->hud = hud_create(c->st->cso_context, c->st, NULL);
 
@@ -1318,7 +1318,7 @@ GLboolean XMesaUnbindContext( XMesaContext c )
 XMesaContext XMesaGetCurrentContext( void )
 {
    struct st_context_iface *st = st_api_get_current();
-   return (XMesaContext) (st) ? st->st_manager_private : NULL;
+   return (XMesaContext) (st) ? st->frontend_context : NULL;
 }
 
 
diff --git a/src/gallium/frontends/hgl/hgl.c b/src/gallium/frontends/hgl/hgl.c
index 2b42795c0ee..c3b1cbd9b0c 100644
--- a/src/gallium/frontends/hgl/hgl.c
+++ b/src/gallium/frontends/hgl/hgl.c
@@ -36,7 +36,7 @@ hgl_st_context(struct st_context_iface *stctxi)
 {
 	struct hgl_context* context;
 	assert(stctxi);
-	context = (struct hgl_context*)stctxi->st_manager_private;
+	context = (struct hgl_context*)stctxi->frontend_context;
 	assert(context);
 	return context;
 }
@@ -345,7 +345,7 @@ hgl_create_display(struct pipe_screen* screen)
 	assert(display->fscreen);
 	display->fscreen->screen = screen;
 	display->fscreen->get_param = hgl_st_manager_get_param;
-	// display->manager->st_manager_private is used by llvmpipe
+	// display->fscreen->st_manager_private is used by llvmpipe
 
 	return display;
 }
diff --git a/src/gallium/frontends/osmesa/osmesa.c b/src/gallium/frontends/osmesa/osmesa.c
index fa432fc54d6..aa342c27d0a 100644
--- a/src/gallium/frontends/osmesa/osmesa.c
+++ b/src/gallium/frontends/osmesa/osmesa.c
@@ -686,7 +686,7 @@ OSMesaCreateContextAttribs(const int *attribList, OSMesaContext sharelist)
       return NULL;
    }
 
-   osmesa->stctx->st_manager_private = osmesa;
+   osmesa->stctx->frontend_context = osmesa;
 
    osmesa->format = format;
    osmesa->user_row_length = 0;
@@ -822,7 +822,7 @@ GLAPI OSMesaContext GLAPIENTRY
 OSMesaGetCurrentContext(void)
 {
    struct st_context_iface *st = st_api_get_current();
-   return st ? (OSMesaContext) st->st_manager_private : NULL;
+   return st ? (OSMesaContext) st->frontend_context : NULL;
 }
 
 
diff --git a/src/gallium/frontends/wgl/stw_context.c b/src/gallium/frontends/wgl/stw_context.c
index 7239d3dfd01..bfb06af854e 100644
--- a/src/gallium/frontends/wgl/stw_context.c
+++ b/src/gallium/frontends/wgl/stw_context.c
@@ -56,7 +56,7 @@ stw_current_context(void)
 
    st = (stw_dev) ? st_api_get_current() : NULL;
 
-   return (struct stw_context *) ((st) ? st->st_manager_private : NULL);
+   return (struct stw_context *) ((st) ? st->frontend_context : NULL);
 }
 
 
@@ -246,7 +246,7 @@ stw_create_context_attribs(HDC hdc, INT iLayerPlane, struct stw_context *shareCt
    if (ctx->st == NULL)
       goto no_st_ctx;
 
-   ctx->st->st_manager_private = (void *) ctx;
+   ctx->st->frontend_context = (void *) ctx;
 
    if (ctx->st->cso_context) {
       ctx->hud = hud_create(ctx->st->cso_context, ctx->st, NULL);
diff --git a/src/gallium/include/frontend/api.h b/src/gallium/include/frontend/api.h
index 307b15affb4..693ea83a071 100644
--- a/src/gallium/include/frontend/api.h
+++ b/src/gallium/include/frontend/api.h
@@ -366,12 +366,12 @@ struct st_framebuffer_iface
 struct st_context_iface
 {
    /**
-    * Available for the gallium frontend and the manager to use.
+    * The frontend context. (such as dri_context)
     */
-   void *st_manager_private;
+   void *frontend_context;
 
    /**
-    * The frontend manager that manages this object.
+    * The frontend screen. (such as dri_screen)
     */
    struct pipe_frontend_screen *frontend_screen;
 
diff --git a/src/gallium/targets/haiku-softpipe/GalliumContext.cpp b/src/gallium/targets/haiku-softpipe/GalliumContext.cpp
index 6ddb8be5689..c156e6eb308 100644
--- a/src/gallium/targets/haiku-softpipe/GalliumContext.cpp
+++ b/src/gallium/targets/haiku-softpipe/GalliumContext.cpp
@@ -213,8 +213,8 @@ GalliumContext::CreateContext(HGLWinsysContext *wsContext)
 		return -1;
 	}
 
-	assert(!context->st->st_manager_private);
-	context->st->st_manager_private = (void*)context;
+	assert(!context->st->frontend_context);
+	context->st->frontend_context = (void*)context;
 
 	struct st_context *stContext = (struct st_context*)context->st;