diff --git a/scripts/MakeSingleHeader.py b/scripts/MakeSingleHeader.py
index 42e0ee7..6eaf749 100755
--- a/scripts/MakeSingleHeader.py
+++ b/scripts/MakeSingleHeader.py
@@ -115,6 +115,9 @@ def make_header(output, main_header, files, tag, namespace, macro=None, version=
         print("Converting macros", before, "->", after)
         single_header.replace(before, after)
 
+    new_namespace = namespace + "::"
+    single_header = re.sub(r"\bCLI::\b", new_namespace, single_header)
+
     if output is not None:
         with open(output, "w") as f:
             f.write(single_header)