diff --git a/src/Buffer.h b/src/Buffer.h
index 72f0d0bf1..cdf9a62bb 100644
--- a/src/Buffer.h
+++ b/src/Buffer.h
@@ -51,54 +51,54 @@ class Buffer {
             /**
              * Set once by the application and used infrequently for drawing.
              */
-            DrawStream = GL_STREAM_DRAW,
+            StreamDraw = GL_STREAM_DRAW,
 
             /**
              * Set once as output from an OpenGL command and used infequently
              * for drawing.
              */
-            ReadStream = GL_STREAM_READ,
+            StreamRead = GL_STREAM_READ,
 
             /**
              * Set once as output from an OpenGL command and used infrequently
              * for drawing or copying to other buffers.
              */
-            CopyStream = GL_STREAM_COPY,
+            StreamCopy = GL_STREAM_COPY,
 
             /**
              * Set once by the application and used frequently for drawing.
              */
-            DrawStatic = GL_STATIC_DRAW,
+            StaticDraw = GL_STATIC_DRAW,
 
             /**
              * Set once as output from an OpenGL command and queried many times
              * by the application.
              */
-            ReadStatic = GL_STATIC_READ,
+            StaticRead = GL_STATIC_READ,
 
             /**
              * Set once as output from an OpenGL command and used frequently
              * for drawing or copying to other buffers.
              */
-            CopyStatic = GL_STATIC_COPY,
+            StaticCopy = GL_STATIC_COPY,
 
             /**
              * Updated frequently by the application and used frequently
              * for drawing or copying to other images.
              */
-            DrawDynamic = GL_DYNAMIC_DRAW,
+            DynamicDraw = GL_DYNAMIC_DRAW,
 
             /**
              * Updated frequently as output from OpenGL command and queried
              * many times from the application.
              */
-            ReadDynamic = GL_DYNAMIC_READ,
+            DynamicRead = GL_DYNAMIC_READ,
 
             /**
              * Updated frequently as output from OpenGL command and used
              * frequently for drawing or copying to other images.
              */
-            CopyDynamic = GL_DYNAMIC_COPY
+            DynamicCopy = GL_DYNAMIC_COPY
         };
 
         /**
diff --git a/src/Primitives/Cube.cpp b/src/Primitives/Cube.cpp
index 923fc2f3d..1cd0bcc46 100644
--- a/src/Primitives/Cube.cpp
+++ b/src/Primitives/Cube.cpp
@@ -49,8 +49,8 @@ const GLubyte Cube::_indices[] = {
 void Cube::build(IndexedMesh* mesh, Buffer* vertexBuffer) {
     prepareMesh(mesh);
 
-    vertexBuffer->setData(sizeof(_vertices), _vertices, Buffer::DrawStatic);
-    mesh->indexBuffer()->setData(sizeof(_indices), _indices, Buffer::DrawStatic);
+    vertexBuffer->setData(sizeof(_vertices), _vertices, Buffer::StaticDraw);
+    mesh->indexBuffer()->setData(sizeof(_indices), _indices, Buffer::StaticDraw);
 }
 
 }}
diff --git a/src/Primitives/Icosphere.h b/src/Primitives/Icosphere.h
index 34aa640e0..92707846f 100644
--- a/src/Primitives/Icosphere.h
+++ b/src/Primitives/Icosphere.h
@@ -54,7 +54,7 @@ template<size_t subdivisions> class Icosphere: public AbstractPrimitive<typename
 
         inline void build(IndexedMesh* mesh, Buffer* vertexBuffer) {
             /* mesh is prepared by the builder, no need to call prepareMesh */
-            builder()->build(mesh, vertexBuffer, Buffer::DrawStatic, Buffer::DrawStatic);
+            builder()->build(mesh, vertexBuffer, Buffer::StaticDraw, Buffer::StaticDraw);
         }
 
     private: