diff --git a/kraken/CMakeLists.txt b/kraken/CMakeLists.txt
index da87e0f..1f7f763 100644
--- a/kraken/CMakeLists.txt
+++ b/kraken/CMakeLists.txt
@@ -22,8 +22,8 @@ add_sources(KRBundleManager.cpp)
 add_sources(KRCamera.cpp)
 add_sources(KRCollider.cpp)
 add_sources(KRContext.cpp)
-add_sources(KRDescriptorManager.cpp)
-add_sources(KRDescriptorSet.cpp)
+add_sources(KRUniformBuffer.cpp)
+add_sources(KRUniformBufferManager.cpp)
 add_sources(KRDevice.cpp)
 add_sources(KRDeviceManager.cpp)
 add_sources(KRRenderPass.cpp)
diff --git a/kraken/KRContext.cpp b/kraken/KRContext.cpp
index 4c15aae..be20904 100755
--- a/kraken/KRContext.cpp
+++ b/kraken/KRContext.cpp
@@ -102,8 +102,8 @@ KRContext::KRContext(const KrInitializeInfo* initializeInfo)
   m_pBundleManager = std::make_unique<KRBundleManager>(*this);
   m_deviceManager = std::make_unique<KRDeviceManager>(*this);
   m_deviceManager->initialize();
-  m_descriptorManager = std::make_unique<KRDescriptorManager>(*this);
-  m_descriptorManager->init();
+  m_uniformBufferManager = std::make_unique<KRUniformBufferManager>(*this);
+  m_uniformBufferManager->init();
   m_surfaceManager = std::make_unique<KRSurfaceManager>(*this);
   m_pPipelineManager = std::make_unique<KRPipelineManager>(*this);
   m_pSamplerManager = std::make_unique<KRSamplerManager>(*this);
@@ -164,7 +164,7 @@ KRContext::~KRContext()
   m_pShaderManager.reset();
   m_surfaceManager.reset();
   m_deviceManager.reset();
-  m_descriptorManager.reset();
+  m_uniformBufferManager.reset();
 
   // The bundles must be destroyed last, as the other objects may be using mmap'ed data from bundles
   m_pBundleManager.reset();
@@ -258,9 +258,9 @@ KRDeviceManager* KRContext::getDeviceManager()
 {
   return m_deviceManager.get();
 }
-KRDescriptorManager* KRContext::getDescriptorManager()
+KRUniformBufferManager* KRContext::getUniformBufferManager()
 {
-  return m_descriptorManager.get();
+  return m_uniformBufferManager.get();
 }
 KRUnknownManager* KRContext::getUnknownManager()
 {
diff --git a/kraken/KRContext.h b/kraken/KRContext.h
index 37fa0ae..923ce88 100755
--- a/kraken/KRContext.h
+++ b/kraken/KRContext.h
@@ -45,7 +45,7 @@
 #include "KRShaderManager.h"
 #include "KRSourceManager.h"
 #include "KRSurfaceManager.h"
-#include "KRDescriptorManager.h"
+#include "KRUniformBufferManager.h"
 #include "KRDeviceManager.h"
 #include "KRDevice.h"
 #include "KRSurface.h"
@@ -54,7 +54,7 @@ class KRAudioManager;
 class KRPresentationThread;
 class KRStreamerThread;
 class KRDeviceManager;
-class KRDescriptorManager;
+class KRUniformBufferManager;
 class KRSurfaceManager;
 class KRSamplerManager;
 
@@ -120,7 +120,7 @@ public:
   KRSourceManager* getSourceManager();
   KRSurfaceManager* getSurfaceManager();
   KRDeviceManager* getDeviceManager();
-  KRDescriptorManager* getDescriptorManager();
+  KRUniformBufferManager* getUniformBufferManager();
 
   void startFrame(float deltaTime);
   void endFrame(float deltaTime);
@@ -173,7 +173,7 @@ private:
   std::unique_ptr<KRShaderManager> m_pShaderManager;
   std::unique_ptr<KRSourceManager> m_pSourceManager;
   std::unique_ptr<KRDeviceManager> m_deviceManager;
-  std::unique_ptr<KRDescriptorManager> m_descriptorManager;
+  std::unique_ptr<KRUniformBufferManager> m_uniformBufferManager;
   std::unique_ptr<KRSurfaceManager> m_surfaceManager;
 
   KRResource** m_resourceMap;
diff --git a/kraken/KRDescriptorSet.cpp b/kraken/KRUniformBuffer.cpp
similarity index 93%
rename from kraken/KRDescriptorSet.cpp
rename to kraken/KRUniformBuffer.cpp
index 1bbe0cf..8c72846 100644
--- a/kraken/KRDescriptorSet.cpp
+++ b/kraken/KRUniformBuffer.cpp
@@ -29,15 +29,15 @@
 //  or implied, of Kearwood Gilbert.
 //
 
-#include "KRDescriptorSet.h"
+#include "KRUniformBuffer.h"
 
-KRDescriptorSet::KRDescriptorSet(KRContext& context)
+KRUniformBuffer::KRUniformBuffer(KRContext& context)
   : KRContextObject(context)
 {
 
 }
 
-KRDescriptorSet::~KRDescriptorSet()
+KRUniformBuffer::~KRUniformBuffer()
 {
 
 }
\ No newline at end of file
diff --git a/kraken/KRDescriptorSet.h b/kraken/KRUniformBuffer.h
similarity index 93%
rename from kraken/KRDescriptorSet.h
rename to kraken/KRUniformBuffer.h
index 1e33875..d55ab52 100644
--- a/kraken/KRDescriptorSet.h
+++ b/kraken/KRUniformBuffer.h
@@ -35,12 +35,12 @@
 #include "KREngine-common.h"
 #include "KRContext.h"
 
-class KRDescriptorSet : public KRContextObject
+class KRUniformBuffer : public KRContextObject
 {
 public:
 
-  KRDescriptorSet(KRContext& context);
-  virtual ~KRDescriptorSet();
+  KRUniformBuffer(KRContext& context);
+  virtual ~KRUniformBuffer();
 
 private:
 };
diff --git a/kraken/KRDescriptorManager.cpp b/kraken/KRUniformBufferManager.cpp
similarity index 89%
rename from kraken/KRDescriptorManager.cpp
rename to kraken/KRUniformBufferManager.cpp
index 2abc853..eefffbd 100644
--- a/kraken/KRDescriptorManager.cpp
+++ b/kraken/KRUniformBufferManager.cpp
@@ -29,20 +29,20 @@
 //  or implied, of Kearwood Gilbert.
 //
 
-#include "KRDescriptorManager.h"
+#include "KRUniformBufferManager.h"
 
-KRDescriptorManager::KRDescriptorManager(KRContext& context)
+KRUniformBufferManager::KRUniformBufferManager(KRContext& context)
   : KRContextObject(context)
 {
 
 }
 
-KRDescriptorManager::~KRDescriptorManager()
+KRUniformBufferManager::~KRUniformBufferManager()
 {
 
 }
 
-void KRDescriptorManager::init()
+void KRUniformBufferManager::init()
 {
 
 }
diff --git a/kraken/KRDescriptorManager.h b/kraken/KRUniformBufferManager.h
similarity index 88%
rename from kraken/KRDescriptorManager.h
rename to kraken/KRUniformBufferManager.h
index 7afe6f1..33e9122 100644
--- a/kraken/KRDescriptorManager.h
+++ b/kraken/KRUniformBufferManager.h
@@ -34,18 +34,18 @@
 #include "KREngine-common.h"
 
 #include "KRContext.h"
-#include "KRDescriptorSet.h"
+#include "KRUniformBuffer.h"
 
-class KRDescriptorSet;
+class KRUniformBuffer;
 
-class KRDescriptorManager : KRContextObject
+class KRUniformBufferManager : KRContextObject
 {
 public:
-  KRDescriptorManager(KRContext& context);
-  ~KRDescriptorManager();
+  KRUniformBufferManager(KRContext& context);
+  ~KRUniformBufferManager();
   
   void init();
 
 private:
-  set<KRDescriptorSet> m_descriptorSets;
+  set<KRUniformBuffer> m_uniformBuffers;
 };