1 files changed, 4 insertions, 14 deletions
diff --git a/registry/vulkan/scripts/cerealgenerator.py b/registry/vulkan/scripts/cerealgenerator.py
index 988cda45..ad5aab71 100644
--- a/registry/vulkan/scripts/cerealgenerator.py
+++ b/registry/vulkan/scripts/cerealgenerator.py
@@ -325,13 +325,11 @@ using android::base::BumpPool;
         dispatchHeaderDefs = f"""
 {self.hostCommonExtraVulkanHeaders}
 #include "goldfish_vk_private_defs.h"
-namespace gfxstream {{
-namespace vk {{
+namespace goldfish_vk {{
 
 struct VulkanDispatch;
 
-}} // namespace vk
-}} // namespace gfxstream
+}} // namespace goldfish_vk
 using DlOpenFunc = void* (void);
 using DlSymFunc = void* (void*, const char*);
 """
@@ -654,16 +652,8 @@ class BumpPool;
                 autogeneratedHeaderTemplate % \
                 (basename, "(header) generated by %s" % banner_command(sys.argv))
 
-
-        namespaceBegin = """
-namespace gfxstream {
-namespace vk {
-""" if useNamespace else ""
-
-        namespaceEnd = """
-}  // namespace vk"
-}  // namespace gfxstream
-""" if useNamespace else ""
+        namespaceBegin = "namespace goldfish_vk {" if useNamespace else ""
+        namespaceEnd = "} // namespace goldfish_vk" if useNamespace else ""
 
         module.headerPreamble += "#pragma once\n"
         if (not suppressVulkanHeaders):