Index: trunk/tests/cachebuf_test/cachebuf.vert
===================================================================
--- trunk/tests/cachebuf_test/cachebuf.vert	(revision 152)
+++ trunk/tests/cachebuf_test/cachebuf.vert	(revision 161)
@@ -1,10 +1,10 @@
 #version 120
-attribute vec2 coord;
-attribute vec4 color;
-uniform mat4 projection;
+attribute vec2 nv_position;
+attribute vec4 nv_color;
+uniform mat4 nv_projection;
 varying vec4 f_color;
 
 void main(void) {
-	f_color = color;
-	gl_Position = projection * vec4( coord.x, coord.y, 0.0, 1.0 );
+	f_color = nv_color;
+	gl_Position = nv_projection * vec4( nv_position.x, nv_position.y, 0.0, 1.0 );
 }
Index: trunk/tests/cachebuf_test/nv_cachebuf_test.cc
===================================================================
--- trunk/tests/cachebuf_test/nv_cachebuf_test.cc	(revision 152)
+++ trunk/tests/cachebuf_test/nv_cachebuf_test.cc	(revision 161)
@@ -234,6 +234,4 @@
 	nv::vertex_array* m_va;
 	unsigned int m_count;
-	int m_coord_loc;
-	int m_color_loc;
 };
 
@@ -257,6 +255,4 @@
 	{ 
 		m_program   = m_device->create_program( nv::slurp( "cachebuf.vert" ), nv::slurp( "cachebuf.frag" ) );
-		m_coord_loc = m_program->get_attribute("coord")->get_location();
-		m_color_loc = m_program->get_attribute("color")->get_location();
 		m_va        = m_device->create_vertex_array();
 
@@ -270,6 +266,6 @@
 		#endif
 
-		m_va->add_vertex_buffer( m_coord_loc, buffer, nv::INT,   2, 0, sizeof( vertex ), false );
-		m_va->add_vertex_buffer( m_color_loc, buffer, nv::FLOAT, 4, offset_of( &vertex::color ), sizeof( vertex ), false );
+		m_va->add_vertex_buffer( nv::slot::POSITION, buffer, nv::INT,   2, 0, sizeof( vertex ), false );
+		m_va->add_vertex_buffer( nv::slot::COLOR,    buffer, nv::FLOAT, 4, offset_of( &vertex::color ), sizeof( vertex ), false );
 	}
 	return true;
@@ -281,5 +277,5 @@
 	m_program->bind();
 	glm::mat4 projection = glm::ortho( 0.0f, 800.0f, 600.0f, 0.0f, -1.0f, 1.0f );
-	m_program->set_uniform( "projection", glm::mat4(projection) );
+	m_program->set_uniform( "nv_projection", glm::mat4(projection) );
 
 	while(!keypress) 
@@ -297,6 +293,6 @@
 			nv::vertex_buffer* buffer = (nv::vertex_buffer*)m_quad_cache->get_buffer();
 			#endif
-			m_va->update_vertex_buffer( m_coord_loc, buffer, false );
-			m_va->update_vertex_buffer( m_color_loc, buffer, false );
+			m_va->update_vertex_buffer( nv::slot::POSITION, buffer, false );
+			m_va->update_vertex_buffer( nv::slot::COLOR,    buffer, false );
 		}
 
Index: trunk/tests/gui_test/gui.frag
===================================================================
--- trunk/tests/gui_test/gui.frag	(revision 152)
+++ trunk/tests/gui_test/gui.frag	(revision 161)
@@ -1,9 +1,9 @@
 #version 120
-varying vec4 f_color;
-varying vec2 f_tcoord;
+varying vec4 v_color;
+varying vec2 v_texcoord;
 uniform sampler2D tex;
  
 void main(void) {
-	vec4 texture = texture2D(tex,f_tcoord);
-	gl_FragColor = f_color * texture;
+	vec4 texture = texture2D(tex,v_texcoord);
+	gl_FragColor = v_color * texture;
 }
Index: trunk/tests/gui_test/gui.vert
===================================================================
--- trunk/tests/gui_test/gui.vert	(revision 152)
+++ trunk/tests/gui_test/gui.vert	(revision 161)
@@ -1,13 +1,13 @@
 #version 120
-attribute vec2 coord;
-attribute vec2 tcoord;
-attribute vec4 color;
-uniform mat4 projection;
-varying vec4 f_color;
-varying vec2 f_tcoord;
+attribute vec2 nv_position;
+attribute vec2 nv_texcoord;
+attribute vec4 nv_color;
+uniform mat4 nv_projection;
+varying vec4 v_color;
+varying vec2 v_texcoord;
 
 void main(void) {
-	f_color  = color;
-	f_tcoord = tcoord;
-	gl_Position = projection * vec4( coord.x, coord.y, 0.0, 1.0 );
+	v_color     = nv_color;
+	v_texcoord  = nv_texcoord;
+	gl_Position = nv_projection * vec4( nv_position.x, nv_position.y, 0.0, 1.0 );
 }
Index: trunk/tests/objload_test/obj.vert
===================================================================
--- trunk/tests/objload_test/obj.vert	(revision 152)
+++ trunk/tests/objload_test/obj.vert	(revision 161)
@@ -1,7 +1,7 @@
 #version 120
 
-attribute vec3 position;
-attribute vec2 texcoord;
-attribute vec3 normal;
+attribute vec3 nv_position;
+attribute vec2 nv_texcoord;
+attribute vec3 nv_normal;
 
 varying vec3 v_normal;
@@ -17,11 +17,11 @@
 
 void main(void) {
-	vec4 vertex     = vec4( position, 1.0 );
+	vec4 vertex     = vec4( nv_position, 1.0 );
 	vec3 eye_pos    = vec3( nv_m_modelview * vertex );
-	v_normal        = normalize( nv_m_normal * normal );
+	v_normal        = normalize( nv_m_normal * nv_normal );
 	v_light_vector  = vec3( normalize( light_position - eye_pos ) );
 	v_view_vector   = vec3( normalize( -eye_pos ) );
 
-	v_texcoord      = texcoord;
+	v_texcoord      = nv_texcoord;
 	gl_Position     = matrix_mvp * vertex;
 }