diff --git a/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java b/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java
index 78ecd951..0271f133 100644
--- a/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java
+++ b/src/java/org/lwjgl/util/generator/JavaMethodsGenerator.java
@@ -49,8 +49,9 @@ import com.sun.mirror.declaration.*;
 import com.sun.mirror.type.*;
 
 import java.io.*;
-import java.util.*;
 import java.nio.*;
+import java.util.*;
+import java.util.regex.*;
 
 public class JavaMethodsGenerator {
 	private static final String SAVED_PARAMETER_POSTFIX = "_saved";
@@ -392,36 +393,43 @@ public class JavaMethodsGenerator {
 		return false;
 	}
 
+	private static final Map<String, Pattern> postfixPatterns = new HashMap<String, Pattern>();
+
+	private static Pattern getPostfixPattern(String regex) {
+		Pattern pattern = postfixPatterns.get(regex);
+		if ( pattern == null )
+			postfixPatterns.put(regex, pattern = Pattern.compile(regex));
+		return pattern;
+	}
+
 	private static String getPostfixStrippedName(TypeMap type_map, InterfaceDeclaration interface_decl, MethodDeclaration method) {
 		StripPostfix strip_annotation = method.getAnnotation(StripPostfix.class);
 		ParameterDeclaration postfix_parameter = Utils.findParameter(method, strip_annotation.value());
 		String postfix = strip_annotation.postfix();
-		if ( "NULL".equals(postfix) ) {
+		boolean postfixOverride = !("NULL".equals(postfix) && strip_annotation.hasPostfix());
+		if ( !postfixOverride ) {
 			PostfixTranslator translator = new PostfixTranslator(type_map, postfix_parameter);
 			postfix_parameter.getType().accept(translator);
 			postfix = translator.getSignature();
-		}
+		} else if ( !strip_annotation.hasPostfix() )
+			postfix = "";
+
 		String method_name;
 		Alternate alt_annotation = method.getAnnotation(Alternate.class);
 		method_name = alt_annotation == null || alt_annotation.javaAlt() ? method.getSimpleName() : alt_annotation.value();
 
 		String extension_postfix = "NULL".equals(strip_annotation.extension()) ? getExtensionPostfix(interface_decl) : strip_annotation.extension();
-		String result;
 
-		if ( strip_annotation.hasPostfix() && method_name.endsWith(postfix + "v" + extension_postfix))
-			result = method_name.substring(0, method_name.length() - (postfix.length() + 1 + extension_postfix.length()));
-		else if ( strip_annotation.hasPostfix() && method_name.endsWith(postfix + extension_postfix))
-			result = method_name.substring(0, method_name.length() - (postfix.length() + extension_postfix.length()));
-		else if ( strip_annotation.hasPostfix() && method_name.endsWith(postfix + "i_v" + extension_postfix) )
-			result = method_name.substring(0, method_name.length() - (postfix.length() + 3 + extension_postfix.length()));
-		else if ( method_name.endsWith("i_v" + extension_postfix) )
-			result = method_name.substring(0, method_name.length() - (3 + extension_postfix.length()));
-		else if (method_name.endsWith("v" + extension_postfix))
-			result = method_name.substring(0, method_name.length() - (1 + extension_postfix.length()));
-		else
-			throw new RuntimeException(method + " is specified as being postfix stripped on parameter " + postfix_parameter + ", but it's postfix is not '" + postfix + "' nor 'v'");
+		Matcher matcher = getPostfixPattern(
+			postfixOverride
+				? (postfix + "(?:v)?" + extension_postfix + "$")
+				: ("(?:" + postfix + "(?:v)?|i(?:64)?_v|v)" + extension_postfix + "$")
+		).matcher(method_name);
 
-		return result + extension_postfix;
+		if ( !matcher.find() )
+			throw new RuntimeException(method_name + " is specified as being postfix stripped on parameter " + postfix_parameter + ", but it's postfix is neither '" + postfix + "' nor 'v'");
+
+		return method_name.substring(0, matcher.start()) + extension_postfix;
 	}
 
 	private static int getBufferElementSizeExponent(Class c) {
diff --git a/src/templates/org/lwjgl/opengl/APPLE_object_purgeable.java b/src/templates/org/lwjgl/opengl/APPLE_object_purgeable.java
index 438c972b..faf50f4b 100644
--- a/src/templates/org/lwjgl/opengl/APPLE_object_purgeable.java
+++ b/src/templates/org/lwjgl/opengl/APPLE_object_purgeable.java
@@ -75,7 +75,7 @@ public interface APPLE_object_purgeable {
 
 	@Alternate("glGetObjectParameterivAPPLE")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetObjectParameterivAPPLE2(@GLenum int objectType, @GLuint int name, @GLenum int pname, @OutParameter IntBuffer params);
 
 }
\ No newline at end of file
diff --git a/src/templates/org/lwjgl/opengl/ARB_buffer_object.java b/src/templates/org/lwjgl/opengl/ARB_buffer_object.java
index c6abd554..50ad47df 100644
--- a/src/templates/org/lwjgl/opengl/ARB_buffer_object.java
+++ b/src/templates/org/lwjgl/opengl/ARB_buffer_object.java
@@ -152,7 +152,7 @@ public interface ARB_buffer_object {
 
 	@Alternate("glGetBufferParameterivARB")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetBufferParameterivARB3(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
 
 	@StripPostfix("pointer")
diff --git a/src/templates/org/lwjgl/opengl/ARB_framebuffer_no_attachments.java b/src/templates/org/lwjgl/opengl/ARB_framebuffer_no_attachments.java
index 6efe5c3f..626a2ccc 100644
--- a/src/templates/org/lwjgl/opengl/ARB_framebuffer_no_attachments.java
+++ b/src/templates/org/lwjgl/opengl/ARB_framebuffer_no_attachments.java
@@ -72,7 +72,7 @@ public interface ARB_framebuffer_no_attachments {
 	@Reuse("GL43")
 	@Alternate("glGetFramebufferParameteriv")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetFramebufferParameteriv2(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
 
 	@Dependent("GL_EXT_direct_state_access")
diff --git a/src/templates/org/lwjgl/opengl/ARB_framebuffer_object.java b/src/templates/org/lwjgl/opengl/ARB_framebuffer_object.java
index 06966a5b..2a05cf6b 100644
--- a/src/templates/org/lwjgl/opengl/ARB_framebuffer_object.java
+++ b/src/templates/org/lwjgl/opengl/ARB_framebuffer_object.java
@@ -231,7 +231,7 @@ public interface ARB_framebuffer_object {
 	@Reuse("GL30")
 	@Alternate("glGetRenderbufferParameteriv")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetRenderbufferParameteriv3(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
 
 	@Reuse("GL30")
@@ -297,7 +297,7 @@ public interface ARB_framebuffer_object {
 	@Reuse("GL30")
 	@Alternate("glGetFramebufferAttachmentParameteriv")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetFramebufferAttachmentParameteriv3(@GLenum int target, @GLenum int attachment,
 	                                            @GLenum int pname, @OutParameter IntBuffer params);
 
diff --git a/src/templates/org/lwjgl/opengl/ARB_internalformat_query2.java b/src/templates/org/lwjgl/opengl/ARB_internalformat_query2.java
index 447af7b5..cc344ee1 100644
--- a/src/templates/org/lwjgl/opengl/ARB_internalformat_query2.java
+++ b/src/templates/org/lwjgl/opengl/ARB_internalformat_query2.java
@@ -174,7 +174,7 @@ public interface ARB_internalformat_query2 {
 	@Reuse("GL43")
 	@Alternate("glGetInternalformati64v")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetInternalformati64v2(@GLenum int target, @GLenum int internalformat,
 	                              @GLenum int pname, @Constant("1") @GLsizei int bufSize, @OutParameter @GLint64 LongBuffer params);
 
diff --git a/src/templates/org/lwjgl/opengl/ARB_occlusion_query.java b/src/templates/org/lwjgl/opengl/ARB_occlusion_query.java
index f922a425..ba3c938c 100644
--- a/src/templates/org/lwjgl/opengl/ARB_occlusion_query.java
+++ b/src/templates/org/lwjgl/opengl/ARB_occlusion_query.java
@@ -89,7 +89,7 @@ public interface ARB_occlusion_query {
 
 	@Alternate("glGetQueryivARB")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetQueryivARB3(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
 
 	@StripPostfix("params")
@@ -97,7 +97,7 @@ public interface ARB_occlusion_query {
 
 	@Alternate("glGetQueryObjectivARB")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetQueryObjectivARB2(@GLuint int id, @GLenum int pname, @OutParameter IntBuffer params);
 
 	@StripPostfix("params")
@@ -105,6 +105,6 @@ public interface ARB_occlusion_query {
 
 	@Alternate("glGetQueryObjectuivARB")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetQueryObjectuivARB2(@GLuint int id, @GLenum int pname, @OutParameter IntBuffer params);
 }
diff --git a/src/templates/org/lwjgl/opengl/ARB_program.java b/src/templates/org/lwjgl/opengl/ARB_program.java
index 1ffa342a..ca969dc6 100644
--- a/src/templates/org/lwjgl/opengl/ARB_program.java
+++ b/src/templates/org/lwjgl/opengl/ARB_program.java
@@ -181,7 +181,7 @@ public interface ARB_program {
 
 	@Alternate("glGetProgramivARB")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetProgramivARB3(@GLenum int target, @GLenum int parameterName, @OutParameter IntBuffer params);
 
 	void glGetProgramStringARB(@GLenum int target, @GLenum int parameterName, @OutParameter @Check @GLbyte Buffer paramString);
diff --git a/src/templates/org/lwjgl/opengl/ARB_program_interface_query.java b/src/templates/org/lwjgl/opengl/ARB_program_interface_query.java
index 4a0d0233..3be85384 100644
--- a/src/templates/org/lwjgl/opengl/ARB_program_interface_query.java
+++ b/src/templates/org/lwjgl/opengl/ARB_program_interface_query.java
@@ -105,7 +105,7 @@ public interface ARB_program_interface_query {
 	@Reuse("GL43")
 	@Alternate("glGetProgramInterfaceiv")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetProgramInterfaceiv2(@GLuint int program, @GLenum int programInterface,
 	                              @GLenum int pname, @OutParameter IntBuffer params);
 
diff --git a/src/templates/org/lwjgl/opengl/ARB_sampler_objects.java b/src/templates/org/lwjgl/opengl/ARB_sampler_objects.java
index 24057c1c..516bc21c 100644
--- a/src/templates/org/lwjgl/opengl/ARB_sampler_objects.java
+++ b/src/templates/org/lwjgl/opengl/ARB_sampler_objects.java
@@ -100,7 +100,7 @@ public interface ARB_sampler_objects {
 	@Reuse("GL33")
 	@Alternate("glGetSamplerParameteriv")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetSamplerParameteriv2(@GLuint int sampler, @GLenum int pname, @OutParameter IntBuffer params);
 
 	@Reuse("GL33")
@@ -110,7 +110,7 @@ public interface ARB_sampler_objects {
 	@Reuse("GL33")
 	@Alternate("glGetSamplerParameterfv")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetSamplerParameterfv2(@GLuint int sampler, @GLenum int pname, @OutParameter FloatBuffer params);
 
 	@Reuse("GL33")
@@ -120,7 +120,7 @@ public interface ARB_sampler_objects {
 	@Reuse("GL33")
 	@Alternate("glGetSamplerParameterIiv")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetSamplerParameterIiv2(@GLuint int sampler, @GLenum int pname, @OutParameter IntBuffer params);
 
 	@Reuse("GL33")
@@ -130,7 +130,7 @@ public interface ARB_sampler_objects {
 	@Reuse("GL33")
 	@Alternate("glGetSamplerParameterIuiv")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetSamplerParameterIuiv2(@GLuint int sampler, @GLenum int pname, @OutParameter IntBuffer params);
 
 }
\ No newline at end of file
diff --git a/src/templates/org/lwjgl/opengl/ARB_separate_shader_objects.java b/src/templates/org/lwjgl/opengl/ARB_separate_shader_objects.java
index 7210b54f..f687f28f 100644
--- a/src/templates/org/lwjgl/opengl/ARB_separate_shader_objects.java
+++ b/src/templates/org/lwjgl/opengl/ARB_separate_shader_objects.java
@@ -73,32 +73,32 @@ public interface ARB_separate_shader_objects {
 
 	/** Single null-terminated source code string. */
 	@Reuse("GL41")
-	@StripPostfix(value = "string", postfix = "v")
+	@StripPostfix(value = "string", hasPostfix = false)
 	@GLuint
 	int glCreateShaderProgramv(@GLenum int type, @Constant("1") @GLsizei int count, @NullTerminated @Check @Const @Indirect @GLchar ByteBuffer string);
 
 	/** Multiple null-terminated source code strings, one after the other. */
 	@Reuse("GL41")
 	@Alternate(value = "glCreateShaderProgramv", nativeAlt = true)
-	@StripPostfix(value = "strings", postfix = "v")
+	@StripPostfix(value = "strings", hasPostfix = false)
 	@GLuint
 	int glCreateShaderProgramv2(@GLenum int type, @GLsizei int count, @NullTerminated("count") @Check @Const @Indirect @GLchar @PointerArray("count") ByteBuffer strings);
 
 	@Reuse("GL41")
 	@Alternate(value = "glCreateShaderProgramv", nativeAlt = true)
-	@StripPostfix(value = "strings", postfix = "v")
+	@StripPostfix(value = "strings", hasPostfix = false)
 	@GLuint
 	int glCreateShaderProgramv3(@GLenum int type, @Constant("strings.length") @GLsizei int count, @NullTerminated @Check("1") @PointerArray(value = "count") @Const @NativeType("GLchar") ByteBuffer[] strings);
 
 	@Reuse("GL41")
 	@Alternate("glCreateShaderProgramv")
-	@StripPostfix(value = "string", postfix = "v")
+	@StripPostfix(value = "string", hasPostfix = false)
 	@GLuint
 	int glCreateShaderProgramv(@GLenum int type, @Constant("1") @GLsizei int count, @NullTerminated CharSequence string);
 
 	@Reuse("GL41")
 	@Alternate(value = "glCreateShaderProgramv", nativeAlt = true, skipNative = true)
-	@StripPostfix(value = "strings", postfix = "v")
+	@StripPostfix(value = "strings", hasPostfix = false)
 	@GLuint
 	int glCreateShaderProgramv2(@GLenum int type, @Constant("strings.length") @GLsizei int count,
 	                            @Const @NullTerminated @PointerArray(value = "count") CharSequence[] strings);
@@ -134,7 +134,7 @@ public interface ARB_separate_shader_objects {
 	@Reuse("GL41")
 	@Alternate("glGetProgramPipelineiv")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetProgramPipelineiv2(@GLuint int pipeline, @GLenum int pname, @OutParameter IntBuffer params);
 
 	@Reuse("GL41")
diff --git a/src/templates/org/lwjgl/opengl/ARB_shader_objects.java b/src/templates/org/lwjgl/opengl/ARB_shader_objects.java
index 17e9929f..10e14b2e 100644
--- a/src/templates/org/lwjgl/opengl/ARB_shader_objects.java
+++ b/src/templates/org/lwjgl/opengl/ARB_shader_objects.java
@@ -177,7 +177,7 @@ public interface ARB_shader_objects {
 
 	@Alternate("glGetObjectParameterfvARB")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetObjectParameterfvARB2(@GLhandleARB int obj, @GLenum int pname, @OutParameter FloatBuffer params);
 
 	@StripPostfix("params")
@@ -185,7 +185,7 @@ public interface ARB_shader_objects {
 
 	@Alternate("glGetObjectParameterivARB")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetObjectParameterivARB2(@GLhandleARB int obj, @GLenum int pname, @OutParameter IntBuffer params);
 
 	void glGetInfoLogARB(@GLhandleARB int obj, @AutoSize("infoLog") @GLsizei int maxLength,
diff --git a/src/templates/org/lwjgl/opengl/ARB_shader_subroutine.java b/src/templates/org/lwjgl/opengl/ARB_shader_subroutine.java
index dced7388..84fe1741 100644
--- a/src/templates/org/lwjgl/opengl/ARB_shader_subroutine.java
+++ b/src/templates/org/lwjgl/opengl/ARB_shader_subroutine.java
@@ -82,7 +82,7 @@ public interface ARB_shader_subroutine {
 	@Reuse("GL40")
 	@Alternate("glGetActiveSubroutineUniformiv")
 	@GLreturn("values")
-	@StripPostfix(value = "values", postfix = "v")
+	@StripPostfix(value = "values", hasPostfix = false)
 	void glGetActiveSubroutineUniformiv2(@GLuint int program, @GLenum int shadertype, @GLuint int index, @GLenum int pname,
 	                                     @OutParameter IntBuffer values);
 
@@ -121,7 +121,7 @@ public interface ARB_shader_subroutine {
 	@Reuse("GL40")
 	@Alternate("glGetUniformSubroutineuiv")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetUniformSubroutineuiv2(@GLenum int shadertype, int location, @OutParameter @GLuint IntBuffer params);
 
 	@Reuse("GL40")
@@ -131,7 +131,7 @@ public interface ARB_shader_subroutine {
 	@Reuse("GL40")
 	@Alternate("glGetProgramStageiv")
 	@GLreturn("values")
-	@StripPostfix(value = "values", postfix = "v")
+	@StripPostfix(value = "values", hasPostfix = false)
 	void glGetProgramStageiv2(@GLuint int program, @GLenum int shadertype, @GLenum int pname, @OutParameter IntBuffer values);
 
 }
\ No newline at end of file
diff --git a/src/templates/org/lwjgl/opengl/ARB_shading_language_include.java b/src/templates/org/lwjgl/opengl/ARB_shading_language_include.java
index 7f705d6e..8da81302 100644
--- a/src/templates/org/lwjgl/opengl/ARB_shading_language_include.java
+++ b/src/templates/org/lwjgl/opengl/ARB_shading_language_include.java
@@ -97,12 +97,12 @@ public interface ARB_shading_language_include {
 	void glGetNamedStringivARB(@AutoSize("name") int namelen, @Const @GLchar ByteBuffer name, @GLenum int pname, @OutParameter @Check("1") IntBuffer params);
 
 	@Alternate("glGetNamedStringivARB")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetNamedStringivARB(@Constant("name.length()") int namelen, CharSequence name, @GLenum int pname, @OutParameter @Check("1") IntBuffer params);
 
 	@Alternate("glGetNamedStringivARB")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetNamedStringivARB2(@Constant("name.length()") int namelen, CharSequence name, @GLenum int pname, @OutParameter IntBuffer params);
 
 }
\ No newline at end of file
diff --git a/src/templates/org/lwjgl/opengl/ARB_sync.java b/src/templates/org/lwjgl/opengl/ARB_sync.java
index 6a3d9d2b..64d8c6c8 100644
--- a/src/templates/org/lwjgl/opengl/ARB_sync.java
+++ b/src/templates/org/lwjgl/opengl/ARB_sync.java
@@ -97,7 +97,7 @@ public interface ARB_sync {
 	@Reuse("GL32")
 	@Alternate("glGetInteger64v")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetInteger64v2(@GLenum int pname, @OutParameter @GLint64 LongBuffer params);
 
 	@Reuse("GL32")
@@ -119,7 +119,7 @@ public interface ARB_sync {
 	@Reuse("GL32")
 	@Alternate("glGetSynciv")
 	@GLreturn("values")
-	@StripPostfix(value = "values", postfix = "v")
+	@StripPostfix(value = "values", hasPostfix = false)
 	void glGetSynciv3(@PointerWrapper("GLsync") GLSync sync, @GLenum int pname, @Constant("1") @GLsizei int bufSize,
 	                  @OutParameter @GLsizei @Constant("0L") IntBuffer length,
 	                  @OutParameter IntBuffer values);
diff --git a/src/templates/org/lwjgl/opengl/ARB_timer_query.java b/src/templates/org/lwjgl/opengl/ARB_timer_query.java
index 3deca943..3419905b 100644
--- a/src/templates/org/lwjgl/opengl/ARB_timer_query.java
+++ b/src/templates/org/lwjgl/opengl/ARB_timer_query.java
@@ -63,7 +63,7 @@ public interface ARB_timer_query {
 	@Reuse("GL33")
 	@Alternate("glGetQueryObjecti64v")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetQueryObjecti64v2(@GLuint int id, @GLenum int pname, @OutParameter @GLint64 LongBuffer params);
 
 	@Reuse("GL33")
@@ -73,7 +73,7 @@ public interface ARB_timer_query {
 	@Reuse("GL33")
 	@Alternate("glGetQueryObjectui64v")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetQueryObjectui64v2(@GLuint int id, @GLenum int pname, @OutParameter @GLuint64 LongBuffer params);
 
 }
\ No newline at end of file
diff --git a/src/templates/org/lwjgl/opengl/ARB_transform_feedback3.java b/src/templates/org/lwjgl/opengl/ARB_transform_feedback3.java
index ea09687a..818e9d31 100644
--- a/src/templates/org/lwjgl/opengl/ARB_transform_feedback3.java
+++ b/src/templates/org/lwjgl/opengl/ARB_transform_feedback3.java
@@ -65,7 +65,7 @@ public interface ARB_transform_feedback3 {
 	@Reuse("GL40")
 	@Alternate("glGetQueryIndexediv")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetQueryIndexediv2(@GLenum int target, @GLuint int index, @GLenum int pname, @OutParameter IntBuffer params);
 
 }
\ No newline at end of file
diff --git a/src/templates/org/lwjgl/opengl/ARB_uniform_buffer_object.java b/src/templates/org/lwjgl/opengl/ARB_uniform_buffer_object.java
index 3a6c4985..38d57cd1 100644
--- a/src/templates/org/lwjgl/opengl/ARB_uniform_buffer_object.java
+++ b/src/templates/org/lwjgl/opengl/ARB_uniform_buffer_object.java
@@ -132,7 +132,7 @@ public interface ARB_uniform_buffer_object {
 	@Reuse("GL31")
 	@Alternate("glGetActiveUniformsiv")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetActiveUniformsiv2(@GLuint int program, @Constant("1") @GLsizei int uniformCount,
 	                            @Constant(value = "params.put(1, uniformIndex), 1", keepParam = true) int uniformIndex, // Reuse params buffer
 	                            @GLenum int pname,
@@ -176,7 +176,7 @@ public interface ARB_uniform_buffer_object {
 	@Reuse("GL31")
 	@Alternate("glGetActiveUniformBlockiv")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetActiveUniformBlockiv3(@GLuint int program, @GLuint int uniformBlockIndex, @GLenum int pname,
 	                                @OutParameter @GLint IntBuffer params);
 
diff --git a/src/templates/org/lwjgl/opengl/ATI_vertex_array_object.java b/src/templates/org/lwjgl/opengl/ATI_vertex_array_object.java
index 2fc8a232..43ee583d 100644
--- a/src/templates/org/lwjgl/opengl/ATI_vertex_array_object.java
+++ b/src/templates/org/lwjgl/opengl/ATI_vertex_array_object.java
@@ -75,7 +75,7 @@ public interface ATI_vertex_array_object {
 
 	@Alternate("glGetObjectBufferivATI")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetObjectBufferivATI2(@GLuint int buffer, @GLenum int pname, @OutParameter IntBuffer params);
 
 	void glFreeObjectBufferATI(@GLuint int buffer);
diff --git a/src/templates/org/lwjgl/opengl/EXT_direct_state_access.java b/src/templates/org/lwjgl/opengl/EXT_direct_state_access.java
index 6d141a34..fd464686 100644
--- a/src/templates/org/lwjgl/opengl/EXT_direct_state_access.java
+++ b/src/templates/org/lwjgl/opengl/EXT_direct_state_access.java
@@ -198,7 +198,7 @@ public interface EXT_direct_state_access {
 
 	@Alternate("glGetTextureParameterfvEXT")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetTextureParameterfvEXT2(@GLuint int texture, @GLenum int target, @GLenum int pname, @OutParameter FloatBuffer params);
 
 	@StripPostfix("params")
@@ -206,7 +206,7 @@ public interface EXT_direct_state_access {
 
 	@Alternate("glGetTextureParameterivEXT")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetTextureParameterivEXT2(@GLuint int texture, @GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
 
 	@StripPostfix("params")
@@ -214,7 +214,7 @@ public interface EXT_direct_state_access {
 
 	@Alternate("glGetTextureLevelParameterfvEXT")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetTextureLevelParameterfvEXT2(@GLuint int texture, @GLenum int target, int level, @GLenum int pname, @OutParameter FloatBuffer params);
 
 	@StripPostfix("params")
@@ -222,7 +222,7 @@ public interface EXT_direct_state_access {
 
 	@Alternate("glGetTextureLevelParameterivEXT")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetTextureLevelParameterivEXT2(@GLuint int texture, @GLenum int target, int level, @GLenum int pname, @OutParameter IntBuffer params);
 
 	/*
@@ -438,7 +438,7 @@ public interface EXT_direct_state_access {
 
 	@Alternate("glGetMultiTexParameterfvEXT")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetMultiTexParameterfvEXT2(@GLenum int texunit, @GLenum int target, @GLenum int pname, @OutParameter FloatBuffer params);
 
 	@Dependent("OpenGL13")
@@ -448,7 +448,7 @@ public interface EXT_direct_state_access {
 	@Alternate("glGetMultiTexParameterivEXT")
 	@GLreturn("params")
 	@Dependent("OpenGL13")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetMultiTexParameterivEXT2(@GLenum int texunit, @GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
 
 	@Dependent("OpenGL13")
@@ -458,7 +458,7 @@ public interface EXT_direct_state_access {
 	@Alternate("glGetMultiTexLevelParameterfvEXT")
 	@GLreturn("params")
 	@Dependent("OpenGL13")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetMultiTexLevelParameterfvEXT2(@GLenum int texunit, @GLenum int target, int level, @GLenum int pname, @OutParameter FloatBuffer params);
 
 	@Dependent("OpenGL13")
@@ -468,7 +468,7 @@ public interface EXT_direct_state_access {
 	@Alternate("glGetMultiTexLevelParameterivEXT")
 	@GLreturn("params")
 	@Dependent("OpenGL13")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetMultiTexLevelParameterivEXT2(@GLenum int texunit, @GLenum int target, int level, @GLenum int pname, @OutParameter IntBuffer params);
 
 	@Dependent("OpenGL13")
@@ -590,7 +590,7 @@ public interface EXT_direct_state_access {
 
 	@Optional(reason = "AMD does not expose this (last driver checked: 11.7)")
 	@Dependent("OpenGL30")
-	@StripPostfix(value = "params", hasPostfix = false)
+	@StripPostfix(value = "params", postfix = "i_v")
 	void glGetPointeri_vEXT(@GLenum int pname, @GLuint int index, @Result @GLvoid ByteBuffer params);
 
 	/*
@@ -1094,7 +1094,7 @@ public interface EXT_direct_state_access {
 	@Alternate("glGetTextureParameterIivEXT")
 	@GLreturn("params")
 	@Dependent("GL_EXT_texture_integer")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetTextureParameterIivEXT2(@GLuint int texture, @GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
 
 	@Dependent("GL_EXT_texture_integer")
@@ -1104,7 +1104,7 @@ public interface EXT_direct_state_access {
 	@Alternate("glGetTextureParameterIuivEXT")
 	@GLreturn("params")
 	@Dependent("GL_EXT_texture_integer")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetTextureParameterIuivEXT2(@GLuint int texture, @GLenum int target, @GLenum int pname, @OutParameter @GLuint IntBuffer params);
 
 	/*
@@ -1138,7 +1138,7 @@ public interface EXT_direct_state_access {
 	@Alternate("glGetMultiTexParameterIivEXT")
 	@GLreturn("params")
 	@Dependent("GL_EXT_texture_integer")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetMultiTexParameterIivEXT2(@GLenum int texunit, @GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
 
 	@Dependent("GL_EXT_texture_integer")
@@ -1148,7 +1148,7 @@ public interface EXT_direct_state_access {
 	@Alternate("glGetMultiTexParameterIuivEXT")
 	@GLreturn("params")
 	@Dependent("GL_EXT_texture_integer")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetMultiTexParameterIuivEXT2(@GLenum int texunit, @GLenum int target, @GLenum int pname, @OutParameter @GLuint IntBuffer params);
 
 	/*
@@ -1481,7 +1481,7 @@ public interface EXT_direct_state_access {
 	void glGetVertexArrayIntegeri_vEXT2(@GLuint int vaobj, @GLuint int index, @GLenum int pname, @OutParameter IntBuffer param);
 
 	@Dependent("OpenGL30")
-	@StripPostfix(value = "param")
+	@StripPostfix(value = "param", postfix = "i_v")
 	void glGetVertexArrayPointeri_vEXT(@GLuint int vaobj, @GLuint int index, @GLenum int pname, @Result @GLvoid ByteBuffer param);
 
 	/*
diff --git a/src/templates/org/lwjgl/opengl/EXT_framebuffer_object.java b/src/templates/org/lwjgl/opengl/EXT_framebuffer_object.java
index 261c3df6..8cdbac22 100644
--- a/src/templates/org/lwjgl/opengl/EXT_framebuffer_object.java
+++ b/src/templates/org/lwjgl/opengl/EXT_framebuffer_object.java
@@ -159,7 +159,7 @@ public interface EXT_framebuffer_object {
 
 	@Alternate("glGetRenderbufferParameterivEXT")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetRenderbufferParameterivEXT3(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
 
 	boolean glIsFramebufferEXT(@GLuint int framebuffer);
@@ -201,7 +201,7 @@ public interface EXT_framebuffer_object {
 
 	@Alternate("glGetFramebufferAttachmentParameterivEXT")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetFramebufferAttachmentParameterivEXT3(@GLenum int target, @GLenum int attachment, @GLenum int pname, @OutParameter IntBuffer params);
 
 	void glGenerateMipmapEXT(@GLenum int target);
diff --git a/src/templates/org/lwjgl/opengl/EXT_texture_integer.java b/src/templates/org/lwjgl/opengl/EXT_texture_integer.java
index 0482327f..c4acd1ec 100644
--- a/src/templates/org/lwjgl/opengl/EXT_texture_integer.java
+++ b/src/templates/org/lwjgl/opengl/EXT_texture_integer.java
@@ -117,14 +117,14 @@ public interface EXT_texture_integer {
 	void glTexParameterIivEXT(@GLenum int target, @GLenum int pname, @Check("4") IntBuffer params);
 
 	@Alternate("glTexParameterIivEXT")
-	@StripPostfix(value = "param", postfix = "v")
+	@StripPostfix(value = "param", hasPostfix = false)
 	void glTexParameterIivEXT(@GLenum int target, @GLenum int pname, @Constant(value = "APIUtil.getInt(caps, param)", keepParam = true) int param);
 
 	@StripPostfix("params")
 	void glTexParameterIuivEXT(@GLenum int target, @GLenum int pname, @Check("4") @GLuint IntBuffer params);
 
 	@Alternate("glTexParameterIuivEXT")
-	@StripPostfix(value = "param", postfix = "v")
+	@StripPostfix(value = "param", hasPostfix = false)
 	void glTexParameterIuivEXT(@GLenum int target, @GLenum int pname, @Constant(value = "APIUtil.getInt(caps, param)", keepParam = true) int param);
 
 	@StripPostfix("params")
@@ -132,7 +132,7 @@ public interface EXT_texture_integer {
 
 	@Alternate("glGetTexParameterIivEXT")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetTexParameterIivEXT2(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
 
 	@StripPostfix("params")
@@ -140,7 +140,7 @@ public interface EXT_texture_integer {
 
 	@Alternate("glGetTexParameterIuivEXT")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetTexParameterIuivEXT2(@GLenum int target, @GLenum int pname, @OutParameter @GLuint IntBuffer params);
 
 }
diff --git a/src/templates/org/lwjgl/opengl/GL11.java b/src/templates/org/lwjgl/opengl/GL11.java
index 1d6d871e..7ac22a7c 100644
--- a/src/templates/org/lwjgl/opengl/GL11.java
+++ b/src/templates/org/lwjgl/opengl/GL11.java
@@ -1072,7 +1072,7 @@ public interface GL11 {
 
 	@Alternate("glGetTexParameterfv")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetTexParameterfv2(@GLenum int target, @GLenum int pname, @OutParameter FloatBuffer params);
 
 	@StripPostfix("params")
@@ -1080,7 +1080,7 @@ public interface GL11 {
 
 	@Alternate("glGetTexParameteriv")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetTexParameteriv2(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
 
 	@StripPostfix("params")
@@ -1088,7 +1088,7 @@ public interface GL11 {
 
 	@Alternate("glGetTexLevelParameterfv")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetTexLevelParameterfv2(@GLenum int target, int level, @GLenum int pname, @OutParameter FloatBuffer params);
 
 	@StripPostfix("params")
@@ -1096,7 +1096,7 @@ public interface GL11 {
 
 	@Alternate("glGetTexLevelParameteriv")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetTexLevelParameteriv2(@GLenum int target, int level, @GLenum int pname, @OutParameter IntBuffer params);
 
 	void glGetTexImage(@GLenum int target, int level, @GLenum int format, @GLenum int type,
@@ -1115,7 +1115,7 @@ public interface GL11 {
 
 	@Alternate("glGetTexGeniv")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	@DeprecatedGL
 	void glGetTexGeniv2(@GLenum int coord, @GLenum int pname, @OutParameter IntBuffer params);
 
@@ -1125,7 +1125,7 @@ public interface GL11 {
 
 	@Alternate("glGetTexGenfv")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	@DeprecatedGL
 	void glGetTexGenfv2(@GLenum int coord, @GLenum int pname, @OutParameter FloatBuffer params);
 
@@ -1135,7 +1135,7 @@ public interface GL11 {
 
 	@Alternate("glGetTexGendv")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	@DeprecatedGL
 	void glGetTexGendv2(@GLenum int coord, @GLenum int pname, @OutParameter DoubleBuffer params);
 
@@ -1144,7 +1144,7 @@ public interface GL11 {
 
 	@Alternate("glGetTexEnviv")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetTexEnviv2(@GLenum int coord, @GLenum int pname, @OutParameter IntBuffer params);
 
 	@StripPostfix("params")
@@ -1152,7 +1152,7 @@ public interface GL11 {
 
 	@Alternate("glGetTexEnvfv")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetTexEnvfv2(@GLenum int coord, @GLenum int pname, @OutParameter FloatBuffer params);
 
 	@Const
diff --git a/src/templates/org/lwjgl/opengl/GL15.java b/src/templates/org/lwjgl/opengl/GL15.java
index 05b6c9c7..3226110c 100644
--- a/src/templates/org/lwjgl/opengl/GL15.java
+++ b/src/templates/org/lwjgl/opengl/GL15.java
@@ -176,7 +176,7 @@ public interface GL15 {
 
 	@Alternate("glGetBufferParameteriv")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetBufferParameteriv3(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
 
 	@StripPostfix("pointer")
@@ -234,7 +234,7 @@ public interface GL15 {
 
 	@Alternate("glGetQueryiv")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetQueryiv3(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
 
 	@StripPostfix("params")
@@ -242,7 +242,7 @@ public interface GL15 {
 
 	@Alternate("glGetQueryObjectiv")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetQueryObjectiv2(@GLenum int id, @GLenum int pname, @OutParameter @GLint IntBuffer params);
 
 	@StripPostfix("params")
@@ -250,6 +250,6 @@ public interface GL15 {
 
 	@Alternate("glGetQueryObjectuiv")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetQueryObjectuiv2(@GLenum int id, @GLenum int pname, @OutParameter @GLuint IntBuffer params);
 }
diff --git a/src/templates/org/lwjgl/opengl/GL20.java b/src/templates/org/lwjgl/opengl/GL20.java
index b5affff9..880574a5 100644
--- a/src/templates/org/lwjgl/opengl/GL20.java
+++ b/src/templates/org/lwjgl/opengl/GL20.java
@@ -199,7 +199,7 @@ public interface GL20 {
 
 	@Alternate("glGetShaderiv")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetShaderiv3(@GLuint int shader, @GLenum int pname, @OutParameter IntBuffer params);
 
 	@StripPostfix("params")
@@ -215,7 +215,7 @@ public interface GL20 {
 
 	@Alternate("glGetProgramiv")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetProgramiv3(@GLuint int program, @GLenum int pname, @OutParameter IntBuffer params);
 
 	void glGetShaderInfoLog(@GLuint int shader, @AutoSize("infoLog") @GLsizei int maxLength,
diff --git a/src/templates/org/lwjgl/opengl/GL30.java b/src/templates/org/lwjgl/opengl/GL30.java
index cb306de8..b64be52f 100644
--- a/src/templates/org/lwjgl/opengl/GL30.java
+++ b/src/templates/org/lwjgl/opengl/GL30.java
@@ -551,7 +551,7 @@ public interface GL30 {
 
 	@Alternate("glGetRenderbufferParameteriv")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetRenderbufferParameteriv3(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
 
 	boolean glIsFramebuffer(@GLuint int framebuffer);
@@ -593,7 +593,7 @@ public interface GL30 {
 
 	@Alternate("glGetFramebufferAttachmentParameteriv")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetFramebufferAttachmentParameteriv3(@GLenum int target, @GLenum int attachment, @GLenum int pname, @OutParameter IntBuffer params);
 
 	void glGenerateMipmap(@GLenum int target);
@@ -727,14 +727,14 @@ public interface GL30 {
 	void glTexParameterIiv(@GLenum int target, @GLenum int pname, @Check("4") IntBuffer params);
 
 	@Alternate("glTexParameterIiv")
-	@StripPostfix(value = "param", postfix = "v")
+	@StripPostfix(value = "param", hasPostfix = false)
 	void glTexParameterIiv(@GLenum int target, @GLenum int pname, @Constant(value = "APIUtil.getInt(caps, param)", keepParam = true) int param);
 
 	@StripPostfix("params")
 	void glTexParameterIuiv(@GLenum int target, @GLenum int pname, @Check("4") @GLuint IntBuffer params);
 
 	@Alternate("glTexParameterIuiv")
-	@StripPostfix(value = "param", postfix = "v")
+	@StripPostfix(value = "param", hasPostfix = false)
 	void glTexParameterIuiv(@GLenum int target, @GLenum int pname, @Constant(value = "APIUtil.getInt(caps, param)", keepParam = true) int param);
 
 	@StripPostfix("params")
@@ -742,7 +742,7 @@ public interface GL30 {
 
 	@Alternate("glGetTexParameterIiv")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetTexParameterIiv2(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
 
 	@StripPostfix("params")
@@ -750,7 +750,7 @@ public interface GL30 {
 
 	@Alternate("glGetTexParameterIuiv")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetTexParameterIuiv2(@GLenum int target, @GLenum int pname, @OutParameter @GLuint IntBuffer params);
 
 	// -----------------------------------------------------------------
@@ -845,12 +845,12 @@ public interface GL30 {
 
 	void glColorMaski(@GLuint int buf, boolean r, boolean g, boolean b, boolean a);
 
-	@StripPostfix(value = "data", hasPostfix = false)
+	@StripPostfix(value = "data")
 	void glGetBooleani_v(@GLenum int value, @GLuint int index, @OutParameter @Check("4") @GLboolean ByteBuffer data);
 
 	@Alternate("glGetBooleani_v")
 	@GLreturn("data")
-	@StripPostfix(value = "data", hasPostfix = false)
+	@StripPostfix(value = "data")
 	void glGetBooleani_v2(@GLenum int value, @GLuint int index, @OutParameter @GLboolean ByteBuffer data);
 
 	@StripPostfix("data")
diff --git a/src/templates/org/lwjgl/opengl/GL31.java b/src/templates/org/lwjgl/opengl/GL31.java
index f6325e46..04827b45 100644
--- a/src/templates/org/lwjgl/opengl/GL31.java
+++ b/src/templates/org/lwjgl/opengl/GL31.java
@@ -264,7 +264,7 @@ public interface GL31 {
 
 	@Alternate("glGetActiveUniformsiv")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetActiveUniformsiv2(@GLuint int program, @Constant("1") @GLsizei int uniformCount,
 	                            @Constant(value = "MemoryUtil.getAddress(params.put(1, uniformIndex), 1)", keepParam = true) int uniformIndex, // Reuse params buffer
 	                            @GLenum int pname,
@@ -302,7 +302,7 @@ public interface GL31 {
 
 	@Alternate("glGetActiveUniformBlockiv")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetActiveUniformBlockiv3(@GLuint int program, @GLuint int uniformBlockIndex, @GLenum int pname,
 	                                @OutParameter @GLint IntBuffer params);
 
diff --git a/src/templates/org/lwjgl/opengl/GL32.java b/src/templates/org/lwjgl/opengl/GL32.java
index 7a8701ff..a95519b2 100644
--- a/src/templates/org/lwjgl/opengl/GL32.java
+++ b/src/templates/org/lwjgl/opengl/GL32.java
@@ -67,7 +67,7 @@ public interface GL32 {
 
 	@Alternate("glGetBufferParameteri64v")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetBufferParameteri64v3(@GLenum int target, @GLenum int pname, @OutParameter LongBuffer params);
 
 	// -----------------------------------------------------------------------------
@@ -348,7 +348,7 @@ public interface GL32 {
 
 	@Alternate("glGetSynciv")
 	@GLreturn("values")
-	@StripPostfix(value = "values", postfix = "v")
+	@StripPostfix(value = "values", hasPostfix = false)
 	void glGetSynciv3(@PointerWrapper("GLsync") GLSync sync, @GLenum int pname, @Constant("1") @GLsizei int bufSize,
 	                  @OutParameter @GLsizei @Constant("0L") IntBuffer length,
 	                  @OutParameter IntBuffer values);
diff --git a/src/templates/org/lwjgl/opengl/GL33.java b/src/templates/org/lwjgl/opengl/GL33.java
index 31888828..7149af8a 100644
--- a/src/templates/org/lwjgl/opengl/GL33.java
+++ b/src/templates/org/lwjgl/opengl/GL33.java
@@ -128,7 +128,7 @@ public interface GL33 {
 
 	@Alternate("glGetSamplerParameteriv")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetSamplerParameteriv2(@GLuint int sampler, @GLenum int pname, @OutParameter IntBuffer params);
 
 	@StripPostfix("params")
@@ -136,7 +136,7 @@ public interface GL33 {
 
 	@Alternate("glGetSamplerParameterfv")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetSamplerParameterfv2(@GLuint int sampler, @GLenum int pname, @OutParameter FloatBuffer params);
 
 	@StripPostfix("params")
@@ -144,7 +144,7 @@ public interface GL33 {
 
 	@Alternate("glGetSamplerParameterIiv")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetSamplerParameterIiv2(@GLuint int sampler, @GLenum int pname, @OutParameter IntBuffer params);
 
 	@StripPostfix("params")
@@ -152,7 +152,7 @@ public interface GL33 {
 
 	@Alternate("glGetSamplerParameterIuiv")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetSamplerParameterIuiv2(@GLuint int sampler, @GLenum int pname, @OutParameter IntBuffer params);
 
 	// -------------------------------------------------------------------
@@ -218,7 +218,7 @@ public interface GL33 {
 
 	@Alternate("glGetQueryObjecti64v")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetQueryObjecti64v3(@GLuint int id, @GLenum int pname, @OutParameter @GLint64 LongBuffer params);
 
 	@StripPostfix("params")
@@ -234,7 +234,7 @@ public interface GL33 {
 
 	@Alternate("glGetQueryObjectui64v")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetQueryObjectui64v3(@GLuint int id, @GLenum int pname, @OutParameter @GLuint64 LongBuffer params);
 
 	// --------------------------------------------------------------------
diff --git a/src/templates/org/lwjgl/opengl/GL40.java b/src/templates/org/lwjgl/opengl/GL40.java
index 251b10c1..9dc62df0 100644
--- a/src/templates/org/lwjgl/opengl/GL40.java
+++ b/src/templates/org/lwjgl/opengl/GL40.java
@@ -241,7 +241,7 @@ public interface GL40 {
 
 	@Alternate("glGetActiveSubroutineUniformiv")
 	@GLreturn("values")
-	@StripPostfix(value = "values", postfix = "v")
+	@StripPostfix(value = "values", hasPostfix = false)
 	void glGetActiveSubroutineUniformiv3(@GLuint int program, @GLenum int shadertype, @GLuint int index, @GLenum int pname,
 	                                     @OutParameter IntBuffer values);
 
@@ -281,7 +281,7 @@ public interface GL40 {
 
 	@Alternate("glGetUniformSubroutineuiv")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetUniformSubroutineuiv3(@GLenum int shadertype, int location, @OutParameter @GLuint IntBuffer params);
 
 	@StripPostfix("values")
@@ -297,7 +297,7 @@ public interface GL40 {
 
 	@Alternate("glGetProgramStageiv")
 	@GLreturn("values")
-	@StripPostfix(value = "values", postfix = "v")
+	@StripPostfix(value = "values", hasPostfix = false)
 	void glGetProgramStageiv3(@GLuint int program, @GLenum int shadertype, @GLenum int pname, @OutParameter IntBuffer values);
 
 	// -----------------------------------------------------------------------
@@ -486,7 +486,7 @@ public interface GL40 {
 
 	@Alternate("glGetQueryIndexediv")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetQueryIndexediv3(@GLenum int target, @GLuint int index, @GLenum int pname, @OutParameter IntBuffer params);
 
 }
\ No newline at end of file
diff --git a/src/templates/org/lwjgl/opengl/GL41.java b/src/templates/org/lwjgl/opengl/GL41.java
index 4d977dad..aee6c52f 100644
--- a/src/templates/org/lwjgl/opengl/GL41.java
+++ b/src/templates/org/lwjgl/opengl/GL41.java
@@ -145,28 +145,28 @@ public interface GL41 {
 	void glActiveShaderProgram(@GLuint int pipeline, @GLuint int program);
 
 	/** Single null-terminated source code string. */
-	@StripPostfix(value = "string", postfix = "v")
+	@StripPostfix(value = "string", hasPostfix = false)
 	@GLuint
 	int glCreateShaderProgramv(@GLenum int type, @Constant("1") @GLsizei int count, @NullTerminated @Check @Const @Indirect @GLchar ByteBuffer string);
 
 	/** Multiple null-terminated source code strings, one after the other. */
 	@Alternate(value = "glCreateShaderProgramv", nativeAlt = true)
-	@StripPostfix(value = "strings", postfix = "v")
+	@StripPostfix(value = "strings", hasPostfix = false)
 	@GLuint
 	int glCreateShaderProgramv2(@GLenum int type, @GLsizei int count, @NullTerminated("count") @Check @Const @Indirect @GLchar @PointerArray("count") ByteBuffer strings);
 
 	@Alternate(value = "glCreateShaderProgramv", nativeAlt = true)
-	@StripPostfix(value = "strings", postfix = "v")
+	@StripPostfix(value = "strings", hasPostfix = false)
 	@GLuint
 	int glCreateShaderProgramv3(@GLenum int type, @Constant("strings.length") @GLsizei int count, @NullTerminated @Check("1") @PointerArray(value = "count") @Const @NativeType("GLchar") ByteBuffer[] strings);
 
 	@Alternate("glCreateShaderProgramv")
-	@StripPostfix(value = "string", postfix = "v")
+	@StripPostfix(value = "string", hasPostfix = false)
 	@GLuint
 	int glCreateShaderProgramv(@GLenum int type, @Constant("1") @GLsizei int count, @NullTerminated CharSequence string);
 
 	@Alternate(value = "glCreateShaderProgramv", nativeAlt = true, skipNative = true)
-	@StripPostfix(value = "strings", postfix = "v")
+	@StripPostfix(value = "strings", hasPostfix = false)
 	@GLuint
 	int glCreateShaderProgramv2(@GLenum int type, @Constant("strings.length") @GLsizei int count,
 	                            @Const @NullTerminated @PointerArray(value = "count") CharSequence[] strings);
@@ -191,7 +191,7 @@ public interface GL41 {
 
 	@Alternate("glGetProgramPipelineiv")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetProgramPipelineiv2(@GLuint int pipeline, @GLenum int pname, @OutParameter IntBuffer params);
 
 	void glProgramUniform1i(@GLuint int program, int location, int v0);
diff --git a/src/templates/org/lwjgl/opengl/GL43.java b/src/templates/org/lwjgl/opengl/GL43.java
index 0dc090a5..2aa2ebba 100644
--- a/src/templates/org/lwjgl/opengl/GL43.java
+++ b/src/templates/org/lwjgl/opengl/GL43.java
@@ -389,7 +389,7 @@ public interface GL43 {
 
 	@Alternate("glGetFramebufferParameteriv")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetFramebufferParameteriv2(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
 
 	// -----------------------------------------------------------------------------
@@ -511,7 +511,7 @@ public interface GL43 {
 
 	@Alternate("glGetInternalformati64v")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetInternalformati64v2(@GLenum int target, @GLenum int internalformat,
 	                              @GLenum int pname, @Constant("1") @GLsizei int bufSize, @OutParameter @GLint64 LongBuffer params);
 
@@ -633,7 +633,7 @@ public interface GL43 {
 
 	@Alternate("glGetProgramInterfaceiv")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetProgramInterfaceiv2(@GLuint int program, @GLenum int programInterface,
 	                              @GLenum int pname, @OutParameter IntBuffer params);
 
diff --git a/src/templates/org/lwjgl/opengl/NV_occlusion_query.java b/src/templates/org/lwjgl/opengl/NV_occlusion_query.java
index 6b0ae981..a47cfbf0 100644
--- a/src/templates/org/lwjgl/opengl/NV_occlusion_query.java
+++ b/src/templates/org/lwjgl/opengl/NV_occlusion_query.java
@@ -72,7 +72,7 @@ public interface NV_occlusion_query {
 
 	@Alternate("glGetOcclusionQueryuivNV")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetOcclusionQueryuivNV2(@GLuint int id, @GLenum int pname, @OutParameter @GLuint IntBuffer params);
 
 	@StripPostfix("params")
@@ -80,6 +80,6 @@ public interface NV_occlusion_query {
 
 	@Alternate("glGetOcclusionQueryivNV")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetOcclusionQueryivNV2(@GLuint int id, @GLenum int pname, @OutParameter IntBuffer params);
 }
diff --git a/src/templates/org/lwjgl/opengl/NV_path_rendering.java b/src/templates/org/lwjgl/opengl/NV_path_rendering.java
index 28fd9c05..bffa934a 100644
--- a/src/templates/org/lwjgl/opengl/NV_path_rendering.java
+++ b/src/templates/org/lwjgl/opengl/NV_path_rendering.java
@@ -343,7 +343,7 @@ public interface NV_path_rendering {
 	void glPathParameteriNV(@GLuint int path, @GLenum int pname, int value);
 
 	@StripPostfix("value")
-	void glPathParameterfvNV(@GLuint int path, @GLenum int pname, @Check("4") @Const IntBuffer value);
+	void glPathParameterfvNV(@GLuint int path, @GLenum int pname, @Check("4") @Const FloatBuffer value);
 
 	void glPathParameterfNV(@GLuint int path, @GLenum int pname, float value);
 
@@ -424,14 +424,14 @@ public interface NV_path_rendering {
 
 	@Alternate("glGetPathParameterivNV")
 	@GLreturn("value")
-	@StripPostfix(value = "value", postfix = "v")
+	@StripPostfix(value = "value", hasPostfix = false)
 	void glGetPathParameterivNV2(@GLuint int name, @GLenum int param, @OutParameter IntBuffer value);
 
 	void glGetPathParameterfvNV(@GLuint int name, @GLenum int param, @Check("4") @OutParameter FloatBuffer value);
 
 	@Alternate("glGetPathParameterfvNV")
 	@GLreturn("value")
-	@StripPostfix(value = "value", postfix = "v")
+	@StripPostfix(value = "value", hasPostfix = false)
 	void glGetPathParameterfvNV2(@GLuint int name, @GLenum int param, @OutParameter FloatBuffer value);
 
 	void glGetPathCommandsNV(@GLuint int name, @Check @OutParameter @GLubyte ByteBuffer commands);
@@ -468,7 +468,7 @@ public interface NV_path_rendering {
 
 	@Alternate("glGetPathColorGenivNV")
 	@GLreturn("value")
-	@StripPostfix(value = "value", postfix = "v")
+	@StripPostfix(value = "value", hasPostfix = false)
 	void glGetPathColorGenivNV2(@GLenum int color, @GLenum int pname, @OutParameter IntBuffer value);
 
 	@StripPostfix("value")
@@ -476,7 +476,7 @@ public interface NV_path_rendering {
 
 	@Alternate("glGetPathColorGenfvNV")
 	@GLreturn("value")
-	@StripPostfix(value = "value", postfix = "v")
+	@StripPostfix(value = "value", hasPostfix = false)
 	void glGetPathColorGenfvNV2(@GLenum int color, @GLenum int pname, @OutParameter FloatBuffer value);
 
 	@StripPostfix("value")
@@ -484,7 +484,7 @@ public interface NV_path_rendering {
 
 	@Alternate("glGetPathTexGenivNV")
 	@GLreturn("value")
-	@StripPostfix(value = "value", postfix = "v")
+	@StripPostfix(value = "value", hasPostfix = false)
 	void glGetPathTexGenivNV2(@GLenum int texCoordSet, @GLenum int pname, @OutParameter IntBuffer value);
 
 	@StripPostfix("value")
@@ -492,7 +492,7 @@ public interface NV_path_rendering {
 
 	@Alternate("glGetPathTexGenfvNV")
 	@GLreturn("value")
-	@StripPostfix(value = "value", postfix = "v")
+	@StripPostfix(value = "value", hasPostfix = false)
 	void glGetPathTexGenfvNV2(@GLenum int texCoordSet, @GLenum int pname, @OutParameter FloatBuffer value);
 
 	boolean glIsPointInFillPathNV(@GLuint int path,
diff --git a/src/templates/org/lwjgl/opengl/NV_present_video.java b/src/templates/org/lwjgl/opengl/NV_present_video.java
index 17a25749..9fec3aab 100644
--- a/src/templates/org/lwjgl/opengl/NV_present_video.java
+++ b/src/templates/org/lwjgl/opengl/NV_present_video.java
@@ -86,7 +86,7 @@ public interface NV_present_video {
 
 	@Alternate("glGetVideoivNV")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetVideoivNV2(@GLuint int video_slot, @GLenum int pname, @OutParameter IntBuffer params);
 
 	@StripPostfix("params")
@@ -94,7 +94,7 @@ public interface NV_present_video {
 
 	@Alternate("glGetVideouivNV")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetVideouivNV2(@GLuint int video_slot, @GLenum int pname, @OutParameter @GLuint IntBuffer params);
 
 	@StripPostfix("params")
@@ -102,7 +102,7 @@ public interface NV_present_video {
 
 	@Alternate("glGetVideoi64vNV")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetVideoi64vNV2(@GLuint int video_slot, @GLenum int pname, @OutParameter @GLint64EXT LongBuffer params);
 
 	@StripPostfix("params")
@@ -110,7 +110,7 @@ public interface NV_present_video {
 
 	@Alternate("glGetVideoui64vNV")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetVideoui64vNV2(@GLuint int video_slot, @GLenum int pname, @OutParameter @GLuint64EXT LongBuffer params);
 
 }
\ No newline at end of file
diff --git a/src/templates/org/lwjgl/opengl/NV_program.java b/src/templates/org/lwjgl/opengl/NV_program.java
index e47d1959..3ed72ff1 100644
--- a/src/templates/org/lwjgl/opengl/NV_program.java
+++ b/src/templates/org/lwjgl/opengl/NV_program.java
@@ -90,7 +90,7 @@ public interface NV_program {
 
 	@Alternate("glGetProgramivNV")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetProgramivNV3(@GLuint int programID, @GLenum int parameterName, @OutParameter @GLint IntBuffer params);
 
 	void glGetProgramStringNV(@GLuint int programID, @GLenum int parameterName, @OutParameter @Check @GLubyte Buffer paramString);
diff --git a/src/templates/org/lwjgl/opengl/NV_register_combiners.java b/src/templates/org/lwjgl/opengl/NV_register_combiners.java
index 16c2f850..8585b7c3 100644
--- a/src/templates/org/lwjgl/opengl/NV_register_combiners.java
+++ b/src/templates/org/lwjgl/opengl/NV_register_combiners.java
@@ -112,7 +112,7 @@ public interface NV_register_combiners {
 
 	@Alternate("glGetCombinerInputParameterfvNV")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetCombinerInputParameterfvNV2(@GLenum int stage, @GLenum int portion, @GLenum int variable, @GLenum int pname, @OutParameter FloatBuffer params);
 
 	@StripPostfix("params")
@@ -120,7 +120,7 @@ public interface NV_register_combiners {
 
 	@Alternate("glGetCombinerInputParameterivNV")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetCombinerInputParameterivNV2(@GLenum int stage, @GLenum int portion, @GLenum int variable, @GLenum int pname, @OutParameter IntBuffer params);
 
 	@StripPostfix("params")
@@ -128,7 +128,7 @@ public interface NV_register_combiners {
 
 	@Alternate("glGetCombinerOutputParameterfvNV")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetCombinerOutputParameterfvNV2(@GLenum int stage, @GLenum int portion, @GLenum int pname, @OutParameter FloatBuffer params);
 
 	@StripPostfix("params")
@@ -136,7 +136,7 @@ public interface NV_register_combiners {
 
 	@Alternate("glGetCombinerOutputParameterivNV")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetCombinerOutputParameterivNV2(@GLenum int stage, @GLenum int portion, @GLenum int pname, @OutParameter IntBuffer params);
 
 	@StripPostfix("params")
@@ -144,7 +144,7 @@ public interface NV_register_combiners {
 
 	@Alternate("glGetFinalCombinerInputParameterfvNV")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetFinalCombinerInputParameterfvNV2(@GLenum int variable, @GLenum int pname, @OutParameter FloatBuffer params);
 
 	@StripPostfix("params")
@@ -152,6 +152,6 @@ public interface NV_register_combiners {
 
 	@Alternate("glGetFinalCombinerInputParameterivNV")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetFinalCombinerInputParameterivNV2(@GLenum int variable, @GLenum int pname, @OutParameter IntBuffer params);
 }
diff --git a/src/templates/org/lwjgl/opengl/NV_shader_buffer_load.java b/src/templates/org/lwjgl/opengl/NV_shader_buffer_load.java
index 230268c7..566f3f43 100644
--- a/src/templates/org/lwjgl/opengl/NV_shader_buffer_load.java
+++ b/src/templates/org/lwjgl/opengl/NV_shader_buffer_load.java
@@ -68,7 +68,7 @@ public interface NV_shader_buffer_load {
 
 	@Alternate("glGetBufferParameterui64vNV")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetBufferParameterui64vNV2(@GLenum int target, @GLenum int pname, @OutParameter @GLuint64EXT LongBuffer params);
 
 	@StripPostfix("params")
@@ -76,7 +76,7 @@ public interface NV_shader_buffer_load {
 
 	@Alternate("glGetNamedBufferParameterui64vNV")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetNamedBufferParameterui64vNV2(@GLuint int buffer, @GLenum int pname, @OutParameter @GLuint64EXT LongBuffer params);
 
 	@StripPostfix("result")
@@ -84,7 +84,7 @@ public interface NV_shader_buffer_load {
 
 	@Alternate("glGetIntegerui64vNV")
 	@GLreturn("result")
-	@StripPostfix(value = "result", postfix = "v")
+	@StripPostfix(value = "result", hasPostfix = false)
 	void glGetIntegerui64vNV2(@GLenum int value, @OutParameter @GLuint64EXT LongBuffer result);
 
 	void glUniformui64NV(int location, @GLuint64EXT long value);
diff --git a/src/templates/org/lwjgl/opengl/NV_vertex_buffer_unified_memory.java b/src/templates/org/lwjgl/opengl/NV_vertex_buffer_unified_memory.java
index 6039b5f6..005f5617 100644
--- a/src/templates/org/lwjgl/opengl/NV_vertex_buffer_unified_memory.java
+++ b/src/templates/org/lwjgl/opengl/NV_vertex_buffer_unified_memory.java
@@ -102,7 +102,7 @@ public interface NV_vertex_buffer_unified_memory {
 
 	void glVertexAttribIFormatNV(@GLuint int index, int size, @GLenum int type, @GLsizei int stride);
 
-	@StripPostfix("result")
+	@StripPostfix(value = "result", postfix = "i64i_v")
 	void glGetIntegerui64i_vNV(@GLenum int value, @GLuint int index, @OutParameter @Check("1") @GLuint64EXT LongBuffer result);
 
 	@Alternate("glGetIntegerui64i_vNV")
diff --git a/src/templates/org/lwjgl/opengl/NV_video_capture.java b/src/templates/org/lwjgl/opengl/NV_video_capture.java
index 15a6948c..eca1450d 100644
--- a/src/templates/org/lwjgl/opengl/NV_video_capture.java
+++ b/src/templates/org/lwjgl/opengl/NV_video_capture.java
@@ -145,7 +145,7 @@ public interface NV_video_capture {
 
 	@Alternate("glGetVideoCaptureivNV")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetVideoCaptureivNV2(@GLuint int video_capture_slot, @GLenum int pname, @OutParameter IntBuffer params);
 
 	@StripPostfix("params")
@@ -155,7 +155,7 @@ public interface NV_video_capture {
 
 	@Alternate("glGetVideoCaptureStreamivNV")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetVideoCaptureStreamivNV2(@GLuint int video_capture_slot,
 	                                  @GLuint int stream, @GLenum int pname,
 	                                  @OutParameter IntBuffer params);
@@ -167,7 +167,7 @@ public interface NV_video_capture {
 
 	@Alternate("glGetVideoCaptureStreamfvNV")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetVideoCaptureStreamfvNV2(@GLuint int video_capture_slot,
 	                                  @GLuint int stream, @GLenum int pname,
 	                                  @OutParameter FloatBuffer params);
@@ -179,7 +179,7 @@ public interface NV_video_capture {
 
 	@Alternate("glGetVideoCaptureStreamdvNV")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetVideoCaptureStreamdvNV2(@GLuint int video_capture_slot,
 	                                  @GLuint int stream, @GLenum int pname,
 	                                  @OutParameter DoubleBuffer params);
diff --git a/src/templates/org/lwjgl/opengles/APPLE_sync.java b/src/templates/org/lwjgl/opengles/APPLE_sync.java
index e035545a..7fd90187 100644
--- a/src/templates/org/lwjgl/opengles/APPLE_sync.java
+++ b/src/templates/org/lwjgl/opengles/APPLE_sync.java
@@ -94,7 +94,7 @@ public interface APPLE_sync {
 
 	@Alternate("glGetInteger64vAPPLE")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetInteger64vAPPLE2(@GLenum int pname, @OutParameter @GLint64 LongBuffer params);
 
 	@StripPostfix("values")
@@ -104,7 +104,7 @@ public interface APPLE_sync {
 
 	@Alternate("glGetSyncivAPPLE")
 	@GLreturn("values")
-	@StripPostfix(value = "values", postfix = "v")
+	@StripPostfix(value = "values", hasPostfix = false)
 	void glGetSyncivAPPLE2(@PointerWrapper("GLsync") GLSync sync, @GLenum int pname, @Constant("1") @GLsizei int bufSize,
 	                       @OutParameter @GLsizei @Constant("0L") IntBuffer length,
 	                       @OutParameter IntBuffer values);
diff --git a/src/templates/org/lwjgl/opengles/EXT_occlusion_query_boolean.java b/src/templates/org/lwjgl/opengles/EXT_occlusion_query_boolean.java
index 96937718..dacf36b1 100644
--- a/src/templates/org/lwjgl/opengles/EXT_occlusion_query_boolean.java
+++ b/src/templates/org/lwjgl/opengles/EXT_occlusion_query_boolean.java
@@ -80,7 +80,7 @@ public interface EXT_occlusion_query_boolean {
 
 	@Alternate("glGetQueryivEXT")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetQueryivEXT2(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
 
 	@StripPostfix("params")
@@ -88,7 +88,7 @@ public interface EXT_occlusion_query_boolean {
 
 	@Alternate("glGetQueryObjectuivEXT")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetQueryObjectuivEXT2(@GLuint int id, @GLenum int pname, @OutParameter IntBuffer params);
 
 }
\ No newline at end of file
diff --git a/src/templates/org/lwjgl/opengles/EXT_separate_shader_objects.java b/src/templates/org/lwjgl/opengles/EXT_separate_shader_objects.java
index 46c77379..40394783 100644
--- a/src/templates/org/lwjgl/opengles/EXT_separate_shader_objects.java
+++ b/src/templates/org/lwjgl/opengles/EXT_separate_shader_objects.java
@@ -65,28 +65,28 @@ public interface EXT_separate_shader_objects {
 	void glActiveShaderProgramEXT(@GLuint int pipeline, @GLuint int program);
 
 	/** Single null-terminated source code string. */
-	@StripPostfix(value = "string", postfix = "v")
+	@StripPostfix(value = "string", hasPostfix = false)
 	@GLuint
 	int glCreateShaderProgramvEXT(@GLenum int type, @Constant("1") @GLsizei int count, @NullTerminated @Check @Const @Indirect @GLchar ByteBuffer string);
 
 	/** Multiple null-terminated source code strings, one after the other. */
 	@Alternate(value = "glCreateShaderProgramvEXT", nativeAlt = true)
-	@StripPostfix(value = "strings", postfix = "v")
+	@StripPostfix(value = "strings", hasPostfix = false)
 	@GLuint
 	int glCreateShaderProgramvEXT2(@GLenum int type, @GLsizei int count, @NullTerminated("count") @Check @Const @Indirect @GLchar @PointerArray("count") ByteBuffer strings);
 
 	@Alternate(value = "glCreateShaderProgramvEXT", nativeAlt = true)
-	@StripPostfix(value = "strings", postfix = "v")
+	@StripPostfix(value = "strings", hasPostfix = false)
 	@GLuint
 	int glCreateShaderProgramvEXT3(@GLenum int type, @Constant("strings.length") @GLsizei int count, @NullTerminated @Check("1") @PointerArray(value = "count") @Const @NativeType("GLchar") ByteBuffer[] strings);
 
 	@Alternate("glCreateShaderProgramvEXT")
-	@StripPostfix(value = "string", postfix = "v")
+	@StripPostfix(value = "string", hasPostfix = false)
 	@GLuint
 	int glCreateShaderProgramvEXT(@GLenum int type, @Constant("1") @GLsizei int count, @NullTerminated CharSequence string);
 
 	@Alternate(value = "glCreateShaderProgramvEXT", nativeAlt = true, skipNative = true)
-	@StripPostfix(value = "strings", postfix = "v")
+	@StripPostfix(value = "strings", hasPostfix = false)
 	@GLuint
 	int glCreateShaderProgramvEXT2(@GLenum int type, @Constant("strings.length") @GLsizei int count,
 	                               @Const @NullTerminated @PointerArray(value = "count") CharSequence[] strings);
@@ -113,7 +113,7 @@ public interface EXT_separate_shader_objects {
 
 	@Alternate("glGetProgramPipelineivEXT")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetProgramPipelineivEXT2(@GLuint int pipeline, @GLenum int pname, @OutParameter IntBuffer params);
 
 	void glProgramUniform1iEXT(@GLuint int program, int location, int v0);
diff --git a/src/templates/org/lwjgl/opengles/GLES20.java b/src/templates/org/lwjgl/opengles/GLES20.java
index 7be86a68..f0b6a20d 100644
--- a/src/templates/org/lwjgl/opengles/GLES20.java
+++ b/src/templates/org/lwjgl/opengles/GLES20.java
@@ -709,7 +709,7 @@ public interface GLES20 {
 
 	@Alternate("glGetBufferParameteriv")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetBufferParameteriv3(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
 
 	@NoErrorCheck
@@ -737,7 +737,7 @@ public interface GLES20 {
 
 	@Alternate("glGetFramebufferAttachmentParameteriv")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetFramebufferAttachmentParameteriv3(@GLenum int target, @GLenum int attachment, @GLenum int pname, @OutParameter IntBuffer params);
 
 	@StripPostfix("params")
@@ -761,7 +761,7 @@ public interface GLES20 {
 
 	@Alternate("glGetProgramiv")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetProgramiv3(@GLuint int program, @GLenum int pname, @OutParameter IntBuffer params);
 
 	void glGetProgramInfoLog(@GLuint int program, @AutoSize("infoLog") @GLsizei int bufsize,
@@ -787,7 +787,7 @@ public interface GLES20 {
 
 	@Alternate("glGetRenderbufferParameteriv")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetRenderbufferParameteriv3(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
 
 	@StripPostfix("params")
@@ -803,7 +803,7 @@ public interface GLES20 {
 
 	@Alternate("glGetShaderiv")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetShaderiv3(@GLuint int shader, @GLenum int pname, @OutParameter IntBuffer params);
 
 	void glGetShaderInfoLog(@GLuint int shader, @AutoSize("infoLog") @GLsizei int bufsize,
@@ -836,7 +836,7 @@ public interface GLES20 {
 
 	@Alternate("glGetTexParameterfv")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetTexParameterfv2(@GLenum int target, @GLenum int pname, @OutParameter FloatBuffer params);
 
 	@StripPostfix("params")
@@ -844,7 +844,7 @@ public interface GLES20 {
 
 	@Alternate("glGetTexParameteriv")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetTexParameteriv2(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
 
 	@StripPostfix("params")
diff --git a/src/templates/org/lwjgl/opengles/GLES30.java b/src/templates/org/lwjgl/opengles/GLES30.java
index e99cff52..2cdaefc4 100644
--- a/src/templates/org/lwjgl/opengles/GLES30.java
+++ b/src/templates/org/lwjgl/opengles/GLES30.java
@@ -413,7 +413,7 @@ public interface GLES30 {
 
 	@Alternate("glGetQueryiv")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetQueryiv2(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
 
 	@StripPostfix("params")
@@ -421,7 +421,7 @@ public interface GLES30 {
 
 	@Alternate("glGetQueryObjectuiv")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetQueryObjectuiv2(@GLenum int id, @GLenum int pname, @OutParameter @GLuint IntBuffer params);
 
 	boolean glUnmapBuffer(@GLenum int target);
@@ -662,7 +662,7 @@ public interface GLES30 {
 
 	@Alternate("glGetActiveUniformsiv")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetActiveUniformsiv(@GLuint int program, @Constant("1") @GLsizei int uniformCount,
 	                           @Constant(value = "MemoryUtil.getAddress(params.put(1, uniformIndex), 1)", keepParam = true) int uniformIndex, // Reuse params buffer
 	                           @GLenum int pname,
@@ -681,7 +681,7 @@ public interface GLES30 {
 
 	@Alternate("glGetActiveUniformBlockiv")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetActiveUniformBlockiv2(@GLuint int program, @GLuint int uniformBlockIndex, @GLenum int pname,
 	                                @OutParameter @GLint IntBuffer params);
 
@@ -742,7 +742,7 @@ public interface GLES30 {
 
 	@Alternate("glGetSynciv")
 	@GLreturn("values")
-	@StripPostfix(value = "values", postfix = "v")
+	@StripPostfix(value = "values", hasPostfix = false)
 	void glGetSynciv2(@PointerWrapper("GLsync") GLSync sync, @GLenum int pname, @Constant("1") @GLsizei int bufSize,
 	                  @OutParameter @GLsizei @Constant("0L") IntBuffer length,
 	                  @OutParameter IntBuffer values);
@@ -752,7 +752,7 @@ public interface GLES30 {
 
 	@Alternate("glGetBufferParameteri64v")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetBufferParameteri64v2(@GLenum int target, @GLenum int pname, @OutParameter LongBuffer params);
 
 	void glGenSamplers(@AutoSize("samplers") @GLsizei int count, @OutParameter @GLuint IntBuffer samplers);
@@ -785,7 +785,7 @@ public interface GLES30 {
 
 	@Alternate("glGetSamplerParameteriv")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetSamplerParameteriv2(@GLuint int sampler, @GLenum int pname, @OutParameter IntBuffer params);
 
 	@StripPostfix("params")
@@ -793,7 +793,7 @@ public interface GLES30 {
 
 	@Alternate("glGetSamplerParameterfv")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetSamplerParameterfv2(@GLuint int sampler, @GLenum int pname, @OutParameter FloatBuffer params);
 
 	void glVertexAttribDivisor(@GLuint int index, @GLuint int divisor);
diff --git a/src/templates/org/lwjgl/opengles/NV_get_tex_image.java b/src/templates/org/lwjgl/opengles/NV_get_tex_image.java
index 60fea0e6..027fe2d7 100644
--- a/src/templates/org/lwjgl/opengles/NV_get_tex_image.java
+++ b/src/templates/org/lwjgl/opengles/NV_get_tex_image.java
@@ -75,7 +75,7 @@ public interface NV_get_tex_image {
 
 	@Alternate("glGetTexLevelParameterfvNV")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetTexLevelParameterfvNV2(@GLenum int target, @GLint int level, @GLenum int pname, @OutParameter @GLfloat FloatBuffer params);
 
 	@StripPostfix("params")
@@ -83,7 +83,7 @@ public interface NV_get_tex_image {
 
 	@Alternate("glGetTexLevelParameterivNV")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetTexLevelParameterivNV2(@GLenum int target, @GLint int level, @GLenum int pname, @OutParameter @GLint IntBuffer params);
 
 }
\ No newline at end of file
diff --git a/src/templates/org/lwjgl/opengles/OES_framebuffer_object.java b/src/templates/org/lwjgl/opengles/OES_framebuffer_object.java
index 6c74f2b7..31da4c1a 100644
--- a/src/templates/org/lwjgl/opengles/OES_framebuffer_object.java
+++ b/src/templates/org/lwjgl/opengles/OES_framebuffer_object.java
@@ -152,7 +152,7 @@ public interface OES_framebuffer_object {
 
 	@Alternate("glGetRenderbufferParameterivOES")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetRenderbufferParameterivOES3(@GLenum int target, @GLenum int pname, @OutParameter IntBuffer params);
 
 	boolean glIsFramebufferOES(@GLuint int framebuffer);
@@ -190,7 +190,7 @@ public interface OES_framebuffer_object {
 
 	@Alternate("glGetFramebufferAttachmentParameterivOES")
 	@GLreturn("params")
-	@StripPostfix(value = "params", postfix = "v")
+	@StripPostfix(value = "params", hasPostfix = false)
 	void glGetFramebufferAttachmentParameterivOES3(@GLenum int target, @GLenum int attachment, @GLenum int pname, @OutParameter IntBuffer params);
 
 	void glGenerateMipmapOES(@GLenum int target);