diff --git a/src/noggit/ModelInstance.cpp b/src/noggit/ModelInstance.cpp
index 478b681a..ae7d71b5 100644
--- a/src/noggit/ModelInstance.cpp
+++ b/src/noggit/ModelInstance.cpp
@@ -9,7 +9,7 @@
 #include <noggit/ModelInstance.h>
 #include <noggit/WMOInstance.h>
 #include <noggit/ContextObject.hpp>
-#include <opengl/primitives.hpp>
+#include <noggit/rendering/Primitives.hpp>
 #include <opengl/scoped.hpp>
 #include <opengl/shader.hpp>
 
@@ -44,7 +44,7 @@ void ModelInstance::draw_box (glm::mat4x4 const& model_view
 
   if (is_current_selection)
   {
-    OpenGL::primitives::wire_box::getInstance(_context).draw ( model_view
+    Noggit::Rendering::Primitives::WireBox::getInstance(_context).draw ( model_view
       , projection
       , transformMatrix()
       , { 1.0f, 1.0f, 0.0f, 1.0f }
@@ -52,7 +52,7 @@ void ModelInstance::draw_box (glm::mat4x4 const& model_view
       , misc::transform_model_box_coords(model->header.collision_box_max)
       );
 
-    OpenGL::primitives::wire_box::getInstance(_context).draw ( model_view
+    Noggit::Rendering::Primitives::WireBox::getInstance(_context).draw ( model_view
       , projection
       , transformMatrix()
       , {1.0f, 1.0f, 1.0f, 1.0f}
@@ -60,7 +60,7 @@ void ModelInstance::draw_box (glm::mat4x4 const& model_view
       , misc::transform_model_box_coords(model->header.bounding_box_max)
       );
 
-    OpenGL::primitives::wire_box::getInstance(_context).draw ( model_view
+    Noggit::Rendering::Primitives::WireBox::getInstance(_context).draw ( model_view
       , projection
       , glm::mat4x4(1)
       , {0.0f, 1.0f, 0.0f, 1.0f}
@@ -70,7 +70,7 @@ void ModelInstance::draw_box (glm::mat4x4 const& model_view
   }
   else
   {
-    OpenGL::primitives::wire_box::getInstance(_context).draw ( model_view
+    Noggit::Rendering::Primitives::WireBox::getInstance(_context).draw ( model_view
       , projection
       , transformMatrix()
       , {0.5f, 0.5f, 0.5f, 1.0f}
diff --git a/src/noggit/ModelInstance.h b/src/noggit/ModelInstance.h
index becd3c4f..899ef5be 100644
--- a/src/noggit/ModelInstance.h
+++ b/src/noggit/ModelInstance.h
@@ -8,10 +8,10 @@
 #include <noggit/ModelManager.h>
 #include <noggit/Selection.h>
 #include <noggit/SceneObject.hpp>
+#include <noggit/rendering/Primitives.hpp>
 #include <noggit/TileIndex.hpp>
 #include <noggit/tool_enums.hpp>
 #include <opengl/shader.fwd.hpp>
-#include <opengl/primitives.hpp>
 #include <optional>
 #include <cstdint>
 
diff --git a/src/noggit/Sky.h b/src/noggit/Sky.h
index bcef90bb..d1ef1c6a 100644
--- a/src/noggit/Sky.h
+++ b/src/noggit/Sky.h
@@ -3,9 +3,9 @@
 #include <noggit/DBCFile.h>
 #include <noggit/ModelInstance.h>
 #include <noggit/ContextObject.hpp>
+#include <noggit/rendering/Primitives.hpp>
 #include <opengl/scoped.hpp>
 #include <opengl/shader.fwd.hpp>
-#include <opengl/primitives.hpp>
 
 #include <memory>
 #include <string>
@@ -223,5 +223,5 @@ private:
 
   Noggit::NoggitRenderContext _context;
 
-  OpenGL::primitives::sphere _sphere_render;
+  Noggit::Rendering::Primitives::Sphere _sphere_render;
 };
diff --git a/src/noggit/WMO.cpp b/src/noggit/WMO.cpp
index e2c59660..004b288d 100644
--- a/src/noggit/WMO.cpp
+++ b/src/noggit/WMO.cpp
@@ -7,7 +7,7 @@
 #include <noggit/TextureManager.h> // TextureManager, Texture
 #include <noggit/WMO.h>
 #include <noggit/World.h>
-#include <opengl/primitives.hpp>
+#include <noggit/rendering/Primitives.hpp>
 #include <noggit/application/NoggitApplication.hpp>
 #include <opengl/scoped.hpp>
 
diff --git a/src/noggit/WMO.h b/src/noggit/WMO.h
index ada8de5b..785b6710 100644
--- a/src/noggit/WMO.h
+++ b/src/noggit/WMO.h
@@ -11,7 +11,7 @@
 #include <noggit/ContextObject.hpp>
 #include <noggit/rendering/WMOGroupRender.hpp>
 #include <noggit/rendering/WMORender.hpp>
-#include <opengl/primitives.hpp>
+#include <noggit/rendering/Primitives.hpp>
 #include <ClientFile.hpp>
 #include <optional>
 
diff --git a/src/noggit/WMOInstance.cpp b/src/noggit/WMOInstance.cpp
index 7446f88b..c3e5cbb4 100644
--- a/src/noggit/WMOInstance.cpp
+++ b/src/noggit/WMOInstance.cpp
@@ -8,7 +8,7 @@
 #include <noggit/WMO.h> // WMO
 #include <noggit/MapTile.h>
 #include <noggit/WMOInstance.h>
-#include <opengl/primitives.hpp>
+#include <noggit/rendering/Primitives.hpp>
 #include <opengl/scoped.hpp>
 
 WMOInstance::WMOInstance(BlizzardArchive::Listfile::FileKey const& file_key, ENTRY_MODF const* d, Noggit::NoggitRenderContext context)
@@ -127,7 +127,7 @@ void WMOInstance::draw ( OpenGL::Scoped::use_program& wmo_shader
     glm::vec4 color = force_box ? glm::vec4(0.0f, 0.0f, 1.0f, 1.0f)
         : glm::vec4(0.0f, 1.0f, 0.0f, 1.0f);
 
-    OpenGL::primitives::wire_box::getInstance(_context).draw(model_view
+    Noggit::Rendering::Primitives::WireBox::getInstance(_context).draw(model_view
        , projection
        , glm::mat4x4(glm::mat4x4(1))
        , color
diff --git a/src/noggit/rendering/WMORender.cpp b/src/noggit/rendering/WMORender.cpp
index 86084e70..4e04f003 100644
--- a/src/noggit/rendering/WMORender.cpp
+++ b/src/noggit/rendering/WMORender.cpp
@@ -84,7 +84,7 @@ void WMORender::draw(OpenGL::Scoped::use_program& wmo_shader
 
     for (auto& group : _wmo->groups)
     {
-      OpenGL::primitives::wire_box::getInstance(_wmo->_context).draw( model_view
+      Noggit::Rendering::Primitives::WireBox::getInstance(_wmo->_context).draw( model_view
           , projection
           , transform_matrix
           , {1.0f, 1.0f, 1.0f, 1.0f}
@@ -93,7 +93,7 @@ void WMORender::draw(OpenGL::Scoped::use_program& wmo_shader
       );
     }
 
-    OpenGL::primitives::wire_box::getInstance(_wmo->_context).draw ( model_view
+    Noggit::Rendering::Primitives::WireBox::getInstance(_wmo->_context).draw ( model_view
         , projection
         , transform_matrix
         , {1.0f, 0.0f, 0.0f, 1.0f}
diff --git a/src/noggit/rendering/WorldRender.cpp b/src/noggit/rendering/WorldRender.cpp
index 173d6f22..189e798a 100644
--- a/src/noggit/rendering/WorldRender.cpp
+++ b/src/noggit/rendering/WorldRender.cpp
@@ -572,7 +572,7 @@ void WorldRender::draw (glm::mat4x4 const& model_view
 
       glm::mat4x4 identity_mtx = glm::mat4x4{1};
       auto& extents = tile->getCombinedExtents();
-      OpenGL::primitives::wire_box::getInstance(_world->_context).draw ( model_view
+      Noggit::Rendering::Primitives::WireBox::getInstance(_world->_context).draw ( model_view
           , projection
           , identity_mtx
           , { 1.0f, 1.0f, 0.0f, 1.0f }
diff --git a/src/noggit/ui/tools/PreviewRenderer/PreviewRenderer.cpp b/src/noggit/ui/tools/PreviewRenderer/PreviewRenderer.cpp
index 4635e376..c63d7f2b 100644
--- a/src/noggit/ui/tools/PreviewRenderer/PreviewRenderer.cpp
+++ b/src/noggit/ui/tools/PreviewRenderer/PreviewRenderer.cpp
@@ -1,7 +1,7 @@
 #include "PreviewRenderer.hpp"
 
 #include <opengl/scoped.hpp>
-#include <opengl/primitives.hpp>
+#include <noggit/rendering/Primitives.hpp>
 #include <noggit/Selection.h>
 #include <noggit/tool_enums.hpp>
 #include <noggit/AsyncLoader.h>