diff --git a/src/mesa/vbo/vbo_attrib_tmp.h b/src/mesa/vbo/vbo_attrib_tmp.h
index 74174f757d9..2a57f0b2746 100644
--- a/src/mesa/vbo/vbo_attrib_tmp.h
+++ b/src/mesa/vbo/vbo_attrib_tmp.h
@@ -409,7 +409,7 @@ TAG(Indexfv)(const GLfloat * f)
 
 
 static void GLAPIENTRY
-TAG(MultiTexCoord1f)(GLenum target, GLfloat x)
+TAG(MultiTexCoord1fARB)(GLenum target, GLfloat x)
 {
    GET_CURRENT_CONTEXT(ctx);
    GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;
@@ -417,7 +417,7 @@ TAG(MultiTexCoord1f)(GLenum target, GLfloat x)
 }
 
 static void GLAPIENTRY
-TAG(MultiTexCoord1fv)(GLenum target, const GLfloat * v)
+TAG(MultiTexCoord1fvARB)(GLenum target, const GLfloat * v)
 {
    GET_CURRENT_CONTEXT(ctx);
    GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;
@@ -425,7 +425,7 @@ TAG(MultiTexCoord1fv)(GLenum target, const GLfloat * v)
 }
 
 static void GLAPIENTRY
-TAG(MultiTexCoord2f)(GLenum target, GLfloat x, GLfloat y)
+TAG(MultiTexCoord2fARB)(GLenum target, GLfloat x, GLfloat y)
 {
    GET_CURRENT_CONTEXT(ctx);
    GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;
@@ -433,7 +433,7 @@ TAG(MultiTexCoord2f)(GLenum target, GLfloat x, GLfloat y)
 }
 
 static void GLAPIENTRY
-TAG(MultiTexCoord2fv)(GLenum target, const GLfloat * v)
+TAG(MultiTexCoord2fvARB)(GLenum target, const GLfloat * v)
 {
    GET_CURRENT_CONTEXT(ctx);
    GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;
@@ -441,7 +441,7 @@ TAG(MultiTexCoord2fv)(GLenum target, const GLfloat * v)
 }
 
 static void GLAPIENTRY
-TAG(MultiTexCoord3f)(GLenum target, GLfloat x, GLfloat y, GLfloat z)
+TAG(MultiTexCoord3fARB)(GLenum target, GLfloat x, GLfloat y, GLfloat z)
 {
    GET_CURRENT_CONTEXT(ctx);
    GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;
@@ -449,7 +449,7 @@ TAG(MultiTexCoord3f)(GLenum target, GLfloat x, GLfloat y, GLfloat z)
 }
 
 static void GLAPIENTRY
-TAG(MultiTexCoord3fv)(GLenum target, const GLfloat * v)
+TAG(MultiTexCoord3fvARB)(GLenum target, const GLfloat * v)
 {
    GET_CURRENT_CONTEXT(ctx);
    GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;
@@ -457,7 +457,7 @@ TAG(MultiTexCoord3fv)(GLenum target, const GLfloat * v)
 }
 
 static void GLAPIENTRY
-TAG(MultiTexCoord4f)(GLenum target, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
+TAG(MultiTexCoord4fARB)(GLenum target, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
    GET_CURRENT_CONTEXT(ctx);
    GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;
@@ -465,7 +465,7 @@ TAG(MultiTexCoord4f)(GLenum target, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 }
 
 static void GLAPIENTRY
-TAG(MultiTexCoord4fv)(GLenum target, const GLfloat * v)
+TAG(MultiTexCoord4fvARB)(GLenum target, const GLfloat * v)
 {
    GET_CURRENT_CONTEXT(ctx);
    GLuint attr = (target & 0x7) + VBO_ATTRIB_TEX0;
@@ -575,7 +575,7 @@ TAG(VertexAttrib4fvARB)(GLuint index, const GLfloat * v)
  * XXX: the integers just get converted to floats at this time
  */
 static void GLAPIENTRY
-TAG(VertexAttribI1i)(GLuint index, GLint x)
+TAG(VertexAttribI1iEXT)(GLuint index, GLint x)
 {
    GET_CURRENT_CONTEXT(ctx);
    if (is_vertex_position(ctx, index))
@@ -587,7 +587,7 @@ TAG(VertexAttribI1i)(GLuint index, GLint x)
 }
 
 static void GLAPIENTRY
-TAG(VertexAttribI2i)(GLuint index, GLint x, GLint y)
+TAG(VertexAttribI2iEXT)(GLuint index, GLint x, GLint y)
 {
    GET_CURRENT_CONTEXT(ctx);
    if (is_vertex_position(ctx, index))
@@ -599,7 +599,7 @@ TAG(VertexAttribI2i)(GLuint index, GLint x, GLint y)
 }
 
 static void GLAPIENTRY
-TAG(VertexAttribI3i)(GLuint index, GLint x, GLint y, GLint z)
+TAG(VertexAttribI3iEXT)(GLuint index, GLint x, GLint y, GLint z)
 {
    GET_CURRENT_CONTEXT(ctx);
    if (is_vertex_position(ctx, index))
@@ -611,7 +611,7 @@ TAG(VertexAttribI3i)(GLuint index, GLint x, GLint y, GLint z)
 }
 
 static void GLAPIENTRY
-TAG(VertexAttribI4i)(GLuint index, GLint x, GLint y, GLint z, GLint w)
+TAG(VertexAttribI4iEXT)(GLuint index, GLint x, GLint y, GLint z, GLint w)
 {
    GET_CURRENT_CONTEXT(ctx);
    if (is_vertex_position(ctx, index))
@@ -623,7 +623,7 @@ TAG(VertexAttribI4i)(GLuint index, GLint x, GLint y, GLint z, GLint w)
 }
 
 static void GLAPIENTRY
-TAG(VertexAttribI2iv)(GLuint index, const GLint *v)
+TAG(VertexAttribI2ivEXT)(GLuint index, const GLint *v)
 {
    GET_CURRENT_CONTEXT(ctx);
    if (is_vertex_position(ctx, index))
@@ -635,7 +635,7 @@ TAG(VertexAttribI2iv)(GLuint index, const GLint *v)
 }
 
 static void GLAPIENTRY
-TAG(VertexAttribI3iv)(GLuint index, const GLint *v)
+TAG(VertexAttribI3ivEXT)(GLuint index, const GLint *v)
 {
    GET_CURRENT_CONTEXT(ctx);
    if (is_vertex_position(ctx, index))
@@ -647,7 +647,7 @@ TAG(VertexAttribI3iv)(GLuint index, const GLint *v)
 }
 
 static void GLAPIENTRY
-TAG(VertexAttribI4iv)(GLuint index, const GLint *v)
+TAG(VertexAttribI4ivEXT)(GLuint index, const GLint *v)
 {
    GET_CURRENT_CONTEXT(ctx);
    if (is_vertex_position(ctx, index))
@@ -664,7 +664,7 @@ TAG(VertexAttribI4iv)(GLuint index, const GLint *v)
  * XXX: the integers just get converted to floats at this time
  */
 static void GLAPIENTRY
-TAG(VertexAttribI1ui)(GLuint index, GLuint x)
+TAG(VertexAttribI1uiEXT)(GLuint index, GLuint x)
 {
    GET_CURRENT_CONTEXT(ctx);
    if (is_vertex_position(ctx, index))
@@ -676,7 +676,7 @@ TAG(VertexAttribI1ui)(GLuint index, GLuint x)
 }
 
 static void GLAPIENTRY
-TAG(VertexAttribI2ui)(GLuint index, GLuint x, GLuint y)
+TAG(VertexAttribI2uiEXT)(GLuint index, GLuint x, GLuint y)
 {
    GET_CURRENT_CONTEXT(ctx);
    if (is_vertex_position(ctx, index))
@@ -688,7 +688,7 @@ TAG(VertexAttribI2ui)(GLuint index, GLuint x, GLuint y)
 }
 
 static void GLAPIENTRY
-TAG(VertexAttribI3ui)(GLuint index, GLuint x, GLuint y, GLuint z)
+TAG(VertexAttribI3uiEXT)(GLuint index, GLuint x, GLuint y, GLuint z)
 {
    GET_CURRENT_CONTEXT(ctx);
    if (is_vertex_position(ctx, index))
@@ -700,7 +700,7 @@ TAG(VertexAttribI3ui)(GLuint index, GLuint x, GLuint y, GLuint z)
 }
 
 static void GLAPIENTRY
-TAG(VertexAttribI4ui)(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w)
+TAG(VertexAttribI4uiEXT)(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w)
 {
    GET_CURRENT_CONTEXT(ctx);
    if (is_vertex_position(ctx, index))
@@ -712,7 +712,7 @@ TAG(VertexAttribI4ui)(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w)
 }
 
 static void GLAPIENTRY
-TAG(VertexAttribI2uiv)(GLuint index, const GLuint *v)
+TAG(VertexAttribI2uivEXT)(GLuint index, const GLuint *v)
 {
    GET_CURRENT_CONTEXT(ctx);
    if (is_vertex_position(ctx, index))
@@ -724,7 +724,7 @@ TAG(VertexAttribI2uiv)(GLuint index, const GLuint *v)
 }
 
 static void GLAPIENTRY
-TAG(VertexAttribI3uiv)(GLuint index, const GLuint *v)
+TAG(VertexAttribI3uivEXT)(GLuint index, const GLuint *v)
 {
    GET_CURRENT_CONTEXT(ctx);
    if (is_vertex_position(ctx, index))
@@ -736,7 +736,7 @@ TAG(VertexAttribI3uiv)(GLuint index, const GLuint *v)
 }
 
 static void GLAPIENTRY
-TAG(VertexAttribI4uiv)(GLuint index, const GLuint *v)
+TAG(VertexAttribI4uivEXT)(GLuint index, const GLuint *v)
 {
    GET_CURRENT_CONTEXT(ctx);
    if (is_vertex_position(ctx, index))
diff --git a/src/mesa/vbo/vbo_exec_api.c b/src/mesa/vbo/vbo_exec_api.c
index 5d9de39e964..1cef461824f 100644
--- a/src/mesa/vbo/vbo_exec_api.c
+++ b/src/mesa/vbo/vbo_exec_api.c
@@ -1133,7 +1133,7 @@ _es_Normal3f(GLfloat x, GLfloat y, GLfloat z)
 void GLAPIENTRY
 _es_MultiTexCoord4f(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q)
 {
-   vbo_exec_MultiTexCoord4f(target, s, t, r, q);
+   vbo_exec_MultiTexCoord4fARB(target, s, t, r, q);
 }
 
 
diff --git a/src/mesa/vbo/vbo_init_tmp.h b/src/mesa/vbo/vbo_init_tmp.h
index 50064711b0c..2da36adb478 100644
--- a/src/mesa/vbo/vbo_init_tmp.h
+++ b/src/mesa/vbo/vbo_init_tmp.h
@@ -47,14 +47,14 @@ vfmt->Color4f = NAME(Color4f);
 vfmt->Color4fv = NAME(Color4fv);
 vfmt->FogCoordfEXT = NAME(FogCoordfEXT);
 vfmt->FogCoordfvEXT = NAME(FogCoordfvEXT);
-vfmt->MultiTexCoord1fARB = NAME(MultiTexCoord1f);
-vfmt->MultiTexCoord1fvARB = NAME(MultiTexCoord1fv);
-vfmt->MultiTexCoord2fARB = NAME(MultiTexCoord2f);
-vfmt->MultiTexCoord2fvARB = NAME(MultiTexCoord2fv);
-vfmt->MultiTexCoord3fARB = NAME(MultiTexCoord3f);
-vfmt->MultiTexCoord3fvARB = NAME(MultiTexCoord3fv);
-vfmt->MultiTexCoord4fARB = NAME(MultiTexCoord4f);
-vfmt->MultiTexCoord4fvARB = NAME(MultiTexCoord4fv);
+vfmt->MultiTexCoord1fARB = NAME(MultiTexCoord1fARB);
+vfmt->MultiTexCoord1fvARB = NAME(MultiTexCoord1fvARB);
+vfmt->MultiTexCoord2fARB = NAME(MultiTexCoord2fARB);
+vfmt->MultiTexCoord2fvARB = NAME(MultiTexCoord2fvARB);
+vfmt->MultiTexCoord3fARB = NAME(MultiTexCoord3fARB);
+vfmt->MultiTexCoord3fvARB = NAME(MultiTexCoord3fvARB);
+vfmt->MultiTexCoord4fARB = NAME(MultiTexCoord4fARB);
+vfmt->MultiTexCoord4fvARB = NAME(MultiTexCoord4fvARB);
 vfmt->Normal3f = NAME(Normal3f);
 vfmt->Normal3fv = NAME(Normal3fv);
 vfmt->SecondaryColor3fEXT = NAME(SecondaryColor3fEXT);
@@ -152,22 +152,22 @@ vfmt->VertexAttrib4fNV = NAME(VertexAttrib4fNV);
 vfmt->VertexAttrib4fvNV = NAME(VertexAttrib4fvNV);
 
 /* integer-valued */
-vfmt->VertexAttribI1iEXT = NAME(VertexAttribI1i);
-vfmt->VertexAttribI2iEXT = NAME(VertexAttribI2i);
-vfmt->VertexAttribI3iEXT = NAME(VertexAttribI3i);
-vfmt->VertexAttribI4iEXT = NAME(VertexAttribI4i);
-vfmt->VertexAttribI2ivEXT = NAME(VertexAttribI2iv);
-vfmt->VertexAttribI3ivEXT = NAME(VertexAttribI3iv);
-vfmt->VertexAttribI4ivEXT = NAME(VertexAttribI4iv);
+vfmt->VertexAttribI1iEXT = NAME(VertexAttribI1iEXT);
+vfmt->VertexAttribI2iEXT = NAME(VertexAttribI2iEXT);
+vfmt->VertexAttribI3iEXT = NAME(VertexAttribI3iEXT);
+vfmt->VertexAttribI4iEXT = NAME(VertexAttribI4iEXT);
+vfmt->VertexAttribI2ivEXT = NAME(VertexAttribI2ivEXT);
+vfmt->VertexAttribI3ivEXT = NAME(VertexAttribI3ivEXT);
+vfmt->VertexAttribI4ivEXT = NAME(VertexAttribI4ivEXT);
 
 /* unsigned integer-valued */
-vfmt->VertexAttribI1uiEXT = NAME(VertexAttribI1ui);
-vfmt->VertexAttribI2uiEXT = NAME(VertexAttribI2ui);
-vfmt->VertexAttribI3uiEXT = NAME(VertexAttribI3ui);
-vfmt->VertexAttribI4uiEXT = NAME(VertexAttribI4ui);
-vfmt->VertexAttribI2uivEXT = NAME(VertexAttribI2uiv);
-vfmt->VertexAttribI3uivEXT = NAME(VertexAttribI3uiv);
-vfmt->VertexAttribI4uivEXT = NAME(VertexAttribI4uiv);
+vfmt->VertexAttribI1uiEXT = NAME(VertexAttribI1uiEXT);
+vfmt->VertexAttribI2uiEXT = NAME(VertexAttribI2uiEXT);
+vfmt->VertexAttribI3uiEXT = NAME(VertexAttribI3uiEXT);
+vfmt->VertexAttribI4uiEXT = NAME(VertexAttribI4uiEXT);
+vfmt->VertexAttribI2uivEXT = NAME(VertexAttribI2uivEXT);
+vfmt->VertexAttribI3uivEXT = NAME(VertexAttribI3uivEXT);
+vfmt->VertexAttribI4uivEXT = NAME(VertexAttribI4uivEXT);
 
 vfmt->Materialfv = NAME(Materialfv);