diff --git a/system/vulkan_enc/VulkanHandleMapping.h b/system/vulkan_enc/VulkanHandleMapping.h
index 5c03d7f..7c7fdbc 100644
--- a/system/vulkan_enc/VulkanHandleMapping.h
+++ b/system/vulkan_enc/VulkanHandleMapping.h
@@ -18,7 +18,8 @@
 
 #include "VulkanHandles.h"
 
-namespace goldfish_vk {
+namespace gfxstream {
+namespace vk {
 
 class VulkanHandleMapping {
 public:
@@ -45,4 +46,5 @@
     GOLDFISH_VK_LIST_HANDLE_TYPES(DECLARE_HANDLE_MAP_OVERRIDE)
 };
 
-} // namespace goldfish_vk
\ No newline at end of file
+}  // namespace vk
+}  // namespace gfxstream
\ No newline at end of file