Index: vulkan-game.cpp
===================================================================
--- vulkan-game.cpp	(revision 2d8729794fc0b2af68f5b1a9b152e2e96258b598)
+++ vulkan-game.cpp	(revision d25381b88830bd62aa0ed8ef68e8641eff248736)
@@ -200,13 +200,13 @@
 
    createBufferSet(sizeof(UBO_VP_mats), VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT,
-      uniformBuffers_scenePipeline, uniformBuffersMemory_scenePipeline, uniformBufferInfoList_scenePipeline);
+      uniformBuffers_modelPipeline, uniformBuffersMemory_modelPipeline, uniformBufferInfoList_modelPipeline);
    // TODO: Calculate the size of this buffer (and all the other SSBOs) based on the number of objects
    createBufferSet(10 * sizeof(SSBO_ModelObject), VK_BUFFER_USAGE_STORAGE_BUFFER_BIT,
-      storageBuffers_scenePipeline, storageBuffersMemory_scenePipeline, storageBufferInfoList_scenePipeline);
+      storageBuffers_modelPipeline, storageBuffersMemory_modelPipeline, storageBufferInfoList_modelPipeline);
 
    modelPipeline.addDescriptorInfo(VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER,
-      VK_SHADER_STAGE_VERTEX_BIT, &uniformBufferInfoList_scenePipeline);
+      VK_SHADER_STAGE_VERTEX_BIT, &uniformBufferInfoList_modelPipeline);
    modelPipeline.addDescriptorInfo(VK_DESCRIPTOR_TYPE_STORAGE_BUFFER,
-      VK_SHADER_STAGE_VERTEX_BIT, &storageBufferInfoList_scenePipeline);
+      VK_SHADER_STAGE_VERTEX_BIT, &storageBufferInfoList_modelPipeline);
 
    modelPipeline.addDescriptorInfo(VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER,
@@ -787,8 +787,8 @@
    so_Asteroid.model = asteroidObjects[0].model_transform * asteroidObjects[0].model_base;
 
-   VulkanUtils::copyDataToMemory(device, uniformBuffersMemory_scenePipeline[currentImage], 0, object_VP_mats);
+   VulkanUtils::copyDataToMemory(device, uniformBuffersMemory_modelPipeline[currentImage], 0, object_VP_mats);
 
    for (size_t i = 0; i < modelObjects.size(); i++) {
-      VulkanUtils::copyDataToMemory(device, storageBuffersMemory_scenePipeline[currentImage],
+      VulkanUtils::copyDataToMemory(device, storageBuffersMemory_modelPipeline[currentImage],
          i, so_Object);
    }
@@ -1460,7 +1460,7 @@
 
    createBufferSet(sizeof(UBO_VP_mats), VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT,
-      uniformBuffers_scenePipeline, uniformBuffersMemory_scenePipeline, uniformBufferInfoList_scenePipeline);
+      uniformBuffers_modelPipeline, uniformBuffersMemory_modelPipeline, uniformBufferInfoList_modelPipeline);
    createBufferSet(10 * sizeof(SSBO_ModelObject), VK_BUFFER_USAGE_STORAGE_BUFFER_BIT,
-      storageBuffers_scenePipeline, storageBuffersMemory_scenePipeline, storageBufferInfoList_scenePipeline);
+      storageBuffers_modelPipeline, storageBuffersMemory_modelPipeline, storageBufferInfoList_modelPipeline);
 
    modelPipeline.updateRenderPass(renderPass);
@@ -1519,12 +1519,12 @@
    vkDestroySwapchainKHR(device, swapChain, nullptr);
 
-   for (size_t i = 0; i < uniformBuffers_scenePipeline.size(); i++) {
-      vkDestroyBuffer(device, uniformBuffers_scenePipeline[i], nullptr);
-      vkFreeMemory(device, uniformBuffersMemory_scenePipeline[i], nullptr);
-   }
-
-   for (size_t i = 0; i < storageBuffers_scenePipeline.size(); i++) {
-      vkDestroyBuffer(device, storageBuffers_scenePipeline[i], nullptr);
-      vkFreeMemory(device, storageBuffersMemory_scenePipeline[i], nullptr);
+   for (size_t i = 0; i < uniformBuffers_modelPipeline.size(); i++) {
+      vkDestroyBuffer(device, uniformBuffers_modelPipeline[i], nullptr);
+      vkFreeMemory(device, uniformBuffersMemory_modelPipeline[i], nullptr);
+   }
+
+   for (size_t i = 0; i < storageBuffers_modelPipeline.size(); i++) {
+      vkDestroyBuffer(device, storageBuffers_modelPipeline[i], nullptr);
+      vkFreeMemory(device, storageBuffersMemory_modelPipeline[i], nullptr);
    }
 
Index: vulkan-game.hpp
===================================================================
--- vulkan-game.hpp	(revision 2d8729794fc0b2af68f5b1a9b152e2e96258b598)
+++ vulkan-game.hpp	(revision d25381b88830bd62aa0ed8ef68e8641eff248736)
@@ -148,20 +148,16 @@
 
       GraphicsPipeline_Vulkan<OverlayVertex, void*> overlayPipeline;
-
       vector<SceneObject<OverlayVertex, void*>> overlayObjects;
 
-      // TODO: Rename all the variables related to modelPipeline to use the same pipelie name
-
       GraphicsPipeline_Vulkan<ModelVertex, SSBO_ModelObject> modelPipeline;
-
       vector<SceneObject<ModelVertex, SSBO_ModelObject>> modelObjects;
 
-      vector<VkBuffer> uniformBuffers_scenePipeline;
-      vector<VkDeviceMemory> uniformBuffersMemory_scenePipeline;
-      vector<VkDescriptorBufferInfo> uniformBufferInfoList_scenePipeline;
-
-      vector<VkBuffer> storageBuffers_scenePipeline;
-      vector<VkDeviceMemory> storageBuffersMemory_scenePipeline;
-      vector<VkDescriptorBufferInfo> storageBufferInfoList_scenePipeline;
+      vector<VkBuffer> uniformBuffers_modelPipeline;
+      vector<VkDeviceMemory> uniformBuffersMemory_modelPipeline;
+      vector<VkDescriptorBufferInfo> uniformBufferInfoList_modelPipeline;
+
+      vector<VkBuffer> storageBuffers_modelPipeline;
+      vector<VkDeviceMemory> storageBuffersMemory_modelPipeline;
+      vector<VkDescriptorBufferInfo> storageBufferInfoList_modelPipeline;
 
       UBO_VP_mats object_VP_mats;
@@ -169,5 +165,4 @@
 
       GraphicsPipeline_Vulkan<ShipVertex, SSBO_ModelObject> shipPipeline;
-
       vector<SceneObject<ShipVertex, SSBO_ModelObject>> shipObjects;
 
@@ -184,5 +179,4 @@
 
       GraphicsPipeline_Vulkan<AsteroidVertex, SSBO_Asteroid> asteroidPipeline;
-
       vector<SceneObject<AsteroidVertex, SSBO_Asteroid>> asteroidObjects;