diff --git a/PCK-Studio/PckStudio.csproj b/PCK-Studio/PckStudio.csproj
index 6e37cb7e..2394456f 100644
--- a/PCK-Studio/PckStudio.csproj
+++ b/PCK-Studio/PckStudio.csproj
@@ -157,7 +157,7 @@
     <Compile Include="Rendering\FrameBuffer.cs" />
     <Compile Include="Rendering\IndexBuffer.cs" />
     <Compile Include="Rendering\IVertexLayout.cs" />
-    <Compile Include="Rendering\RenderBuffer.cs" />
+    <Compile Include="Rendering\DrawContext.cs" />
     <Compile Include="Rendering\Renderer.cs" />
     <Compile Include="Rendering\GenericMesh.cs" />
     <Compile Include="Rendering\Shader\ShaderProgram.cs" />
diff --git a/PCK-Studio/Rendering/RenderBuffer.cs b/PCK-Studio/Rendering/DrawContext.cs
similarity index 78%
rename from PCK-Studio/Rendering/RenderBuffer.cs
rename to PCK-Studio/Rendering/DrawContext.cs
index 5b53ce77..ff5a1531 100644
--- a/PCK-Studio/Rendering/RenderBuffer.cs
+++ b/PCK-Studio/Rendering/DrawContext.cs
@@ -7,13 +7,13 @@ using OpenTK.Graphics.OpenGL;
 
 namespace PckStudio.Rendering
 {
-    internal class RenderBuffer
+    internal class DrawContext
     {
         internal readonly VertexArray VertexArray;
         internal readonly IndexBuffer IndexBuffer;
         internal readonly PrimitiveType PrimitiveType;
 
-        public RenderBuffer(VertexArray vertexArray, IndexBuffer indexBuffer, PrimitiveType primitiveType)
+        public DrawContext(VertexArray vertexArray, IndexBuffer indexBuffer, PrimitiveType primitiveType)
         {
             VertexArray = vertexArray;
             IndexBuffer = indexBuffer;
diff --git a/PCK-Studio/Rendering/Renderer.cs b/PCK-Studio/Rendering/Renderer.cs
index 5cacd3a7..23377b2b 100644
--- a/PCK-Studio/Rendering/Renderer.cs
+++ b/PCK-Studio/Rendering/Renderer.cs
@@ -15,6 +15,7 @@
  *    misrepresented as being the original software.
  * 3. This notice may not be removed or altered from any source distribution.
 **/
+using System;
 using OpenTK.Graphics.OpenGL;
 using PckStudio.Rendering.Shader;
 
@@ -22,12 +23,12 @@ namespace PckStudio.Rendering
 {
     internal static class Renderer
     {
-        public static void Draw(ShaderProgram shader, RenderBuffer renderBuffer)
+        public static void Draw(ShaderProgram shader, DrawContext context)
         {
             shader.Bind();
-            renderBuffer.VertexArray.Bind();
-            renderBuffer.IndexBuffer.Bind();
-            GL.DrawElements(renderBuffer.PrimitiveType, renderBuffer.IndexBuffer.GetCount(), DrawElementsType.UnsignedInt, 0);
+            context.VertexArray.Bind();
+            context.IndexBuffer.Bind();
+            GL.DrawElements(context.PrimitiveType, context.IndexBuffer.GetCount(), DrawElementsType.UnsignedInt, 0);
         }
     }
 }
diff --git a/PCK-Studio/Rendering/SkinRenderer.cs b/PCK-Studio/Rendering/SkinRenderer.cs
index 84e27dfc..4a4a6537 100644
--- a/PCK-Studio/Rendering/SkinRenderer.cs
+++ b/PCK-Studio/Rendering/SkinRenderer.cs
@@ -145,7 +145,7 @@ namespace PckStudio.Rendering
         private VertexArray framebufferVAO;
 
         private ShaderProgram _skyboxShader;
-        private RenderBuffer _skyboxRenderBuffer;
+        private DrawContext _skyboxRenderBuffer;
         private CubeTexture _skyboxTexture;
         private float skyboxRotation = 0f;
         private float skyboxRotationStep = 0.5f;
@@ -382,7 +382,7 @@ namespace PckStudio.Rendering
                     3, 2, 6,
                     6, 7, 3);
 
-                _skyboxRenderBuffer = new RenderBuffer(skyboxVAO, skybocIBO, PrimitiveType.Triangles);
+                _skyboxRenderBuffer = new DrawContext(skyboxVAO, skybocIBO, PrimitiveType.Triangles);
 
                 skyboxVAO.Unbind();
                 skybocIBO.Unbind();