diff --git a/src/mesa/main/api_arrayelt.c b/src/mesa/main/api_arrayelt.c
index 474be186c30..b2d7d3eb97d 100644
--- a/src/mesa/main/api_arrayelt.c
+++ b/src/mesa/main/api_arrayelt.c
@@ -1477,7 +1477,7 @@ _mesa_array_element(struct gl_context *ctx, GLint elt)
  * Note: this may be called during display list construction.
  */
 void GLAPIENTRY
-_ae_ArrayElement(GLint elt)
+_mesa_ArrayElement(GLint elt)
 {
    GET_CURRENT_CONTEXT(ctx);
    struct gl_vertex_array_object *vao;
diff --git a/src/mesa/main/api_arrayelt.h b/src/mesa/main/api_arrayelt.h
index b6d1a538dfe..a86eac5a184 100644
--- a/src/mesa/main/api_arrayelt.h
+++ b/src/mesa/main/api_arrayelt.h
@@ -33,6 +33,6 @@
 struct _glapi_table;
 
 extern void _mesa_array_element(struct gl_context *ctx, GLint elt);
-extern void GLAPIENTRY _ae_ArrayElement( GLint elt );
+extern void GLAPIENTRY _mesa_ArrayElement( GLint elt );
 
 #endif /* API_ARRAYELT_H */
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index 02e4d6a653d..cd8e9220f46 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -14473,7 +14473,7 @@ _mesa_install_save_vtxfmt(struct gl_context *ctx)
    struct _glapi_table *tab = ctx->Save;
    assert(ctx->API == API_OPENGL_COMPAT);
 
-#define NAME_AE(x) _ae_##x
+#define NAME_AE(x) _mesa_##x
 #define NAME_CALLLIST(x) save_##x
 #define NAME(x) save_##x
 #define NAME_ES(x) save_##x
diff --git a/src/mesa/vbo/vbo_exec_api.c b/src/mesa/vbo/vbo_exec_api.c
index e52285fee30..1e756d37834 100644
--- a/src/mesa/vbo/vbo_exec_api.c
+++ b/src/mesa/vbo/vbo_exec_api.c
@@ -990,7 +990,7 @@ _mesa_PrimitiveRestartNV(void)
 void
 vbo_install_exec_vtxfmt(struct gl_context *ctx)
 {
-#define NAME_AE(x) _ae_##x
+#define NAME_AE(x) _mesa_##x
 #define NAME_CALLLIST(x) _mesa_##x
 #define NAME(x) _mesa_##x
 #define NAME_ES(x) _es_##x
diff --git a/src/mesa/vbo/vbo_save_api.c b/src/mesa/vbo/vbo_save_api.c
index ab3f8a66478..f828835276c 100644
--- a/src/mesa/vbo/vbo_save_api.c
+++ b/src/mesa/vbo/vbo_save_api.c
@@ -1917,7 +1917,7 @@ save_MultiDrawElementsBaseVertex(GLenum mode, const GLsizei *count,
 static void
 vbo_install_save_vtxfmt(struct gl_context *ctx)
 {
-#define NAME_AE(x) _ae_##x
+#define NAME_AE(x) _mesa_##x
 #define NAME_CALLLIST(x) _save_##x
 #define NAME(x) _save_##x
 #define NAME_ES(x) _save_##x