diff --git a/bin/gen_stub.php b/bin/gen_stub.php
index 813e8349..2933841a 100755
--- a/bin/gen_stub.php
+++ b/bin/gen_stub.php
@@ -79,7 +79,7 @@ function processStubFile(string $stubFile, Context $context, bool $includeOnly =
 
         if (!$includeOnly) {
             global $translator;
-            $stubFilenameWithoutExtension = str_replace([".stub.php", '.php'], "", $stubFile);
+            $stubFilenameWithoutExtension = $translator->getArgInfoStubFilename($stubFile);
             $arginfoFile = $translator->getArgInfoHeaderFile($stubFilenameWithoutExtension);
             $legacyFile = "{$stubFilenameWithoutExtension}_legacy_arginfo.h";
 
diff --git a/src/Php/CompilerBase.php b/src/Php/CompilerBase.php
index 88b271d9..97ec5f7a 100644
--- a/src/Php/CompilerBase.php
+++ b/src/Php/CompilerBase.php
@@ -3186,6 +3186,9 @@ class CompilerBase extends \PhpAot\Core\Translator
         foreach ($v2->consts as $const) {
             $name  = $this->parseIdentifier($const->name);
             $value = $this->parseIdentifier($const->value);
+            if ($this->namespace) {
+                $name = $this->namespace . '\\' . $name;
+            }
             $this->addConstant($name, $value);
         }
 
@@ -3197,22 +3200,24 @@ class CompilerBase extends \PhpAot\Core\Translator
         $constInfo                    = new \stdClass();
         $constInfo->value             = $value;
         $constInfo->type              = $this->detectStrValueType($value);
-        $this->nativeConstants[$name] = $constInfo;
+        $constInfo->namespace = $this->namespace;
+        $constInfo->name = $name;
+        $this->nativeConstants[$this->escapeNamespace($name)] = $constInfo;
     }
 
     protected function hasConstant(string $name): bool
     {
-        return isset($this->nativeConstants[$name]);
+        return isset($this->nativeConstants[$this->escapeNamespace($name)]);
     }
 
     protected function getConstant(string $name): string
     {
-        return $this->nativeConstants[$name]->value;
+        return $this->escapeNamespace($name);
     }
 
     protected function getConstantType(string $name): string
     {
-        return $this->nativeConstants[$name]->type;
+        return $this->nativeConstants[$this->escapeNamespace($name)]->type;
     }
 
     protected function detectStrValueType(mixed $constant): string
diff --git a/src/Php/Translator.php b/src/Php/Translator.php
index 73925cc9..843152ef 100644
--- a/src/Php/Translator.php
+++ b/src/Php/Translator.php
@@ -323,6 +323,13 @@ class Translator extends Preprocessor
         return $this->buildMode;
     }
 
+    public function getArgInfoStubFilename(string $stubFile): string
+    {
+        $rs = str_replace([".stub.php", '.php'], "", $stubFile);
+        $rs = str_replace('-', '_', $rs);
+        return $rs;
+    }
+
     public function getArgInfoHeaderFile(string $stubFilenameWithoutExtension, bool $relative = false): string
     {
         $basename = self::PREFIX . basename($stubFilenameWithoutExtension);
diff --git a/src/template/extension.cc.php b/src/template/extension.cc.php
index 136f15c9..ada04348 100644
--- a/src/template/extension.cc.php
+++ b/src/template/extension.cc.php
@@ -52,9 +52,9 @@ foreach ($this->literalStrings as $str => $index):
 
 // constants
 <?php
-foreach ($this->nativeConstants as $name => $constant):
+foreach ($this->nativeConstants as $name => $const):
 ?>
-<?=$constant->type?> <?=$name?>;
+<?=$const->type?> <?=$name?>;
 <?php endforeach; ?>
 
 // property offset
@@ -109,10 +109,10 @@ foreach ($this->registerSymbols as $registerSymbolFn):
 void php_app_init() {
     // register constants
 <?php
-foreach ($this->nativeConstants as $name => $constant):
+foreach ($this->nativeConstants as $name => $const):
 ?>
-    <?=$name?> = <?= $constant->value ?>;
-    php::define("<?=$name?>", <?= $name ?>);
+    <?=$name?> = <?= $const->value ?>;
+    php::define("<?=$this->escapeString($const->name)?>", <?= $name ?>);
 <?php endforeach; ?>
 
     // global vars
@@ -142,8 +142,8 @@ foreach ($this->globalVars as $name => $type) :
     php::unsetGlobal("<?=$name?>");
 <?php endforeach; ?>
 <?php
-foreach ($this->nativeConstants as $name => $constant):
-    if ($constant->type !== Translator::TYPE_VAR) {
+foreach ($this->nativeConstants as $name => $const):
+    if ($const->type !== Translator::TYPE_VAR) {
         continue;
     }
 ?>
diff --git a/tests/aot/ns-const.phpt b/tests/aot/ns-const.phpt
new file mode 100644
index 00000000..ede3cc54
--- /dev/null
+++ b/tests/aot/ns-const.phpt
@@ -0,0 +1,21 @@
+--TEST--
+namespace constants
+--FILE--
+<?php
+namespace foo {
+    const bar = 42;
+}
+
+namespace {
+    const bar = 35;
+    function main() {
+        var_dump(bar);
+        var_dump(foo\bar);
+        echo "Done\n";
+    }
+}
+?>
+--EXPECT--
+int(35)
+int(42)
+Done