diff --git a/src/java/org/lwjgl/Sys.java b/src/java/org/lwjgl/Sys.java
index bdaa9381..411f7b0d 100644
--- a/src/java/org/lwjgl/Sys.java
+++ b/src/java/org/lwjgl/Sys.java
@@ -102,7 +102,7 @@ public final class Sys {
 		} finally {
 			DEBUG = _debug;
 			initialize();
-                	NULL = nGetNULLValue();
+			NULL = nGetNULLValue();
 		}
 	}
 	
@@ -129,27 +129,29 @@ public final class Sys {
 		setTime(0);
 	}
 
-        /**
-         * Gets the native NULL constant value
-         */
-        private static native ByteBuffer nGetNULLValue();
+	/**
+	 * Gets the native NULL constant value
+	 */
+	private static native ByteBuffer nGetNULLValue();
 
 	/**
-	 * Create a buffer representing an index into a ARB_vertex_buffer_object buffer.
+	 * Create a buffer representing an integer index. Use it with functions that in C can take
+	 * both a pointer and an integer argument, like the ARB_vertex_buffer_object extension specifies
+	 * gl*Pointer to do (among others).
 	 *
 	 * Example:
 	 *
-	 * ByteBuffer b = Sys.createARBVBOBuffer(0);
+	 * ByteBuffer b = Sys.createIndexBuffer(0);
 	 * gl.glVertexPointer(3, GL.GL_INT, 0, b);
 	 *
 	 * is equivalent to the C call:
 	 *
 	 * glVertexPointer(3, GL.GL_INT, 0, 0);
 	 *
-	 * @param index The VBO index to represent
-	 * @return a ByteBuffer representing the VBO index
+	 * @param index The index to represent
+	 * @return a ByteBuffer representing the index
 	 */
-	public static native ByteBuffer createARBVBOBuffer(int index);
+	public static native ByteBuffer createIndexBuffer(int index);
 
 	/**
 	 * Obtains the number of ticks that the hires timer does in a second.
diff --git a/src/native/common/org_lwjgl_Sys.h b/src/native/common/org_lwjgl_Sys.h
index 6c4b1b5f..664cd451 100644
--- a/src/native/common/org_lwjgl_Sys.h
+++ b/src/native/common/org_lwjgl_Sys.h
@@ -31,10 +31,10 @@ JNIEXPORT jobject JNICALL Java_org_lwjgl_Sys_nGetNULLValue
 
 /*
  * Class:     org_lwjgl_Sys
- * Method:    createARBVBOBuffer
+ * Method:    createIndexBuffer
  * Signature: (I)Ljava/nio/ByteBuffer;
  */
-JNIEXPORT jobject JNICALL Java_org_lwjgl_Sys_createARBVBOBuffer
+JNIEXPORT jobject JNICALL Java_org_lwjgl_Sys_createIndexBuffer
   (JNIEnv *, jclass, jint);
 
 /*
diff --git a/src/native/linux/org_lwjgl_Sys.cpp b/src/native/linux/org_lwjgl_Sys.cpp
index 5acd8fa6..531d8776 100644
--- a/src/native/linux/org_lwjgl_Sys.cpp
+++ b/src/native/linux/org_lwjgl_Sys.cpp
@@ -61,13 +61,13 @@ JNIEXPORT jobject JNICALL Java_org_lwjgl_Sys_nGetNULLValue
 
 /*
  * Class:     org_lwjgl_Sys
- * Method:    createARBVBOBuffer
+ * Method:    createIndexBuffer
  * Signature: (I)Ljava/nio/ByteBuffer;
  */
-JNIEXPORT jobject JNICALL Java_org_lwjgl_Sys_createARBVBOBuffer
-  (JNIEnv *env, jclass clazz, jint address)
+JNIEXPORT jobject JNICALL Java_org_lwjgl_Sys_createIndexBuffer
+  (JNIEnv *env, jclass clazz, jint index)
 {
-	return env->NewDirectByteBuffer((void *)address, 0);
+	return env->NewDirectByteBuffer((void *)index, 0);
 }
   
 /*
diff --git a/src/native/win32/org_lwjgl_Sys.cpp b/src/native/win32/org_lwjgl_Sys.cpp
index 8085c81f..dd70b7af 100644
--- a/src/native/win32/org_lwjgl_Sys.cpp
+++ b/src/native/win32/org_lwjgl_Sys.cpp
@@ -62,13 +62,13 @@ JNIEXPORT jobject JNICALL Java_org_lwjgl_Sys_nGetNULLValue
 
 /*
  * Class:     org_lwjgl_Sys
- * Method:    createARBVBOBuffer
+ * Method:    createIndexBuffer
  * Signature: (I)Ljava/nio/ByteBuffer;
  */
-JNIEXPORT jobject JNICALL Java_org_lwjgl_Sys_createARBVBOBuffer
-  (JNIEnv *env, jclass clazz, jint address)
+JNIEXPORT jobject JNICALL Java_org_lwjgl_Sys_createIndexBuffer
+  (JNIEnv *env, jclass clazz, jint index)
 {
-	return env->NewDirectByteBuffer((void *)address, 0);
+	return env->NewDirectByteBuffer((void *)index, 0);
 }
 
 /*