diff --git a/implementations/Crafter.Graphics-Window.cpp b/implementations/Crafter.Graphics-Window.cpp
index cf4e749..ec8ee3f 100644
--- a/implementations/Crafter.Graphics-Window.cpp
+++ b/implementations/Crafter.Graphics-Window.cpp
@@ -623,14 +623,14 @@ void Window::Update() {
 
 void Window::Render() {
 // Acquire the next image from the swap chain
-    VulkanDevice::CheckVkResult(vkAcquireNextImageKHR(VulkanDevice::device, swapChain, UINT64_MAX, semaphores.presentComplete, (VkFence)nullptr, &currentBuffer));
+    Device::CheckVkResult(vkAcquireNextImageKHR(Device::device, swapChain, UINT64_MAX, semaphores.presentComplete, (VkFence)nullptr, &currentBuffer));
     submitInfo.commandBufferCount = 1;
     submitInfo.pCommandBuffers = &drawCmdBuffers[currentBuffer];
 
     VkCommandBufferBeginInfo cmdBufInfo {};
 	cmdBufInfo.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO;
 
-    VulkanDevice::CheckVkResult(vkBeginCommandBuffer(drawCmdBuffers[currentBuffer], &cmdBufInfo));
+    Device::CheckVkResult(vkBeginCommandBuffer(drawCmdBuffers[currentBuffer], &cmdBufInfo));
 
     VkImageSubresourceRange range{};
     range.aspectMask     = VK_IMAGE_ASPECT_COLOR_BIT;
@@ -666,7 +666,7 @@ void Window::Render() {
     };
 
     vkCmdBindDescriptorSets2(drawCmdBuffers[currentBuffer], &bindDescriptorSetsInfo);
-    VulkanDevice::vkCmdTraceRaysKHR(drawCmdBuffers[currentBuffer], &raygenRegion, &missRegion, &hitRegion, &callableRegion, width, height, 1);
+    Device::vkCmdTraceRaysKHR(drawCmdBuffers[currentBuffer], &raygenRegion, &missRegion, &hitRegion, &callableRegion, width, height, 1);
 
 
     VkImageMemoryBarrier image_memory_barrier2 {
@@ -683,9 +683,9 @@ void Window::Render() {
 
     vkCmdPipelineBarrier(drawCmdBuffers[currentBuffer], VK_PIPELINE_STAGE_RAY_TRACING_SHADER_BIT_KHR, VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT, 0, 0, nullptr, 0, nullptr, 1, &image_memory_barrier2);
 
-    VulkanDevice::CheckVkResult(vkEndCommandBuffer(drawCmdBuffers[currentBuffer]));
+    Device::CheckVkResult(vkEndCommandBuffer(drawCmdBuffers[currentBuffer]));
 
-    VulkanDevice::CheckVkResult(vkQueueSubmit(VulkanDevice::queue, 1, &submitInfo, VK_NULL_HANDLE));
+    Device::CheckVkResult(vkQueueSubmit(Device::queue, 1, &submitInfo, VK_NULL_HANDLE));
     VkPresentInfoKHR presentInfo = {};
     presentInfo.sType = VK_STRUCTURE_TYPE_PRESENT_INFO_KHR;
     presentInfo.pNext = NULL;
@@ -699,13 +699,13 @@ void Window::Render() {
         presentInfo.waitSemaphoreCount = 1;
     }
 
-    VkResult result = vkQueuePresentKHR(VulkanDevice::queue, &presentInfo);
+    VkResult result = vkQueuePresentKHR(Device::queue, &presentInfo);
     if(result == VK_SUBOPTIMAL_KHR) {
         CreateSwapchain();
     } else {
-        VulkanDevice::CheckVkResult(result);
+        Device::CheckVkResult(result);
     }
-    VulkanDevice::CheckVkResult(vkQueueWaitIdle(VulkanDevice::queue));
+    Device::CheckVkResult(vkQueueWaitIdle(Device::queue));
 }
 
 #ifdef CRAFTER_TIMING