diff --git a/Zend/zend_attributes.stub.php b/Zend/zend_attributes.stub.php
index 34056404b3aca..df13c9f82469f 100644
--- a/Zend/zend_attributes.stub.php
+++ b/Zend/zend_attributes.stub.php
@@ -7,42 +7,42 @@ final class Attribute
 {
     /**
      * @var int
-     * @cname ZEND_ATTRIBUTE_TARGET_CLASS
+     * @cvalue ZEND_ATTRIBUTE_TARGET_CLASS
      */
     const TARGET_CLASS = UNKNOWN;
     /**
      * @var int
-     * @cname ZEND_ATTRIBUTE_TARGET_FUNCTION
+     * @cvalue ZEND_ATTRIBUTE_TARGET_FUNCTION
      */
     const TARGET_FUNCTION = UNKNOWN;
     /**
      * @var int
-     * @cname ZEND_ATTRIBUTE_TARGET_METHOD
+     * @cvalue ZEND_ATTRIBUTE_TARGET_METHOD
      */
     const TARGET_METHOD = UNKNOWN;
     /**
      * @var int
-     * @cname ZEND_ATTRIBUTE_TARGET_PROPERTY
+     * @cvalue ZEND_ATTRIBUTE_TARGET_PROPERTY
      */
     const TARGET_PROPERTY = UNKNOWN;
     /**
      * @var int
-     * @cname ZEND_ATTRIBUTE_TARGET_CLASS_CONST
+     * @cvalue ZEND_ATTRIBUTE_TARGET_CLASS_CONST
      */
     const TARGET_CLASS_CONSTANT = UNKNOWN;
     /**
      * @var int
-     * @cname ZEND_ATTRIBUTE_TARGET_PARAMETER
+     * @cvalue ZEND_ATTRIBUTE_TARGET_PARAMETER
      */
     const TARGET_PARAMETER = UNKNOWN;
     /**
      * @var int
-     * @cname ZEND_ATTRIBUTE_TARGET_ALL
+     * @cvalue ZEND_ATTRIBUTE_TARGET_ALL
      */
     const TARGET_ALL = UNKNOWN;
     /**
      * @var int
-     * @cname ZEND_ATTRIBUTE_IS_REPEATABLE
+     * @cvalue ZEND_ATTRIBUTE_IS_REPEATABLE
      */
     const IS_REPEATABLE = UNKNOWN;
 
diff --git a/Zend/zend_attributes_arginfo.h b/Zend/zend_attributes_arginfo.h
index 4311b12d4afb4..00e4b5120bf92 100644
--- a/Zend/zend_attributes_arginfo.h
+++ b/Zend/zend_attributes_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: a07e5020fd36cda191c1f3b4fca180157bd74cbc */
+ * Stub hash: afb6a3f1d14099066d028b1579fff074359da293 */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Attribute___construct, 0, 0, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "Attribute::TARGET_ALL")
diff --git a/Zend/zend_constants.stub.php b/Zend/zend_constants.stub.php
index 191fbd2618778..289f6fb0531d5 100644
--- a/Zend/zend_constants.stub.php
+++ b/Zend/zend_constants.stub.php
@@ -4,96 +4,96 @@
 
 /**
  * @var int
- * @cname E_ERROR
+ * @cvalue E_ERROR
  */
 const E_ERROR = UNKNOWN;
 
 /**
  * @var int
- * @cname E_WARNING
+ * @cvalue E_WARNING
  */
 const E_WARNING = UNKNOWN;
 
 /**
  * @var int
- * @cname E_PARSE
+ * @cvalue E_PARSE
  */
 const E_PARSE = UNKNOWN;
 
 /**
  * @var int
- * @cname E_NOTICE
+ * @cvalue E_NOTICE
  */
 const E_NOTICE = UNKNOWN;
 
 /**
  * @var int
- * @cname E_CORE_ERROR
+ * @cvalue E_CORE_ERROR
  */
 const E_CORE_ERROR = UNKNOWN;
 
 /**
  * @var int
- * @cname E_CORE_WARNING
+ * @cvalue E_CORE_WARNING
  */
 const E_CORE_WARNING = UNKNOWN;
 
 /**
  * @var int
- * @cname E_COMPILE_ERROR
+ * @cvalue E_COMPILE_ERROR
  */
 const E_COMPILE_ERROR = UNKNOWN;
 
 /**
  * @var int
- * @cname E_COMPILE_WARNING
+ * @cvalue E_COMPILE_WARNING
  */
 const E_COMPILE_WARNING = UNKNOWN;
 
 /**
  * @var int
- * @cname E_USER_ERROR
+ * @cvalue E_USER_ERROR
  */
 const E_USER_ERROR = UNKNOWN;
 
 /**
  * @var int
- * @cname E_USER_WARNING
+ * @cvalue E_USER_WARNING
  */
 const E_USER_WARNING = UNKNOWN;
 
 /**
  * @var int
- * @cname E_USER_NOTICE
+ * @cvalue E_USER_NOTICE
  */
 const E_USER_NOTICE = UNKNOWN;
 
 /**
  * @var int
- * @cname E_STRICT
+ * @cvalue E_STRICT
  */
 const E_STRICT = UNKNOWN;
 
 /**
  * @var int
- * @cname E_RECOVERABLE_ERROR
+ * @cvalue E_RECOVERABLE_ERROR
  */
 const E_RECOVERABLE_ERROR = UNKNOWN;
 
 /**
  * @var int
- * @cname E_DEPRECATED
+ * @cvalue E_DEPRECATED
  */
 const E_DEPRECATED = UNKNOWN;
 
 /**
  * @var int
- * @cname E_USER_DEPRECATED
+ * @cvalue E_USER_DEPRECATED
  */
 const E_USER_DEPRECATED = UNKNOWN;
 
 /**
  * @var int
- * @cname E_ALL
+ * @cvalue E_ALL
  */
 const E_ALL = UNKNOWN;
diff --git a/Zend/zend_constants_arginfo.h b/Zend/zend_constants_arginfo.h
index d51ac27af13b1..0665c0b942539 100644
--- a/Zend/zend_constants_arginfo.h
+++ b/Zend/zend_constants_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: f417ea0f3a43036f0abc87856c83f4c93395405a */
+ * Stub hash: 50b960193f55c7b09316355a0c0ae1d572ca9694 */
 
 
 
diff --git a/build/gen_stub.php b/build/gen_stub.php
index dad5a4bb1c818..59d185ac31849 100755
--- a/build/gen_stub.php
+++ b/build/gen_stub.php
@@ -1594,7 +1594,7 @@ class EvaluatedValue
     public $type;
 
     /** @var string|null */
-    public $cConstName;
+    public $cConstValue;
 
     /** @var bool */
     public $isUnknownConstValue;
@@ -1671,7 +1671,7 @@ private function __construct($value, SimpleType $type, ?string $cConstName, ?Con
     {
         $this->value = $value;
         $this->type = $type;
-        $this->cConstName = $cConstName;
+        $this->cConstValue = $cConstName;
         $this->originatingConst = $originatingConst;
         $this->isUnknownConstValue = $isUnknownConstValue;
     }
@@ -1719,8 +1719,8 @@ public function initializeZval(string $zvalName, iterable $allConstInfos): strin
      */
     public function getCConstValue(iterable $allConstInfos): ?string
     {
-        if ($this->cConstName) {
-            return $this->cConstName;
+        if ($this->cConstValue) {
+            return $this->cConstValue;
         }
 
         if ($this->originatingConst) {
@@ -1872,7 +1872,7 @@ class ConstInfo extends VariableLike
     /** @var string|null */
     public $cond;
     /** @var string|null */
-    public $cname;
+    public $cValue;
 
     public function __construct(
         ConstOrClassConstName $name,
@@ -1882,7 +1882,7 @@ public function __construct(
         ?Type $phpDocType,
         bool $isDeprecated,
         ?string $cond,
-        ?string $cname,
+        ?string $cValue,
         ?string $link,
         ?int $phpVersionIdMinimumCompatibility
     ) {
@@ -1891,7 +1891,7 @@ public function __construct(
         $this->valueString = $valueString;
         $this->isDeprecated = $isDeprecated;
         $this->cond = $cond;
-        $this->cname = $cname;
+        $this->cValue = $cValue;
         parent::__construct($flags, $phpDocType, $link, $phpVersionIdMinimumCompatibility);
     }
 
@@ -1903,7 +1903,7 @@ public function getValue(iterable $allConstInfos): EvaluatedValue
         return EvaluatedValue::createFromExpression(
             $this->value,
             $this->phpDocType->tryToSimpleType(),
-            $this->cname,
+            $this->cValue,
             $allConstInfos
         );
     }
@@ -1948,7 +1948,7 @@ protected function addTypeToFieldSynopsis(DOMDocument $doc, DOMElement $fieldsyn
      */
     protected function getFieldSynopsisValueString(iterable $allConstInfos): ?string
     {
-        $value = EvaluatedValue::createFromExpression($this->value, null, $this->cname, $allConstInfos);
+        $value = EvaluatedValue::createFromExpression($this->value, null, $this->cValue, $allConstInfos);
         if ($value->originatingConst) {
             return $value->originatingConst->getFieldSynopsisValueString($allConstInfos);
         }
@@ -1971,9 +1971,9 @@ public function getDeclaration(iterable $allConstInfos): string
             throw new Exception("Constant " . $this->name->__toString() . " must have a simple built-in type");
         }
 
-        $value = EvaluatedValue::createFromExpression($this->value, $type, $this->cname, $allConstInfos);
-        if ($value->isUnknownConstValue && !$value->cConstName) {
-            throw new Exception("Constant " . $this->name->__toString() . " must have a @cname annotation");
+        $value = EvaluatedValue::createFromExpression($this->value, $type, $this->cValue, $allConstInfos);
+        if ($value->isUnknownConstValue && !$value->cConstValue) {
+            throw new Exception("Constant " . $this->name->__toString() . " must have a @cvalue annotation");
         }
 
         $code = "";
@@ -2059,35 +2059,35 @@ private function getClassConstDeclaration(EvaluatedValue $value, iterable $allCo
 
     private function getValueAssertion(EvaluatedValue $value): string
     {
-        if ($value->isUnknownConstValue || $value->originatingConst || $value->cConstName === null) {
+        if ($value->isUnknownConstValue || $value->originatingConst || $value->cConstValue === null) {
             return "";
         }
 
-        $cName = $value->cConstName;
+        $cConstValue = $value->cConstValue;
         $constValue = $value->value;
 
         if ($value->type->isNull()) {
-            return "\tZEND_ASSERT($cName == NULL);\n";
+            return "\tZEND_ASSERT($cConstValue == NULL);\n";
         }
 
         if ($value->type->isBool()) {
             $cValue = $constValue ? "true" : "false";
-            return "\tZEND_ASSERT($cName == $cValue);\n";
+            return "\tZEND_ASSERT($cConstValue == $cValue);\n";
         }
 
         if ($value->type->isInt()) {
             $cValue = (int) $constValue;
-            return "\tZEND_ASSERT($cName == $cValue);\n";
+            return "\tZEND_ASSERT($cConstValue == $cValue);\n";
         }
 
         if ($value->type->isFloat()) {
             $cValue = (float) $constValue;
-            return "\tZEND_ASSERT($cName == $cValue);\n";
+            return "\tZEND_ASSERT($cConstValue == $cValue);\n";
         }
 
         if ($value->type->isString()) {
             $cValue = '"' . addslashes($constValue) . '"';
-            return "\tZEND_ASSERT(strcmp($cName, $cValue) == 0);\n";
+            return "\tZEND_ASSERT(strcmp($cConstValue, $cValue) == 0);\n";
         }
 
         throw new Exception("Unimplemented constant type");
@@ -3376,7 +3376,7 @@ function parseConstLike(
 ): ConstInfo {
     $phpDocType = null;
     $deprecated = false;
-    $cname = null;
+    $cValue = null;
     $link = null;
     if ($docComment) {
         $tags = parseDocComment($docComment);
@@ -3385,8 +3385,8 @@ function parseConstLike(
                 $phpDocType = $tag->getType();
             } elseif ($tag->name === 'deprecated') {
                 $deprecated = true;
-            } elseif ($tag->name === 'cname') {
-                $cname = $tag->value;
+            } elseif ($tag->name === 'cvalue') {
+                $cValue = $tag->value;
             } elseif ($tag->name === 'link') {
                 $link = $tag->value;
             }
@@ -3405,7 +3405,7 @@ function parseConstLike(
         Type::fromString($phpDocType),
         $deprecated,
         $cond,
-        $cname,
+        $cValue,
         $link,
         $phpVersionIdMinimumCompatibility
     );
diff --git a/ext/calendar/calendar.stub.php b/ext/calendar/calendar.stub.php
index a20079ae3da9e..5418781332f65 100644
--- a/ext/calendar/calendar.stub.php
+++ b/ext/calendar/calendar.stub.php
@@ -4,111 +4,111 @@
 
 /**
  * @var int
- * @cname CAL_GREGORIAN
+ * @cvalue CAL_GREGORIAN
  */
 const CAL_GREGORIAN = UNKNOWN;
 /**
  * @var int
- * @cname CAL_JULIAN
+ * @cvalue CAL_JULIAN
  */
 const CAL_JULIAN = UNKNOWN;
 /**
  * @var int
- * @cname CAL_JEWISH
+ * @cvalue CAL_JEWISH
  */
 const CAL_JEWISH = UNKNOWN;
 /**
  * @var int
- * @cname CAL_FRENCH
+ * @cvalue CAL_FRENCH
  */
 const CAL_FRENCH = UNKNOWN;
 /**
  * @var int
- * @cname CAL_NUM_CALS
+ * @cvalue CAL_NUM_CALS
  */
 const CAL_NUM_CALS = UNKNOWN;
 
 /**
  * @var int
- * @cname CAL_DOW_DAYNO
+ * @cvalue CAL_DOW_DAYNO
  */
 const CAL_DOW_DAYNO = UNKNOWN;
 /**
  * @var int
- * @cname CAL_DOW_SHORT
+ * @cvalue CAL_DOW_SHORT
  */
 const CAL_DOW_SHORT = UNKNOWN;
 /**
  * @var int
- * @cname CAL_DOW_LONG
+ * @cvalue CAL_DOW_LONG
  */
 const CAL_DOW_LONG = UNKNOWN;
 
 /**
  * @var int
- * @cname CAL_MONTH_GREGORIAN_SHORT
+ * @cvalue CAL_MONTH_GREGORIAN_SHORT
  */
 const CAL_MONTH_GREGORIAN_SHORT = UNKNOWN;
 /**
  * @var int
- * @cname CAL_MONTH_GREGORIAN_LONG
+ * @cvalue CAL_MONTH_GREGORIAN_LONG
  */
 const CAL_MONTH_GREGORIAN_LONG = UNKNOWN;
 /**
  * @var int
- * @cname CAL_MONTH_JULIAN_SHORT
+ * @cvalue CAL_MONTH_JULIAN_SHORT
  */
 const CAL_MONTH_JULIAN_SHORT = UNKNOWN;
 /**
  * @var int
- * @cname CAL_MONTH_JULIAN_LONG
+ * @cvalue CAL_MONTH_JULIAN_LONG
  */
 const CAL_MONTH_JULIAN_LONG = UNKNOWN;
 /**
  * @var int
- * @cname CAL_MONTH_JEWISH
+ * @cvalue CAL_MONTH_JEWISH
  */
 const CAL_MONTH_JEWISH = UNKNOWN;
 /**
  * @var int
- * @cname CAL_MONTH_FRENCH
+ * @cvalue CAL_MONTH_FRENCH
  */
 const CAL_MONTH_FRENCH = UNKNOWN;
 
 /**
  * @var int
- * @cname CAL_EASTER_DEFAULT
+ * @cvalue CAL_EASTER_DEFAULT
  */
 const CAL_EASTER_DEFAULT = UNKNOWN;
 /**
  * @var int
- * @cname CAL_EASTER_ROMAN
+ * @cvalue CAL_EASTER_ROMAN
  */
 const CAL_EASTER_ROMAN = UNKNOWN;
 /**
  * @var int
- * @cname CAL_EASTER_ALWAYS_GREGORIAN
+ * @cvalue CAL_EASTER_ALWAYS_GREGORIAN
  */
 const CAL_EASTER_ALWAYS_GREGORIAN = UNKNOWN;
 /**
  * @var int
- * @cname CAL_EASTER_ALWAYS_JULIAN
+ * @cvalue CAL_EASTER_ALWAYS_JULIAN
  */
 const CAL_EASTER_ALWAYS_JULIAN = UNKNOWN;
 
 /**
  * @var int
- * @cname CAL_JEWISH_ADD_ALAFIM_GERESH
+ * @cvalue CAL_JEWISH_ADD_ALAFIM_GERESH
  */
 const CAL_JEWISH_ADD_ALAFIM_GERESH = UNKNOWN;
 /**
  * @var int
- * @cname CAL_JEWISH_ADD_ALAFIM
+ * @cvalue CAL_JEWISH_ADD_ALAFIM
  */
 const CAL_JEWISH_ADD_ALAFIM = UNKNOWN;
 /**
  * @var int
- * @cname CAL_JEWISH_ADD_GERESHAYIM
+ * @cvalue CAL_JEWISH_ADD_GERESHAYIM
  */
 const CAL_JEWISH_ADD_GERESHAYIM = UNKNOWN;
 
diff --git a/ext/calendar/calendar_arginfo.h b/ext/calendar/calendar_arginfo.h
index 3b6b2af152a97..f518d36e413bb 100644
--- a/ext/calendar/calendar_arginfo.h
+++ b/ext/calendar/calendar_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 6030cc249e7c1950818b3060ed2e565119710546 */
+ * Stub hash: f45116785b01842f56ff923a54f65ab839b3dd61 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_cal_days_in_month, 0, 3, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO(0, calendar, IS_LONG, 0)
diff --git a/ext/com_dotnet/com_extension.stub.php b/ext/com_dotnet/com_extension.stub.php
index 20b255949f868..3207871f85c7d 100644
--- a/ext/com_dotnet/com_extension.stub.php
+++ b/ext/com_dotnet/com_extension.stub.php
@@ -4,286 +4,286 @@
 
 /**
  * @var int
- * @cname CLSCTX_INPROC_SERVER
+ * @cvalue CLSCTX_INPROC_SERVER
  */
 const CLSCTX_INPROC_SERVER = UNKNOWN;
 /**
  * @var int
- * @cname CLSCTX_INPROC_HANDLER
+ * @cvalue CLSCTX_INPROC_HANDLER
  */
 const CLSCTX_INPROC_HANDLER = UNKNOWN;
 /**
  * @var int
- * @cname CLSCTX_LOCAL_SERVER
+ * @cvalue CLSCTX_LOCAL_SERVER
  */
 const CLSCTX_LOCAL_SERVER = UNKNOWN;
 /**
  * @var int
- * @cname CLSCTX_REMOTE_SERVER
+ * @cvalue CLSCTX_REMOTE_SERVER
  */
 const CLSCTX_REMOTE_SERVER = UNKNOWN;
 /**
  * @var int
- * @cname CLSCTX_SERVER
+ * @cvalue CLSCTX_SERVER
  */
 const CLSCTX_SERVER = UNKNOWN;
 /**
  * @var int
- * @cname CLSCTX_ALL
+ * @cvalue CLSCTX_ALL
  */
 const CLSCTX_ALL = UNKNOWN;
 
 /**
  * @var int
- * @cname VT_NULL
+ * @cvalue VT_NULL
  */
 const VT_NULL = UNKNOWN;
 /**
  * @var int
- * @cname VT_EMPTY
+ * @cvalue VT_EMPTY
  */
 const VT_EMPTY = UNKNOWN;
 /**
  * @var int
- * @cname VT_UI1
+ * @cvalue VT_UI1
  */
 const VT_UI1 = UNKNOWN;
 /**
  * @var int
- * @cname VT_I1
+ * @cvalue VT_I1
  */
 const VT_I1 = UNKNOWN;
 /**
  * @var int
- * @cname VT_UI2
+ * @cvalue VT_UI2
  */
 const VT_UI2 = UNKNOWN;
 /**
  * @var int
- * @cname VT_I2
+ * @cvalue VT_I2
  */
 const VT_I2 = UNKNOWN;
 /**
  * @var int
- * @cname VT_UI4
+ * @cvalue VT_UI4
  */
 const VT_UI4 = UNKNOWN;
 /**
  * @var int
- * @cname VT_I4
+ * @cvalue VT_I4
  */
 const VT_I4 = UNKNOWN;
 /**
  * @var int
- * @cname VT_R4
+ * @cvalue VT_R4
  */
 const VT_R4 = UNKNOWN;
 /**
  * @var int
- * @cname VT_R8
+ * @cvalue VT_R8
  */
 const VT_R8 = UNKNOWN;
 /**
  * @var int
- * @cname VT_BOOL
+ * @cvalue VT_BOOL
  */
 const VT_BOOL = UNKNOWN;
 /**
  * @var int
- * @cname VT_ERROR
+ * @cvalue VT_ERROR
  */
 const VT_ERROR = UNKNOWN;
 /**
  * @var int
- * @cname VT_CY
+ * @cvalue VT_CY
  */
 const VT_CY = UNKNOWN;
 /**
  * @var int
- * @cname VT_DATE
+ * @cvalue VT_DATE
  */
 const VT_DATE = UNKNOWN;
 /**
  * @var int
- * @cname VT_BSTR
+ * @cvalue VT_BSTR
  */
 const VT_BSTR = UNKNOWN;
 /**
  * @var int
- * @cname VT_DECIMAL
+ * @cvalue VT_DECIMAL
  */
 const VT_DECIMAL = UNKNOWN;
 /**
  * @var int
- * @cname VT_UNKNOWN
+ * @cvalue VT_UNKNOWN
  */
 const VT_UNKNOWN = UNKNOWN;
 /**
  * @var int
- * @cname VT_DISPATCH
+ * @cvalue VT_DISPATCH
  */
 const VT_DISPATCH = UNKNOWN;
 /**
  * @var int
- * @cname VT_VARIANT
+ * @cvalue VT_VARIANT
  */
 const VT_VARIANT = UNKNOWN;
 /**
  * @var int
- * @cname VT_INT
+ * @cvalue VT_INT
  */
 const VT_INT = UNKNOWN;
 /**
  * @var int
- * @cname VT_UINT
+ * @cvalue VT_UINT
  */
 const VT_UINT = UNKNOWN;
 /**
  * @var int
- * @cname VT_ARRAY
+ * @cvalue VT_ARRAY
  */
 const VT_ARRAY = UNKNOWN;
 /**
  * @var int
- * @cname VT_BYREF
+ * @cvalue VT_BYREF
  */
 const VT_BYREF = UNKNOWN;
 
 /**
  * @var int
- * @cname CP_ACP
+ * @cvalue CP_ACP
  */
 const CP_ACP = UNKNOWN;
 /**
  * @var int
- * @cname CP_MACCP
+ * @cvalue CP_MACCP
  */
 const CP_MACCP = UNKNOWN;
 /**
  * @var int
- * @cname CP_OEMCP
+ * @cvalue CP_OEMCP
  */
 const CP_OEMCP = UNKNOWN;
 /**
  * @var int
- * @cname CP_UTF7
+ * @cvalue CP_UTF7
  */
 const CP_UTF7 = UNKNOWN;
 /**
  * @var int
- * @cname CP_UTF8
+ * @cvalue CP_UTF8
  */
 const CP_UTF8 = UNKNOWN;
 /**
  * @var int
- * @cname CP_SYMBOL
+ * @cvalue CP_SYMBOL
  */
 const CP_SYMBOL = UNKNOWN;
 /**
  * @var int
- * @cname CP_THREAD_ACP
+ * @cvalue CP_THREAD_ACP
  */
 const CP_THREAD_ACP = UNKNOWN;
 
 /**
  * @var int
- * @cname VARCMP_LT
+ * @cvalue VARCMP_LT
  */
 const VARCMP_LT = UNKNOWN;
 /**
  * @var int
- * @cname VARCMP_EQ
+ * @cvalue VARCMP_EQ
  */
 const VARCMP_EQ = UNKNOWN;
 /**
  * @var int
- * @cname VARCMP_GT
+ * @cvalue VARCMP_GT
  */
 const VARCMP_GT = UNKNOWN;
 /**
  * @var int
- * @cname VARCMP_NULL
+ * @cvalue VARCMP_NULL
  */
 const VARCMP_NULL = UNKNOWN;
 /**
  * @var int
- * @cname LOCALE_SYSTEM_DEFAULT
+ * @cvalue LOCALE_SYSTEM_DEFAULT
  */
 const LOCALE_SYSTEM_DEFAULT = UNKNOWN;
 /**
  * @var int
- * @cname LOCALE_NEUTRAL
+ * @cvalue LOCALE_NEUTRAL
  */
 const LOCALE_NEUTRAL = UNKNOWN;
 
 /**
  * @var int
- * @cname NORM_IGNORECASE
+ * @cvalue NORM_IGNORECASE
  */
 const NORM_IGNORECASE = UNKNOWN;
 /**
  * @var int
- * @cname NORM_IGNORENONSPACE
+ * @cvalue NORM_IGNORENONSPACE
  */
 const NORM_IGNORENONSPACE = UNKNOWN;
 /**
  * @var int
- * @cname NORM_IGNORESYMBOLS
+ * @cvalue NORM_IGNORESYMBOLS
  */
 const NORM_IGNORESYMBOLS = UNKNOWN;
 /**
  * @var int
- * @cname NORM_IGNOREWIDTH
+ * @cvalue NORM_IGNOREWIDTH
  */
 const NORM_IGNOREWIDTH = UNKNOWN;
 /**
  * @var int
- * @cname NORM_IGNOREKANATYPE
+ * @cvalue NORM_IGNOREKANATYPE
  */
 const NORM_IGNOREKANATYPE = UNKNOWN;
 #ifdef NORM_IGNOREKASHIDA
 /**
  * @var int
- * @cname NORM_IGNOREKASHIDA
+ * @cvalue NORM_IGNOREKASHIDA
  */
 const NORM_IGNOREKASHIDA = UNKNOWN;
 #endif
 
 /**
  * @var int
- * @cname PHP_DISP_E_DIVBYZERO
+ * @cvalue PHP_DISP_E_DIVBYZERO
  */
 const DISP_E_DIVBYZERO = UNKNOWN;
 /**
  * @var int
- * @cname PHP_DISP_E_OVERFLOW
+ * @cvalue PHP_DISP_E_OVERFLOW
  */
 const DISP_E_OVERFLOW = UNKNOWN;
 /**
  * @var int
- * @cname PHP_DISP_E_BADINDEX
+ * @cvalue PHP_DISP_E_BADINDEX
  */
 const DISP_E_BADINDEX = UNKNOWN;
 /**
  * @var int
- * @cname PHP_DISP_E_PARAMNOTFOUND
+ * @cvalue PHP_DISP_E_PARAMNOTFOUND
  */
 const DISP_E_PARAMNOTFOUND = UNKNOWN;
 /**
  * @var int
- * @cname PHP_MK_E_UNAVAILABLE
+ * @cvalue PHP_MK_E_UNAVAILABLE
  */
 const MK_E_UNAVAILABLE = UNKNOWN;
 
 #if SIZEOF_ZEND_LONG == 8
 /**
  * @var int
- * @cname VT_UI8
+ * @cvalue VT_UI8
  */
 const VT_UI8 = UNKNOWN;
 /**
  * @var int
- * @cname VT_I8
+ * @cvalue VT_I8
  */
 const VT_I8 = UNKNOWN;
 #endif
diff --git a/ext/com_dotnet/com_extension_arginfo.h b/ext/com_dotnet/com_extension_arginfo.h
index d2829031b360b..7fda790b8a1ac 100644
--- a/ext/com_dotnet/com_extension_arginfo.h
+++ b/ext/com_dotnet/com_extension_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 3e9f5b80bee0ee6bad7185d0d583858bc8a54dde */
+ * Stub hash: b91206482b5119ce6d7c899e9599acfa2e06ec2a */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_variant_set, 0, 2, IS_VOID, 0)
 	ZEND_ARG_OBJ_INFO(0, variant, variant, 0)
diff --git a/ext/date/php_date.stub.php b/ext/date/php_date.stub.php
index 822b5052898e6..696afa5e342ae 100644
--- a/ext/date/php_date.stub.php
+++ b/ext/date/php_date.stub.php
@@ -4,67 +4,67 @@
 
 /**
  * @var string
- * @cname DATE_FORMAT_RFC3339
+ * @cvalue DATE_FORMAT_RFC3339
  */
 const DATE_ATOM = "Y-m-d\\TH:i:sP";
 
 /**
  * @var string
- * @cname DATE_FORMAT_COOKIE
+ * @cvalue DATE_FORMAT_COOKIE
  */
 const DATE_COOKIE = "l, d-M-Y H:i:s T";
 
 /**
  * @var string
- * @cname DATE_FORMAT_ISO8601
+ * @cvalue DATE_FORMAT_ISO8601
  */
 const DATE_ISO8601 = "Y-m-d\\TH:i:sO";
 
 /**
  * @var string
- * @cname DATE_FORMAT_RFC822
+ * @cvalue DATE_FORMAT_RFC822
  */
 const DATE_RFC822 = "D, d M y H:i:s O";
 
 /**
  * @var string
- * @cname DATE_FORMAT_RFC850
+ * @cvalue DATE_FORMAT_RFC850
  */
 const DATE_RFC850 = "l, d-M-y H:i:s T";
 
 /**
  * @var string
- * @cname DATE_FORMAT_RFC1036
+ * @cvalue DATE_FORMAT_RFC1036
  */
 const DATE_RFC1036 = "D, d M y H:i:s O";
 
 /**
  * @var string
- * @cname DATE_FORMAT_RFC1123
+ * @cvalue DATE_FORMAT_RFC1123
  */
 const DATE_RFC1123 = "D, d M Y H:i:s O";
 
 /**
  * @var string
- * @cname DATE_FORMAT_RFC7231
+ * @cvalue DATE_FORMAT_RFC7231
  */
 const DATE_RFC7231 = "D, d M Y H:i:s \\G\\M\\T";
 
 /**
  * @var string
- * @cname DATE_FORMAT_RFC2822
+ * @cvalue DATE_FORMAT_RFC2822
  */
 const DATE_RFC2822 = "D, d M Y H:i:s O";
 
 /**
  * @var string
- * @cname DATE_FORMAT_RFC3339
+ * @cvalue DATE_FORMAT_RFC3339
  */
 const DATE_RFC3339 = "Y-m-d\\TH:i:sP";
 
 /**
  * @var string
- * @cname DATE_FORMAT_RFC3339_EXTENDED
+ * @cvalue DATE_FORMAT_RFC3339_EXTENDED
  */
 const DATE_RFC3339_EXTENDED = "Y-m-d\\TH:i:s.vP";
 
@@ -76,19 +76,19 @@
 
 /**
  * @var int
- * @cname SUNFUNCS_RET_TIMESTAMP
+ * @cvalue SUNFUNCS_RET_TIMESTAMP
  */
 const SUNFUNCS_RET_TIMESTAMP = UNKNOWN;
 
 /**
  * @var int
- * @cname SUNFUNCS_RET_STRING
+ * @cvalue SUNFUNCS_RET_STRING
  */
 const SUNFUNCS_RET_STRING = UNKNOWN;
 
 /**
  * @var int
- * @cname SUNFUNCS_RET_DOUBLE
+ * @cvalue SUNFUNCS_RET_DOUBLE
  */
 const SUNFUNCS_RET_DOUBLE = UNKNOWN;
 
@@ -532,72 +532,72 @@ class DateTimeZone
 {
     /**
      * @var int
-     * @cname PHP_DATE_TIMEZONE_GROUP_AFRICA
+     * @cvalue PHP_DATE_TIMEZONE_GROUP_AFRICA
      */
     public const AFRICA = UNKNOWN;
     /**
      * @var int
-     * @cname PHP_DATE_TIMEZONE_GROUP_AMERICA
+     * @cvalue PHP_DATE_TIMEZONE_GROUP_AMERICA
      */
     public const AMERICA = UNKNOWN;
     /**
      * @var int
-     * @cname PHP_DATE_TIMEZONE_GROUP_ANTARCTICA
+     * @cvalue PHP_DATE_TIMEZONE_GROUP_ANTARCTICA
      */
     public const ANTARCTICA = UNKNOWN;
     /**
      * @var int
-     * @cname PHP_DATE_TIMEZONE_GROUP_ARCTIC
+     * @cvalue PHP_DATE_TIMEZONE_GROUP_ARCTIC
      */
     public const ARCTIC = UNKNOWN;
     /**
      * @var int
-     * @cname PHP_DATE_TIMEZONE_GROUP_ASIA
+     * @cvalue PHP_DATE_TIMEZONE_GROUP_ASIA
      */
     public const ASIA = UNKNOWN;
     /**
      * @var int
-     * @cname PHP_DATE_TIMEZONE_GROUP_ATLANTIC
+     * @cvalue PHP_DATE_TIMEZONE_GROUP_ATLANTIC
      */
     public const ATLANTIC = UNKNOWN;
     /**
      * @var int
-     * @cname PHP_DATE_TIMEZONE_GROUP_AUSTRALIA
+     * @cvalue PHP_DATE_TIMEZONE_GROUP_AUSTRALIA
      */
     public const AUSTRALIA = UNKNOWN;
     /**
      * @var int
-     * @cname PHP_DATE_TIMEZONE_GROUP_EUROPE
+     * @cvalue PHP_DATE_TIMEZONE_GROUP_EUROPE
      */
     public const EUROPE = UNKNOWN;
     /**
      * @var int
-     * @cname PHP_DATE_TIMEZONE_GROUP_INDIAN
+     * @cvalue PHP_DATE_TIMEZONE_GROUP_INDIAN
      */
     public const INDIAN = UNKNOWN;
     /**
      * @var int
-     * @cname PHP_DATE_TIMEZONE_GROUP_PACIFIC
+     * @cvalue PHP_DATE_TIMEZONE_GROUP_PACIFIC
      */
     public const PACIFIC = UNKNOWN;
     /**
      * @var int
-     * @cname PHP_DATE_TIMEZONE_GROUP_UTC
+     * @cvalue PHP_DATE_TIMEZONE_GROUP_UTC
      */
     public const UTC = UNKNOWN;
     /**
      * @var int
-     * @cname PHP_DATE_TIMEZONE_GROUP_ALL
+     * @cvalue PHP_DATE_TIMEZONE_GROUP_ALL
      */
     public const ALL = UNKNOWN;
     /**
      * @var int
-     * @cname PHP_DATE_TIMEZONE_GROUP_ALL_W_BC
+     * @cvalue PHP_DATE_TIMEZONE_GROUP_ALL_W_BC
      */
     public const ALL_WITH_BC = UNKNOWN;
     /**
      * @var int
-     * @cname PHP_DATE_TIMEZONE_PER_COUNTRY
+     * @cvalue PHP_DATE_TIMEZONE_PER_COUNTRY
      */
     public const PER_COUNTRY = UNKNOWN;
 
@@ -685,12 +685,12 @@ class DatePeriod implements IteratorAggregate
 {
     /**
      * @var int
-     * @cname PHP_DATE_PERIOD_EXCLUDE_START_DATE
+     * @cvalue PHP_DATE_PERIOD_EXCLUDE_START_DATE
      */
     public const EXCLUDE_START_DATE = UNKNOWN;
     /**
      * @var int
-     * @cname PHP_DATE_PERIOD_INCLUDE_END_DATE
+     * @cvalue PHP_DATE_PERIOD_INCLUDE_END_DATE
      */
     public const INCLUDE_END_DATE = UNKNOWN;
 
diff --git a/ext/date/php_date_arginfo.h b/ext/date/php_date_arginfo.h
index 73a83650fe318..f3b228f35fb94 100644
--- a/ext/date/php_date_arginfo.h
+++ b/ext/date/php_date_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 1fdf01c80508225887bac55c789ce93a314dd316 */
+ * Stub hash: 5ccde6eb3c96eda925633f50091c7019050846be */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_strtotime, 0, 1, MAY_BE_LONG|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, datetime, IS_STRING, 0)
diff --git a/ext/dom/php_dom.stub.php b/ext/dom/php_dom.stub.php
index 81856a4c95046..472deb3df3d7a 100644
--- a/ext/dom/php_dom.stub.php
+++ b/ext/dom/php_dom.stub.php
@@ -4,236 +4,236 @@
 
 /**
  * @var int
- * @cname XML_ELEMENT_NODE
+ * @cvalue XML_ELEMENT_NODE
  */
 const XML_ELEMENT_NODE = UNKNOWN;
 /**
  * @var int
- * @cname XML_ATTRIBUTE_NODE
+ * @cvalue XML_ATTRIBUTE_NODE
  */
 const XML_ATTRIBUTE_NODE = UNKNOWN;
 /**
  * @var int
- * @cname XML_TEXT_NODE
+ * @cvalue XML_TEXT_NODE
  */
 const XML_TEXT_NODE = UNKNOWN;
 /**
  * @var int
- * @cname XML_CDATA_SECTION_NODE
+ * @cvalue XML_CDATA_SECTION_NODE
  */
 const XML_CDATA_SECTION_NODE = UNKNOWN;
 /**
  * @var int
- * @cname XML_ENTITY_REF_NODE
+ * @cvalue XML_ENTITY_REF_NODE
  */
 const XML_ENTITY_REF_NODE = UNKNOWN;
 /**
  * @var int
- * @cname XML_ENTITY_NODE
+ * @cvalue XML_ENTITY_NODE
  */
 const XML_ENTITY_NODE = UNKNOWN;
 /**
  * @var int
- * @cname XML_PI_NODE
+ * @cvalue XML_PI_NODE
  */
 const XML_PI_NODE = UNKNOWN;
 /**
  * @var int
- * @cname XML_COMMENT_NODE
+ * @cvalue XML_COMMENT_NODE
  */
 const XML_COMMENT_NODE = UNKNOWN;
 /**
  * @var int
- * @cname XML_DOCUMENT_NODE
+ * @cvalue XML_DOCUMENT_NODE
  */
 const XML_DOCUMENT_NODE = UNKNOWN;
 /**
  * @var int
- * @cname XML_DOCUMENT_TYPE_NODE
+ * @cvalue XML_DOCUMENT_TYPE_NODE
  */
 const XML_DOCUMENT_TYPE_NODE = UNKNOWN;
 /**
  * @var int
- * @cname XML_DOCUMENT_FRAG_NODE
+ * @cvalue XML_DOCUMENT_FRAG_NODE
  */
 const XML_DOCUMENT_FRAG_NODE = UNKNOWN;
 /**
  * @var int
- * @cname XML_NOTATION_NODE
+ * @cvalue XML_NOTATION_NODE
  */
 const XML_NOTATION_NODE = UNKNOWN;
 /**
  * @var int
- * @cname XML_HTML_DOCUMENT_NODE
+ * @cvalue XML_HTML_DOCUMENT_NODE
  */
 const XML_HTML_DOCUMENT_NODE = UNKNOWN;
 /**
  * @var int
- * @cname XML_DTD_NODE
+ * @cvalue XML_DTD_NODE
  */
 const XML_DTD_NODE = UNKNOWN;
 /**
  * @var int
- * @cname XML_ELEMENT_DECL
+ * @cvalue XML_ELEMENT_DECL
  */
 const XML_ELEMENT_DECL_NODE = UNKNOWN;
 /**
  * @var int
- * @cname XML_ATTRIBUTE_DECL
+ * @cvalue XML_ATTRIBUTE_DECL
  */
 const XML_ATTRIBUTE_DECL_NODE = UNKNOWN;
 /**
  * @var int
- * @cname XML_ENTITY_DECL
+ * @cvalue XML_ENTITY_DECL
  */
 const XML_ENTITY_DECL_NODE = UNKNOWN;
 /**
  * @var int
- * @cname XML_NAMESPACE_DECL
+ * @cvalue XML_NAMESPACE_DECL
  */
 const XML_NAMESPACE_DECL_NODE = UNKNOWN;
 #ifdef XML_GLOBAL_NAMESPACE
 /**
  * @var int
- * @cname XML_GLOBAL_NAMESPACE
+ * @cvalue XML_GLOBAL_NAMESPACE
  */
 const XML_GLOBAL_NAMESPACE = UNKNOWN;
 #endif
 
 /**
  * @var int
- * @cname XML_LOCAL_NAMESPACE
+ * @cvalue XML_LOCAL_NAMESPACE
  */
 const XML_LOCAL_NAMESPACE = UNKNOWN;
 /**
  * @var int
- * @cname XML_ATTRIBUTE_CDATA
+ * @cvalue XML_ATTRIBUTE_CDATA
  */
 const XML_ATTRIBUTE_CDATA = UNKNOWN;
 /**
  * @var int
- * @cname XML_ATTRIBUTE_ID
+ * @cvalue XML_ATTRIBUTE_ID
  */
 const XML_ATTRIBUTE_ID = UNKNOWN;
 /**
  * @var int
- * @cname XML_ATTRIBUTE_IDREF
+ * @cvalue XML_ATTRIBUTE_IDREF
  */
 const XML_ATTRIBUTE_IDREF = UNKNOWN;
 /**
  * @var int
- * @cname XML_ATTRIBUTE_IDREFS
+ * @cvalue XML_ATTRIBUTE_IDREFS
  */
 const XML_ATTRIBUTE_IDREFS = UNKNOWN;
 /**
  * @var int
- * @cname XML_ATTRIBUTE_ENTITIES
+ * @cvalue XML_ATTRIBUTE_ENTITIES
  */
 const XML_ATTRIBUTE_ENTITY = UNKNOWN;
 /**
  * @var int
- * @cname XML_ATTRIBUTE_NMTOKEN
+ * @cvalue XML_ATTRIBUTE_NMTOKEN
  */
 const XML_ATTRIBUTE_NMTOKEN = UNKNOWN;
 /**
  * @var int
- * @cname XML_ATTRIBUTE_NMTOKENS
+ * @cvalue XML_ATTRIBUTE_NMTOKENS
  */
 const XML_ATTRIBUTE_NMTOKENS = UNKNOWN;
 /**
  * @var int
- * @cname XML_ATTRIBUTE_ENUMERATION
+ * @cvalue XML_ATTRIBUTE_ENUMERATION
  */
 const XML_ATTRIBUTE_ENUMERATION = UNKNOWN;
 /**
  * @var int
- * @cname XML_ATTRIBUTE_NOTATION
+ * @cvalue XML_ATTRIBUTE_NOTATION
  */
 const XML_ATTRIBUTE_NOTATION = UNKNOWN;
 
 /**
  * @var int
- * @cname PHP_ERR
+ * @cvalue PHP_ERR
  */
 const DOM_PHP_ERR = UNKNOWN;
 /**
  * @var int
- * @cname INDEX_SIZE_ERR
+ * @cvalue INDEX_SIZE_ERR
  */
 const DOM_INDEX_SIZE_ERR = UNKNOWN;
 /**
  * @var int
- * @cname DOMSTRING_SIZE_ERR
+ * @cvalue DOMSTRING_SIZE_ERR
  */
 const DOMSTRING_SIZE_ERR = UNKNOWN;
 /**
  * @var int
- * @cname HIERARCHY_REQUEST_ERR
+ * @cvalue HIERARCHY_REQUEST_ERR
  */
 const DOM_HIERARCHY_REQUEST_ERR = UNKNOWN;
 /**
  * @var int
- * @cname WRONG_DOCUMENT_ERR
+ * @cvalue WRONG_DOCUMENT_ERR
  */
 const DOM_WRONG_DOCUMENT_ERR = UNKNOWN;
 /**
  * @var int
- * @cname INVALID_CHARACTER_ERR
+ * @cvalue INVALID_CHARACTER_ERR
  */
 const DOM_INVALID_CHARACTER_ERR = UNKNOWN;
 /**
  * @var int
- * @cname NO_DATA_ALLOWED_ERR
+ * @cvalue NO_DATA_ALLOWED_ERR
  */
 const DOM_NO_DATA_ALLOWED_ERR = UNKNOWN;
 /**
  * @var int
- * @cname NO_MODIFICATION_ALLOWED_ERR
+ * @cvalue NO_MODIFICATION_ALLOWED_ERR
  */
 const DOM_NO_MODIFICATION_ALLOWED_ERR = UNKNOWN;
 /**
  * @var int
- * @cname NOT_FOUND_ERR
+ * @cvalue NOT_FOUND_ERR
  */
 const DOM_NOT_FOUND_ERR = UNKNOWN;
 /**
  * @var int
- * @cname NOT_SUPPORTED_ERR
+ * @cvalue NOT_SUPPORTED_ERR
  */
 const DOM_NOT_SUPPORTED_ERR = UNKNOWN;
 /**
  * @var int
- * @cname INUSE_ATTRIBUTE_ERR
+ * @cvalue INUSE_ATTRIBUTE_ERR
  */
 const DOM_INUSE_ATTRIBUTE_ERR = UNKNOWN;
 /**
  * @var int
- * @cname INVALID_STATE_ERR
+ * @cvalue INVALID_STATE_ERR
  */
 const DOM_INVALID_STATE_ERR = UNKNOWN;
 /**
  * @var int
- * @cname SYNTAX_ERR
+ * @cvalue SYNTAX_ERR
  */
 const DOM_SYNTAX_ERR = UNKNOWN;
 /**
  * @var int
- * @cname INVALID_MODIFICATION_ERR
+ * @cvalue INVALID_MODIFICATION_ERR
  */
 const DOM_INVALID_MODIFICATION_ERR = UNKNOWN;
 /**
  * @var int
- * @cname NAMESPACE_ERR
+ * @cvalue NAMESPACE_ERR
  */
 const DOM_NAMESPACE_ERR = UNKNOWN;
 /**
  * @var int
- * @cname INVALID_ACCESS_ERR
+ * @cvalue INVALID_ACCESS_ERR
  */
 const DOM_INVALID_ACCESS_ERR = UNKNOWN;
 /**
  * @var int
- * @cname VALIDATION_ERR
+ * @cvalue VALIDATION_ERR
  */
 const DOM_VALIDATION_ERR = UNKNOWN;
 
diff --git a/ext/dom/php_dom_arginfo.h b/ext/dom/php_dom_arginfo.h
index f1af18e8f6050..f33b8be46ff7b 100644
--- a/ext/dom/php_dom_arginfo.h
+++ b/ext/dom/php_dom_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 0ff1ffe9c140c29151dbdb921a8c168732720256 */
+ * Stub hash: 8365be2868e4932ea74f8eb2d4ce840117d48deb */
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_dom_import_simplexml, 0, 1, DOMElement, 0)
 	ZEND_ARG_TYPE_INFO(0, node, IS_OBJECT, 0)
diff --git a/ext/enchant/enchant.stub.php b/ext/enchant/enchant.stub.php
index f8c61ed1f4e25..764f9e5c3a16a 100644
--- a/ext/enchant/enchant.stub.php
+++ b/ext/enchant/enchant.stub.php
@@ -4,20 +4,20 @@
 
 /**
  * @var int
- * @cname PHP_ENCHANT_MYSPELL
+ * @cvalue PHP_ENCHANT_MYSPELL
  * @deprecated
  */
 const ENCHANT_MYSPELL = UNKNOWN;
 /**
  * @var int
- * @cname PHP_ENCHANT_ISPELL
+ * @cvalue PHP_ENCHANT_ISPELL
  * @deprecated
  */
 const ENCHANT_ISPELL = UNKNOWN;
 #ifdef HAVE_ENCHANT_GET_VERSION
 /**
  * @var string
- * @cname PHP_ENCHANT_GET_VERSION
+ * @cvalue PHP_ENCHANT_GET_VERSION
  */
 const LIBENCHANT_VERSION = UNKNOWN;
 #endif
diff --git a/ext/enchant/enchant_arginfo.h b/ext/enchant/enchant_arginfo.h
index 763d35e17c60c..3a2fa5b90d83a 100644
--- a/ext/enchant/enchant_arginfo.h
+++ b/ext/enchant/enchant_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: c41b6d66fdc5f403b95592041f44d9bb0db9b3fa */
+ * Stub hash: 42bb5a4488d254e87d763c75ccff62e283e63335 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_enchant_broker_init, 0, 0, EnchantBroker, MAY_BE_FALSE)
 ZEND_END_ARG_INFO()
diff --git a/ext/exif/exif.stub.php b/ext/exif/exif.stub.php
index c1785fd0dc5db..ca38bb4e734d7 100644
--- a/ext/exif/exif.stub.php
+++ b/ext/exif/exif.stub.php
@@ -4,7 +4,7 @@
 
 /**
  * @var int
- * @cname USE_MBSTRING
+ * @cvalue USE_MBSTRING
  */
 const EXIF_USE_MBSTRING = UNKNOWN;
 
diff --git a/ext/exif/exif_arginfo.h b/ext/exif/exif_arginfo.h
index ee5ca3b82ede5..dca9535a48667 100644
--- a/ext/exif/exif_arginfo.h
+++ b/ext/exif/exif_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 123192d967d2a1787c340a43238797323e878a1b */
+ * Stub hash: 633b2db018fa1453845a854a6361f11f107f4653 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_exif_tagname, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, index, IS_LONG, 0)
diff --git a/ext/ffi/ffi.stub.php b/ext/ffi/ffi.stub.php
index c22328e9454c9..e492963616fb4 100644
--- a/ext/ffi/ffi.stub.php
+++ b/ext/ffi/ffi.stub.php
@@ -9,7 +9,7 @@ final class FFI
     {
         /**
          * @var int
-         * @cname __BIGGEST_ALIGNMENT__
+         * @cvalue __BIGGEST_ALIGNMENT__
          */
         public const __BIGGEST_ALIGNMENT__ = UNKNOWN;
 
@@ -83,196 +83,196 @@ final class CData {
     final class CType {
         /**
          * @var int
-         * @cname ZEND_FFI_TYPE_VOID
+         * @cvalue ZEND_FFI_TYPE_VOID
          */
         public const TYPE_VOID = UNKNOWN;
         /**
          * @var int
-         * @cname ZEND_FFI_TYPE_FLOAT
+         * @cvalue ZEND_FFI_TYPE_FLOAT
          */
         public const TYPE_FLOAT = UNKNOWN;
         /**
          * @var int
-         * @cname ZEND_FFI_TYPE_DOUBLE
+         * @cvalue ZEND_FFI_TYPE_DOUBLE
          */
         public const TYPE_DOUBLE = UNKNOWN;
 #ifdef HAVE_LONG_DOUBLE
         /**
          * @var int
-         * @cname ZEND_FFI_TYPE_LONGDOUBLE
+         * @cvalue ZEND_FFI_TYPE_LONGDOUBLE
          */
         public const TYPE_LONGDOUBLE = UNKNOWN;
 #endif
         /**
          * @var int
-         * @cname ZEND_FFI_TYPE_UINT8
+         * @cvalue ZEND_FFI_TYPE_UINT8
          */
         public const TYPE_UINT8 = UNKNOWN;
         /**
          * @var int
-         * @cname ZEND_FFI_TYPE_SINT8
+         * @cvalue ZEND_FFI_TYPE_SINT8
          */
         public const TYPE_SINT8 = UNKNOWN;
         /**
          * @var int
-         * @cname ZEND_FFI_TYPE_UINT16
+         * @cvalue ZEND_FFI_TYPE_UINT16
          */
         public const TYPE_UINT16 = UNKNOWN;
         /**
          * @var int
-         * @cname ZEND_FFI_TYPE_SINT16
+         * @cvalue ZEND_FFI_TYPE_SINT16
          */
         public const TYPE_SINT16 = UNKNOWN;
         /**
          * @var int
-         * @cname ZEND_FFI_TYPE_UINT32
+         * @cvalue ZEND_FFI_TYPE_UINT32
          */
         public const TYPE_UINT32 = UNKNOWN;
         /**
          * @var int
-         * @cname ZEND_FFI_TYPE_SINT32
+         * @cvalue ZEND_FFI_TYPE_SINT32
          */
         public const TYPE_SINT32 = UNKNOWN;
         /**
          * @var int
-         * @cname ZEND_FFI_TYPE_UINT64
+         * @cvalue ZEND_FFI_TYPE_UINT64
          */
         public const TYPE_UINT64 = UNKNOWN;
         /**
          * @var int
-         * @cname ZEND_FFI_TYPE_SINT64
+         * @cvalue ZEND_FFI_TYPE_SINT64
          */
         public const TYPE_SINT64 = UNKNOWN;
         /**
          * @var int
-         * @cname ZEND_FFI_TYPE_ENUM
+         * @cvalue ZEND_FFI_TYPE_ENUM
          */
         public const TYPE_ENUM = UNKNOWN;
         /**
          * @var int
-         * @cname ZEND_FFI_TYPE_BOOL
+         * @cvalue ZEND_FFI_TYPE_BOOL
          */
         public const TYPE_BOOL = UNKNOWN;
         /**
          * @var int
-         * @cname ZEND_FFI_TYPE_CHAR
+         * @cvalue ZEND_FFI_TYPE_CHAR
          */
         public const TYPE_CHAR = UNKNOWN;
         /**
          * @var int
-         * @cname ZEND_FFI_TYPE_POINTER
+         * @cvalue ZEND_FFI_TYPE_POINTER
          */
         public const TYPE_POINTER = UNKNOWN;
         /**
          * @var int
-         * @cname ZEND_FFI_TYPE_FUNC
+         * @cvalue ZEND_FFI_TYPE_FUNC
          */
         public const TYPE_FUNC = UNKNOWN;
         /**
          * @var int
-         * @cname ZEND_FFI_TYPE_ARRAY
+         * @cvalue ZEND_FFI_TYPE_ARRAY
          */
         public const TYPE_ARRAY = UNKNOWN;
         /**
          * @var int
-         * @cname ZEND_FFI_TYPE_STRUCT
+         * @cvalue ZEND_FFI_TYPE_STRUCT
          */
         public const TYPE_STRUCT = UNKNOWN;
 
         /**
          * @var int
-         * @cname ZEND_FFI_ATTR_CONST
+         * @cvalue ZEND_FFI_ATTR_CONST
          */
         public const ATTR_CONST = UNKNOWN;
         /**
          * @var int
-         * @cname ZEND_FFI_ATTR_INCOMPLETE_TAG
+         * @cvalue ZEND_FFI_ATTR_INCOMPLETE_TAG
          */
         public const ATTR_INCOMPLETE_TAG = UNKNOWN;
         /**
          * @var int
-         * @cname ZEND_FFI_ATTR_VARIADIC
+         * @cvalue ZEND_FFI_ATTR_VARIADIC
          */
         public const ATTR_VARIADIC = UNKNOWN;
         /**
          * @var int
-         * @cname ZEND_FFI_ATTR_INCOMPLETE_ARRAY
+         * @cvalue ZEND_FFI_ATTR_INCOMPLETE_ARRAY
          */
         public const ATTR_INCOMPLETE_ARRAY = UNKNOWN;
         /**
          * @var int
-         * @cname ZEND_FFI_ATTR_VLA
+         * @cvalue ZEND_FFI_ATTR_VLA
          */
         public const ATTR_VLA = UNKNOWN;
         /**
          * @var int
-         * @cname ZEND_FFI_ATTR_UNION
+         * @cvalue ZEND_FFI_ATTR_UNION
          */
         public const ATTR_UNION = UNKNOWN;
         /**
          * @var int
-         * @cname ZEND_FFI_ATTR_PACKED
+         * @cvalue ZEND_FFI_ATTR_PACKED
          */
         public const ATTR_PACKED = UNKNOWN;
         /**
          * @var int
-         * @cname ZEND_FFI_ATTR_MS_STRUCT
+         * @cvalue ZEND_FFI_ATTR_MS_STRUCT
          */
         public const ATTR_MS_STRUCT = UNKNOWN;
         /**
          * @var int
-         * @cname ZEND_FFI_ATTR_GCC_STRUCT
+         * @cvalue ZEND_FFI_ATTR_GCC_STRUCT
          */
         public const ATTR_GCC_STRUCT = UNKNOWN;
 
         /**
          * @var int
-         * @cname ZEND_FFI_ABI_DEFAULT
+         * @cvalue ZEND_FFI_ABI_DEFAULT
          */
         public const ABI_DEFAULT = UNKNOWN;
         /**
          * @var int
-         * @cname ZEND_FFI_ABI_CDECL
+         * @cvalue ZEND_FFI_ABI_CDECL
          */
         public const ABI_CDECL = UNKNOWN;
         /**
          * @var int
-         * @cname ZEND_FFI_ABI_FASTCALL
+         * @cvalue ZEND_FFI_ABI_FASTCALL
          */
         public const ABI_FASTCALL = UNKNOWN;
         /**
          * @var int
-         * @cname ZEND_FFI_ABI_THISCALL
+         * @cvalue ZEND_FFI_ABI_THISCALL
          */
         public const ABI_THISCALL = UNKNOWN;
         /**
          * @var int
-         * @cname ZEND_FFI_ABI_STDCALL
+         * @cvalue ZEND_FFI_ABI_STDCALL
          */
         public const ABI_STDCALL = UNKNOWN;
         /**
          * @var int
-         * @cname ZEND_FFI_ABI_PASCAL
+         * @cvalue ZEND_FFI_ABI_PASCAL
          */
         public const ABI_PASCAL = UNKNOWN;
         /**
          * @var int
-         * @cname ZEND_FFI_ABI_REGISTER
+         * @cvalue ZEND_FFI_ABI_REGISTER
          */
         public const ABI_REGISTER = UNKNOWN;
         /**
          * @var int
-         * @cname ZEND_FFI_ABI_MS
+         * @cvalue ZEND_FFI_ABI_MS
          */
         public const ABI_MS = UNKNOWN;
         /**
          * @var int
-         * @cname ZEND_FFI_ABI_SYSV
+         * @cvalue ZEND_FFI_ABI_SYSV
          */
         public const ABI_SYSV = UNKNOWN;
         /**
          * @var int
-         * @cname ZEND_FFI_ABI_VECTORCALL
+         * @cvalue ZEND_FFI_ABI_VECTORCALL
          */
         public const ABI_VECTORCALL = UNKNOWN;
 
diff --git a/ext/ffi/ffi_arginfo.h b/ext/ffi/ffi_arginfo.h
index d560262f11ec1..23f678c47a47d 100644
--- a/ext/ffi/ffi_arginfo.h
+++ b/ext/ffi/ffi_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 61da0287284302ae020c50af7d6252f58cd5a9d3 */
+ * Stub hash: 63f0ea1625eca4bb8309387d1b5626c10f2d101b */
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_FFI_cdef, 0, 0, FFI, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, code, IS_STRING, 0, "\"\"")
diff --git a/ext/fileinfo/fileinfo.stub.php b/ext/fileinfo/fileinfo.stub.php
index 2d608c6f30216..13b164bb1d1ab 100644
--- a/ext/fileinfo/fileinfo.stub.php
+++ b/ext/fileinfo/fileinfo.stub.php
@@ -4,61 +4,61 @@
 
 /**
  * @var int
- * @cname MAGIC_NONE
+ * @cvalue MAGIC_NONE
  */
 const FILEINFO_NONE = UNKNOWN;
 /**
  * @var int
- * @cname MAGIC_SYMLINK
+ * @cvalue MAGIC_SYMLINK
  */
 const FILEINFO_SYMLINK = UNKNOWN;
 /**
  * @var int
- * @cname MAGIC_MIME
+ * @cvalue MAGIC_MIME
  */
 const FILEINFO_MIME = UNKNOWN;
 /**
  * @var int
- * @cname MAGIC_MIME_TYPE
+ * @cvalue MAGIC_MIME_TYPE
  */
 const FILEINFO_MIME_TYPE = UNKNOWN;
 /**
  * @var int
- * @cname MAGIC_MIME_ENCODING
+ * @cvalue MAGIC_MIME_ENCODING
  */
 const FILEINFO_MIME_ENCODING = UNKNOWN;
 /**
  * @var int
- * @cname MAGIC_DEVICES
+ * @cvalue MAGIC_DEVICES
  */
 const FILEINFO_DEVICES = UNKNOWN;
 /**
  * @var int
- * @cname MAGIC_CONTINUE
+ * @cvalue MAGIC_CONTINUE
  */
 const FILEINFO_CONTINUE = UNKNOWN;
 #ifdef MAGIC_PRESERVE_ATIME
 /**
  * @var int
- * @cname MAGIC_PRESERVE_ATIME
+ * @cvalue MAGIC_PRESERVE_ATIME
  */
 const FILEINFO_PRESERVE_ATIME = UNKNOWN;
 #endif
 #ifdef MAGIC_RAW
 /**
  * @var int
- * @cname MAGIC_RAW
+ * @cvalue MAGIC_RAW
  */
 const FILEINFO_RAW = UNKNOWN;
 #endif
 /**
  * @var int
- * @cname MAGIC_APPLE
+ * @cvalue MAGIC_APPLE
  */
 const FILEINFO_APPLE = UNKNOWN;
 /**
  * @var int
- * @cname MAGIC_EXTENSION
+ * @cvalue MAGIC_EXTENSION
  */
 const FILEINFO_EXTENSION = UNKNOWN;
 
diff --git a/ext/fileinfo/fileinfo_arginfo.h b/ext/fileinfo/fileinfo_arginfo.h
index ead3cc98dc0ee..8906643939fe3 100644
--- a/ext/fileinfo/fileinfo_arginfo.h
+++ b/ext/fileinfo/fileinfo_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 271c579a0e45c1d3a9bb67a130808ee65ff8cd99 */
+ * Stub hash: 94697d59958fb55a431bfa4786158b5db3c1ae0e */
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_finfo_open, 0, 0, finfo, MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "FILEINFO_NONE")
diff --git a/ext/filter/filter.stub.php b/ext/filter/filter.stub.php
index d31423b4bcf4d..030de50f51890 100644
--- a/ext/filter/filter.stub.php
+++ b/ext/filter/filter.stub.php
@@ -4,293 +4,293 @@
 
 /**
  * @var int
- * @cname PARSE_POST
+ * @cvalue PARSE_POST
  */
 const INPUT_POST = UNKNOWN;
 /**
  * @var int
- * @cname PARSE_GET
+ * @cvalue PARSE_GET
  */
 const INPUT_GET = UNKNOWN;
 /**
  * @var int
- * @cname PARSE_COOKIE
+ * @cvalue PARSE_COOKIE
  */
 const INPUT_COOKIE = UNKNOWN;
 /**
  * @var int
- * @cname PARSE_ENV
+ * @cvalue PARSE_ENV
  */
 const INPUT_ENV = UNKNOWN;
 /**
  * @var int
- * @cname PARSE_SERVER
+ * @cvalue PARSE_SERVER
  */
 const INPUT_SERVER = UNKNOWN;
 
 /**
  * @var int
- * @cname FILTER_FLAG_NONE
+ * @cvalue FILTER_FLAG_NONE
  */
 const FILTER_FLAG_NONE = UNKNOWN;
 
 /**
  * @var int
- * @cname FILTER_REQUIRE_SCALAR
+ * @cvalue FILTER_REQUIRE_SCALAR
  */
 const FILTER_REQUIRE_SCALAR = UNKNOWN;
 /**
  * @var int
- * @cname FILTER_REQUIRE_ARRAY
+ * @cvalue FILTER_REQUIRE_ARRAY
  */
 const FILTER_REQUIRE_ARRAY = UNKNOWN;
 /**
  * @var int
- * @cname FILTER_FORCE_ARRAY
+ * @cvalue FILTER_FORCE_ARRAY
  */
 const FILTER_FORCE_ARRAY = UNKNOWN;
 /**
  * @var int
- * @cname FILTER_NULL_ON_FAILURE
+ * @cvalue FILTER_NULL_ON_FAILURE
  */
 const FILTER_NULL_ON_FAILURE = UNKNOWN;
 
 /**
  * @var int
- * @cname FILTER_VALIDATE_INT
+ * @cvalue FILTER_VALIDATE_INT
  */
 const FILTER_VALIDATE_INT = UNKNOWN;
 /**
  * @var int
- * @cname FILTER_VALIDATE_BOOL
+ * @cvalue FILTER_VALIDATE_BOOL
  */
 const FILTER_VALIDATE_BOOLEAN = UNKNOWN;
 /**
  * @var int
- * @cname FILTER_VALIDATE_BOOL
+ * @cvalue FILTER_VALIDATE_BOOL
  */
 const FILTER_VALIDATE_BOOL = UNKNOWN;
 /**
  * @var int
- * @cname FILTER_VALIDATE_FLOAT
+ * @cvalue FILTER_VALIDATE_FLOAT
  */
 const FILTER_VALIDATE_FLOAT = UNKNOWN;
 
 /**
  * @var int
- * @cname FILTER_VALIDATE_REGEXP
+ * @cvalue FILTER_VALIDATE_REGEXP
  */
 const FILTER_VALIDATE_REGEXP = UNKNOWN;
 /**
  * @var int
- * @cname FILTER_VALIDATE_DOMAIN
+ * @cvalue FILTER_VALIDATE_DOMAIN
  */
 const FILTER_VALIDATE_DOMAIN = UNKNOWN;
 /**
  * @var int
- * @cname FILTER_VALIDATE_URL
+ * @cvalue FILTER_VALIDATE_URL
  */
 const FILTER_VALIDATE_URL = UNKNOWN;
 /**
  * @var int
- * @cname FILTER_VALIDATE_EMAIL
+ * @cvalue FILTER_VALIDATE_EMAIL
  */
 const FILTER_VALIDATE_EMAIL = UNKNOWN;
 /**
  * @var int
- * @cname FILTER_VALIDATE_IP
+ * @cvalue FILTER_VALIDATE_IP
  */
 const FILTER_VALIDATE_IP = UNKNOWN;
 /**
  * @var int
- * @cname FILTER_VALIDATE_MAC
+ * @cvalue FILTER_VALIDATE_MAC
  */
 const FILTER_VALIDATE_MAC = UNKNOWN;
 
 /**
  * @var int
- * @cname FILTER_DEFAULT
+ * @cvalue FILTER_DEFAULT
  */
 const FILTER_DEFAULT = UNKNOWN;
 /**
  * @var int
- * @cname FILTER_UNSAFE_RAW
+ * @cvalue FILTER_UNSAFE_RAW
  */
 const FILTER_UNSAFE_RAW = UNKNOWN;
 
 /**
  * @var int
- * @cname FILTER_SANITIZE_STRING
+ * @cvalue FILTER_SANITIZE_STRING
  * @deprecated
  */
 const FILTER_SANITIZE_STRING = UNKNOWN;
 /**
  * @var int
- * @cname FILTER_SANITIZE_STRING
+ * @cvalue FILTER_SANITIZE_STRING
  * @deprecated
  */
 const FILTER_SANITIZE_STRIPPED = UNKNOWN;
 /**
  * @var int
- * @cname FILTER_SANITIZE_ENCODED
+ * @cvalue FILTER_SANITIZE_ENCODED
  */
 const FILTER_SANITIZE_ENCODED = UNKNOWN;
 /**
  * @var int
- * @cname FILTER_SANITIZE_SPECIAL_CHARS
+ * @cvalue FILTER_SANITIZE_SPECIAL_CHARS
  */
 const FILTER_SANITIZE_SPECIAL_CHARS = UNKNOWN;
 /**
  * @var int
- * @cname FILTER_SANITIZE_FULL_SPECIAL_CHARS
+ * @cvalue FILTER_SANITIZE_FULL_SPECIAL_CHARS
  */
 const FILTER_SANITIZE_FULL_SPECIAL_CHARS = UNKNOWN;
 /**
  * @var int
- * @cname FILTER_SANITIZE_EMAIL
+ * @cvalue FILTER_SANITIZE_EMAIL
  */
 const FILTER_SANITIZE_EMAIL = UNKNOWN;
 /**
  * @var int
- * @cname FILTER_SANITIZE_URL
+ * @cvalue FILTER_SANITIZE_URL
  */
 const FILTER_SANITIZE_URL = UNKNOWN;
 /**
  * @var int
- * @cname FILTER_SANITIZE_NUMBER_INT
+ * @cvalue FILTER_SANITIZE_NUMBER_INT
  */
 const FILTER_SANITIZE_NUMBER_INT = UNKNOWN;
 /**
  * @var int
- * @cname FILTER_SANITIZE_NUMBER_FLOAT
+ * @cvalue FILTER_SANITIZE_NUMBER_FLOAT
  */
 const FILTER_SANITIZE_NUMBER_FLOAT = UNKNOWN;
 /**
  * @var int
- * @cname FILTER_SANITIZE_ADD_SLASHES
+ * @cvalue FILTER_SANITIZE_ADD_SLASHES
  */
 const FILTER_SANITIZE_ADD_SLASHES = UNKNOWN;
 
 /**
  * @var int
- * @cname FILTER_CALLBACK
+ * @cvalue FILTER_CALLBACK
  */
 const FILTER_CALLBACK = UNKNOWN;
 
 /**
  * @var int
- * @cname FILTER_FLAG_ALLOW_OCTAL
+ * @cvalue FILTER_FLAG_ALLOW_OCTAL
  */
 const FILTER_FLAG_ALLOW_OCTAL = UNKNOWN;
 /**
  * @var int
- * @cname FILTER_FLAG_ALLOW_HEX
+ * @cvalue FILTER_FLAG_ALLOW_HEX
  */
 const FILTER_FLAG_ALLOW_HEX = UNKNOWN;
 
 /**
  * @var int
- * @cname FILTER_FLAG_STRIP_LOW
+ * @cvalue FILTER_FLAG_STRIP_LOW
  */
 const FILTER_FLAG_STRIP_LOW = UNKNOWN;
 /**
  * @var int
- * @cname FILTER_FLAG_STRIP_HIGH
+ * @cvalue FILTER_FLAG_STRIP_HIGH
  */
 const FILTER_FLAG_STRIP_HIGH = UNKNOWN;
 /**
  * @var int
- * @cname FILTER_FLAG_STRIP_BACKTICK
+ * @cvalue FILTER_FLAG_STRIP_BACKTICK
  */
 const FILTER_FLAG_STRIP_BACKTICK = UNKNOWN;
 /**
  * @var int
- * @cname FILTER_FLAG_ENCODE_LOW
+ * @cvalue FILTER_FLAG_ENCODE_LOW
  */
 const FILTER_FLAG_ENCODE_LOW = UNKNOWN;
 /**
  * @var int
- * @cname FILTER_FLAG_ENCODE_HIGH
+ * @cvalue FILTER_FLAG_ENCODE_HIGH
  */
 const FILTER_FLAG_ENCODE_HIGH = UNKNOWN;
 /**
  * @var int
- * @cname FILTER_FLAG_ENCODE_AMP
+ * @cvalue FILTER_FLAG_ENCODE_AMP
  */
 const FILTER_FLAG_ENCODE_AMP = UNKNOWN;
 /**
  * @var int
- * @cname FILTER_FLAG_NO_ENCODE_QUOTES
+ * @cvalue FILTER_FLAG_NO_ENCODE_QUOTES
  */
 const FILTER_FLAG_NO_ENCODE_QUOTES = UNKNOWN;
 /**
  * @var int
- * @cname FILTER_FLAG_EMPTY_STRING_NULL
+ * @cvalue FILTER_FLAG_EMPTY_STRING_NULL
  */
 const FILTER_FLAG_EMPTY_STRING_NULL = UNKNOWN;
 
 /**
  * @var int
- * @cname FILTER_FLAG_ALLOW_FRACTION
+ * @cvalue FILTER_FLAG_ALLOW_FRACTION
  */
 const FILTER_FLAG_ALLOW_FRACTION = UNKNOWN;
 /**
  * @var int
- * @cname FILTER_FLAG_ALLOW_THOUSAND
+ * @cvalue FILTER_FLAG_ALLOW_THOUSAND
  */
 const FILTER_FLAG_ALLOW_THOUSAND = UNKNOWN;
 /**
  * @var int
- * @cname FILTER_FLAG_ALLOW_SCIENTIFIC
+ * @cvalue FILTER_FLAG_ALLOW_SCIENTIFIC
  */
 const FILTER_FLAG_ALLOW_SCIENTIFIC = UNKNOWN;
 
 /**
  * @var int
- * @cname FILTER_FLAG_PATH_REQUIRED
+ * @cvalue FILTER_FLAG_PATH_REQUIRED
  */
 const FILTER_FLAG_PATH_REQUIRED = UNKNOWN;
 /**
  * @var int
- * @cname FILTER_FLAG_QUERY_REQUIRED
+ * @cvalue FILTER_FLAG_QUERY_REQUIRED
  */
 const FILTER_FLAG_QUERY_REQUIRED = UNKNOWN;
 
 /**
  * @var int
- * @cname FILTER_FLAG_IPV4
+ * @cvalue FILTER_FLAG_IPV4
  */
 const FILTER_FLAG_IPV4 = UNKNOWN;
 /**
  * @var int
- * @cname FILTER_FLAG_IPV6
+ * @cvalue FILTER_FLAG_IPV6
  */
 const FILTER_FLAG_IPV6 = UNKNOWN;
 /**
  * @var int
- * @cname FILTER_FLAG_NO_RES_RANGE
+ * @cvalue FILTER_FLAG_NO_RES_RANGE
  */
 const FILTER_FLAG_NO_RES_RANGE = UNKNOWN;
 /**
  * @var int
- * @cname FILTER_FLAG_NO_PRIV_RANGE
+ * @cvalue FILTER_FLAG_NO_PRIV_RANGE
  */
 const FILTER_FLAG_NO_PRIV_RANGE = UNKNOWN;
 /**
  * @var int
- * @cname FILTER_FLAG_GLOBAL_RANGE
+ * @cvalue FILTER_FLAG_GLOBAL_RANGE
  */
 const FILTER_FLAG_GLOBAL_RANGE = UNKNOWN;
 
 /**
  * @var int
- * @cname FILTER_FLAG_HOSTNAME
+ * @cvalue FILTER_FLAG_HOSTNAME
  */
 const FILTER_FLAG_HOSTNAME = UNKNOWN;
 
 /**
  * @var int
- * @cname FILTER_FLAG_EMAIL_UNICODE
+ * @cvalue FILTER_FLAG_EMAIL_UNICODE
  */
 const FILTER_FLAG_EMAIL_UNICODE = UNKNOWN;
 
diff --git a/ext/filter/filter_arginfo.h b/ext/filter/filter_arginfo.h
index 003c1a1da8aa9..f79b7112f601c 100644
--- a/ext/filter/filter_arginfo.h
+++ b/ext/filter/filter_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 85b9df04b0afa6404803c42e37fabe8c5b6265bb */
+ * Stub hash: c3f3240137eaa89316276920acf35f975b2dd8f9 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_filter_has_var, 0, 2, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, input_type, IS_LONG, 0)
diff --git a/ext/ftp/ftp.stub.php b/ext/ftp/ftp.stub.php
index b83520b655380..3b8c55871e98e 100644
--- a/ext/ftp/ftp.stub.php
+++ b/ext/ftp/ftp.stub.php
@@ -5,57 +5,57 @@
 namespace FTP {
     /**
      * @var int
-     * @cname FTPTYPE_ASCII
+     * @cvalue FTPTYPE_ASCII
      */
     const FTP_ASCII = UNKNOWN;
     /**
      * @var int
-     * @cname FTPTYPE_ASCII
+     * @cvalue FTPTYPE_ASCII
      */
     const FTP_TEXT = UNKNOWN;
     /**
      * @var int
-     * @cname FTPTYPE_IMAGE
+     * @cvalue FTPTYPE_IMAGE
      */
     const FTP_BINARY = UNKNOWN;
     /**
      * @var int
-     * @cname FTPTYPE_IMAGE
+     * @cvalue FTPTYPE_IMAGE
      */
     const FTP_IMAGE = UNKNOWN;
     /**
      * @var int
-     * @cname PHP_FTP_AUTORESUME
+     * @cvalue PHP_FTP_AUTORESUME
      */
     const FTP_AUTORESUME = UNKNOWN;
     /**
      * @var int
-     * @cname PHP_FTP_OPT_TIMEOUT_SEC
+     * @cvalue PHP_FTP_OPT_TIMEOUT_SEC
      */
     const FTP_TIMEOUT_SEC = UNKNOWN;
     /**
      * @var int
-     * @cname PHP_FTP_OPT_AUTOSEEK
+     * @cvalue PHP_FTP_OPT_AUTOSEEK
      */
     const FTP_AUTOSEEK = UNKNOWN;
     /**
      * @var int
-     * @cname PHP_FTP_OPT_USEPASVADDRESS
+     * @cvalue PHP_FTP_OPT_USEPASVADDRESS
      */
     const FTP_USEPASVADDRESS = UNKNOWN;
     /**
      * @var int
-     * @cname PHP_FTP_FAILED
+     * @cvalue PHP_FTP_FAILED
      */
     const FTP_FAILED = UNKNOWN;
     /**
      * @var int
-     * @cname PHP_FTP_FINISHED
+     * @cvalue PHP_FTP_FINISHED
      */
     const FTP_FINISHED = UNKNOWN;
     /**
      * @var int
-     * @cname PHP_FTP_MOREDATA
+     * @cvalue PHP_FTP_MOREDATA
      */
     const FTP_MOREDATA = UNKNOWN;
 
diff --git a/ext/ftp/ftp_arginfo.h b/ext/ftp/ftp_arginfo.h
index e264370c90d50..a3c1cea469e24 100644
--- a/ext/ftp/ftp_arginfo.h
+++ b/ext/ftp/ftp_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 626d7a2c3ba884188722a07c4c273dbca0b86242 */
+ * Stub hash: 1f66f9b5745bebb0280464b3c1a7f8413c0c6ebc */
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_ftp_connect, 0, 1, FTP\\Connection, MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, hostname, IS_STRING, 0)
diff --git a/ext/gmp/gmp.stub.php b/ext/gmp/gmp.stub.php
index 96ab9cc3981b6..664fc6ded264c 100644
--- a/ext/gmp/gmp.stub.php
+++ b/ext/gmp/gmp.stub.php
@@ -4,56 +4,56 @@
 
 /**
  * @var int
- * @cname GMP_ROUND_ZERO
+ * @cvalue GMP_ROUND_ZERO
  */
 const GMP_ROUND_ZERO = UNKNOWN;
 /**
  * @var int
- * @cname GMP_ROUND_PLUSINF
+ * @cvalue GMP_ROUND_PLUSINF
  */
 const GMP_ROUND_PLUSINF = UNKNOWN;
 /**
  * @var int
- * @cname GMP_ROUND_MINUSINF
+ * @cvalue GMP_ROUND_MINUSINF
  */
 const GMP_ROUND_MINUSINF = UNKNOWN;
 
 #ifdef mpir_version
 /**
  * @var string
- * @cname GMP_MPIR_VERSION_STRING
+ * @cvalue GMP_MPIR_VERSION_STRING
  */
 const GMP_MPIR_VERSION = UNKNOWN;
 #endif
 /**
  * @var string
- * @cname GMP_VERSION_STRING
+ * @cvalue GMP_VERSION_STRING
  */
 const GMP_VERSION = UNKNOWN;
 
 /**
  * @var int
- * @cname GMP_MSW_FIRST
+ * @cvalue GMP_MSW_FIRST
  */
 const GMP_MSW_FIRST = UNKNOWN;
 /**
  * @var int
- * @cname GMP_LSW_FIRST
+ * @cvalue GMP_LSW_FIRST
  */
 const GMP_LSW_FIRST = UNKNOWN;
 /**
  * @var int
- * @cname GMP_LITTLE_ENDIAN
+ * @cvalue GMP_LITTLE_ENDIAN
  */
 const GMP_LITTLE_ENDIAN = UNKNOWN;
 /**
  * @var int
- * @cname GMP_BIG_ENDIAN
+ * @cvalue GMP_BIG_ENDIAN
  */
 const GMP_BIG_ENDIAN = UNKNOWN;
 /**
  * @var int
- * @cname GMP_NATIVE_ENDIAN
+ * @cvalue GMP_NATIVE_ENDIAN
  */
 const GMP_NATIVE_ENDIAN = UNKNOWN;
 
diff --git a/ext/gmp/gmp_arginfo.h b/ext/gmp/gmp_arginfo.h
index cb98b6f47eb6c..2fc7d4fdb7072 100644
--- a/ext/gmp/gmp_arginfo.h
+++ b/ext/gmp/gmp_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: da609931609768d5e874f460cf0b162d813066f0 */
+ * Stub hash: 64a40a366b87a96a291de6a474e60c8d98d15da1 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_gmp_init, 0, 1, GMP, 0)
 	ZEND_ARG_TYPE_MASK(0, num, MAY_BE_LONG|MAY_BE_STRING, NULL)
diff --git a/ext/hash/hash.stub.php b/ext/hash/hash.stub.php
index db7bece2ea24b..9efd72361cde7 100644
--- a/ext/hash/hash.stub.php
+++ b/ext/hash/hash.stub.php
@@ -4,7 +4,7 @@
 
 /**
  * @var int
- * @cname PHP_HASH_HMAC
+ * @cvalue PHP_HASH_HMAC
  */
 const HASH_HMAC = UNKNOWN;
 
diff --git a/ext/hash/hash_arginfo.h b/ext/hash/hash_arginfo.h
index c0e71b35e04e0..5e064fea08a45 100644
--- a/ext/hash/hash_arginfo.h
+++ b/ext/hash/hash_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 0d28e37a0608d601bc1a79425870cff849dadc0f */
+ * Stub hash: 7168b9b3d1422d4f8ff9270c5de2f42988a55811 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_hash, 0, 2, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, algo, IS_STRING, 0)
diff --git a/ext/iconv/iconv.stub.php b/ext/iconv/iconv.stub.php
index d711ad19da3bc..f3d2b8588eb80 100644
--- a/ext/iconv/iconv.stub.php
+++ b/ext/iconv/iconv.stub.php
@@ -4,22 +4,22 @@
 
 /**
  * @var string
- * @cname PHP_ICONV_IMPL_VALUE
+ * @cvalue PHP_ICONV_IMPL_VALUE
  */
 const ICONV_IMPL = UNKNOWN;
 /**
  * @var string
- * @cname get_iconv_version()
+ * @cvalue get_iconv_version()
  */
 const ICONV_VERSION = UNKNOWN;
 /**
  * @var int
- * @cname PHP_ICONV_MIME_DECODE_STRICT
+ * @cvalue PHP_ICONV_MIME_DECODE_STRICT
  */
 const ICONV_MIME_DECODE_STRICT = UNKNOWN;
 /**
  * @var int
- * @cname PHP_ICONV_MIME_DECODE_CONTINUE_ON_ERROR
+ * @cvalue PHP_ICONV_MIME_DECODE_CONTINUE_ON_ERROR
  */
 const ICONV_MIME_DECODE_CONTINUE_ON_ERROR = UNKNOWN;
 
diff --git a/ext/iconv/iconv_arginfo.h b/ext/iconv/iconv_arginfo.h
index e555608d2a008..5b7d7a02ce578 100644
--- a/ext/iconv/iconv_arginfo.h
+++ b/ext/iconv/iconv_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 3df53b4f973d99fe56dd3b95128ab9b49027376a */
+ * Stub hash: 4367fa431d3e4814e42d9aa514c10cae1d842d8f */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_iconv_strlen, 0, 1, MAY_BE_LONG|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
diff --git a/ext/imap/php_imap.stub.php b/ext/imap/php_imap.stub.php
index dc4491bd9de81..7ebe6bce936e7 100644
--- a/ext/imap/php_imap.stub.php
+++ b/ext/imap/php_imap.stub.php
@@ -5,263 +5,263 @@
 namespace {
     /**
      * @var int
-     * @cname NIL
+     * @cvalue NIL
      * @deprecated
      */
     const NIL = UNKNOWN;
 
     /**
      * @var int
-     * @cname PHP_IMAP_OPENTIMEOUT
+     * @cvalue PHP_IMAP_OPENTIMEOUT
      */
     const IMAP_OPENTIMEOUT = UNKNOWN;
     /**
      * @var int
-     * @cname PHP_IMAP_READTIMEOUT
+     * @cvalue PHP_IMAP_READTIMEOUT
      */
     const IMAP_READTIMEOUT = UNKNOWN;
     /**
      * @var int
-     * @cname PHP_IMAP_WRITETIMEOUT
+     * @cvalue PHP_IMAP_WRITETIMEOUT
      */
     const IMAP_WRITETIMEOUT = UNKNOWN;
     /**
      * @var int
-     * @cname PHP_IMAP_CLOSETIMEOUT
+     * @cvalue PHP_IMAP_CLOSETIMEOUT
      */
     const IMAP_CLOSETIMEOUT = UNKNOWN;
 
     /**
      * debug protocol negotiations
      * @var int
-     * @cname OP_DEBUG
+     * @cvalue OP_DEBUG
      */
     const OP_DEBUG = UNKNOWN;
     /**
      * read-only open
      * @var int
-     * @cname OP_READONLY
+     * @cvalue OP_READONLY
      */
     const OP_READONLY = UNKNOWN;
     /**
      * anonymous open of newsgroup
      * @var int
-     * @cname OP_ANONYMOUS
+     * @cvalue OP_ANONYMOUS
      */
     const OP_ANONYMOUS = UNKNOWN;
     /**
      * short (elt-only) caching
      * @var int
-     * @cname OP_SHORTCACHE
+     * @cvalue OP_SHORTCACHE
      */
     const OP_SHORTCACHE = UNKNOWN;
     /**
      * don't pass up events (internal use)
      * @var int
-     * @cname OP_SILENT
+     * @cvalue OP_SILENT
      */
     const OP_SILENT = UNKNOWN;
     /**
      * return driver prototype
      * @var int
-     * @cname OP_PROTOTYPE
+     * @cvalue OP_PROTOTYPE
      */
     const OP_PROTOTYPE = UNKNOWN;
     /**
      * half-open (IMAP connect but no select)
      * @var int
-     * @cname OP_HALFOPEN
+     * @cvalue OP_HALFOPEN
      */
     const OP_HALFOPEN = UNKNOWN;
     /**
      * silently expunge recycle stream
      * @var int
-     * @cname OP_EXPUNGE
+     * @cvalue OP_EXPUNGE
      */
     const OP_EXPUNGE = UNKNOWN;
     /**
      * don't do non-secure authentication
      * @var int
-     * @cname OP_SECURE
+     * @cvalue OP_SECURE
      */
     const OP_SECURE = UNKNOWN;
 
     /**
      * @var int
-     * @cname PHP_EXPUNGE
+     * @cvalue PHP_EXPUNGE
      */
     const CL_EXPUNGE = UNKNOWN;
 
     /**
      * argument is a UID
      * @var int
-     * @cname FT_UID
+     * @cvalue FT_UID
      */
     const FT_UID = UNKNOWN;
     /**
      * peek at data
      * @var int
-     * @cname FT_PEEK
+     * @cvalue FT_PEEK
      */
     const FT_PEEK = UNKNOWN;
     /**
      * NOT flag for header lines fetch
      * @var int
-     * @cname FT_NOT
+     * @cvalue FT_NOT
      */
     const FT_NOT = UNKNOWN;
     /**
      * text can be internal strings
      * @var int
-     * @cname FT_INTERNAL
+     * @cvalue FT_INTERNAL
      */
     const FT_INTERNAL = UNKNOWN;
     /**
      * IMAP prefetch text when fetching header
      * @var int
-     * @cname FT_PREFETCHTEXT
+     * @cvalue FT_PREFETCHTEXT
      */
     const FT_PREFETCHTEXT = UNKNOWN;
 
     /**
      * argument is a UID sequence
      * @var int
-     * @cname ST_UID
+     * @cvalue ST_UID
      */
     const ST_UID = UNKNOWN;
     /**
      * don't return results
      * @var int
-     * @cname ST_SILENT
+     * @cvalue ST_SILENT
      */
     const ST_SILENT = UNKNOWN;
     /**
      * set vs. clear
      * @var int
-     * @cname ST_SET
+     * @cvalue ST_SET
      */
     const ST_SET = UNKNOWN;
 
     /**
      * argument is a UID sequence
      * @var int
-     * @cname CP_UID
+     * @cvalue CP_UID
      */
     const CP_UID = UNKNOWN;
     /**
      * delete from source after copying
      * @var int
-     * @cname CP_MOVE
+     * @cvalue CP_MOVE
      */
     const CP_MOVE = UNKNOWN;
 
     /**
      * return UID
      * @var int
-     * @cname SE_UID
+     * @cvalue SE_UID
      */
     const SE_UID = UNKNOWN;
     /**
      * free search program after finished
      * @var int
-     * @cname SE_FREE
+     * @cvalue SE_FREE
      */
     const SE_FREE = UNKNOWN;
     /**
      * no search prefetchin
      * @var int
-     * @cname SE_NOPREFETCH
+     * @cvalue SE_NOPREFETCH
      */
     const SE_NOPREFETCH = UNKNOWN;
     /**
      * free sort program after finished
      * @var int
-     * @cname SO_FREE
+     * @cvalue SO_FREE
      */
     const SO_FREE = UNKNOWN;
     /**
      * don't do server-based sort
      * @var int
-     * @cname SO_FREE
+     * @cvalue SO_FREE
      */
     const SO_NOSERVER = UNKNOWN;
 
     /**
      * number of messages
      * @var int
-     * @cname SA_MESSAGES
+     * @cvalue SA_MESSAGES
      */
     const SA_MESSAGES = UNKNOWN;
     /**
      * number of recent messages
      * @var int
-     * @cname SA_RECENT
+     * @cvalue SA_RECENT
      */
     const SA_RECENT = UNKNOWN;
     /**
      * number of unseen messages
      * @var int
-     * @cname SA_UNSEEN
+     * @cvalue SA_UNSEEN
      */
     const SA_UNSEEN = UNKNOWN;
     /**
      * next UID to be assigned
      * @var int
-     * @cname SA_UIDNEXT
+     * @cvalue SA_UIDNEXT
      */
     const SA_UIDNEXT = UNKNOWN;
     /**
      * UID validity value
      * @var int
-     * @cname SA_UIDVALIDITY
+     * @cvalue SA_UIDVALIDITY
      */
     const SA_UIDVALIDITY = UNKNOWN;
     /**
      * get all status information
      * @var int
-     * @cname SA_ALL
+     * @cvalue SA_ALL
      */
     const SA_ALL = UNKNOWN;
 
     /**
      * @var int
-     * @cname LATT_NOINFERIORS
+     * @cvalue LATT_NOINFERIORS
      */
     const LATT_NOINFERIORS = UNKNOWN;
     /**
      * @var int
-     * @cname LATT_NOSELECT
+     * @cvalue LATT_NOSELECT
      */
     const LATT_NOSELECT = UNKNOWN;
     /**
      * @var int
-     * @cname LATT_MARKED
+     * @cvalue LATT_MARKED
      */
     const LATT_MARKED = UNKNOWN;
     /**
      * @var int
-     * @cname LATT_UNMARKED
+     * @cvalue LATT_UNMARKED
      */
     const LATT_UNMARKED = UNKNOWN;
 
 #ifdef LATT_REFERRAL
     /**
      * @var int
-     * @cname LATT_REFERRAL
+     * @cvalue LATT_REFERRAL
      */
     const LATT_REFERRAL = UNKNOWN;
 #endif
 #ifdef LATT_HASCHILDREN
     /**
      * @var int
-     * @cname LATT_HASCHILDREN
+     * @cvalue LATT_HASCHILDREN
      */
     const LATT_HASCHILDREN = UNKNOWN;
 #endif
 #ifdef LATT_HASNOCHILDREN
     /**
      * @var int
-     * @cname LATT_HASNOCHILDREN
+     * @cvalue LATT_HASNOCHILDREN
      */
     const LATT_HASNOCHILDREN = UNKNOWN;
 #endif
@@ -269,139 +269,139 @@
     /**
      * date
      * @var int
-     * @cname SORTDATE
+     * @cvalue SORTDATE
      */
     const SORTDATE = UNKNOWN;
     /**
      * arrival date
      * @var int
-     * @cname SORTARRIVAL
+     * @cvalue SORTARRIVAL
      */
     const SORTARRIVAL = UNKNOWN;
     /**
      * from
      * @var int
-     * @cname SORTFROM
+     * @cvalue SORTFROM
      */
     const SORTFROM = UNKNOWN;
     /**
      * subject
      * @var int
-     * @cname SORTSUBJECT
+     * @cvalue SORTSUBJECT
      */
     const SORTSUBJECT = UNKNOWN;
     /**
      * to
      * @var int
-     * @cname SORTTO
+     * @cvalue SORTTO
      */
     const SORTTO = UNKNOWN;
     /**
      * cc
      * @var int
-     * @cname SORTCC
+     * @cvalue SORTCC
      */
     const SORTCC = UNKNOWN;
     /**
      * size
      * @var int
-     * @cname SORTSIZE
+     * @cvalue SORTSIZE
      */
     const SORTSIZE = UNKNOWN;
 
     /**
      * @var int
-     * @cname TYPETEXT
+     * @cvalue TYPETEXT
      */
     const TYPETEXT = UNKNOWN;
     /**
      * @var int
-     * @cname TYPEMULTIPART
+     * @cvalue TYPEMULTIPART
      */
     const TYPEMULTIPART = UNKNOWN;
     /**
      * @var int
-     * @cname TYPEMESSAGE
+     * @cvalue TYPEMESSAGE
      */
     const TYPEMESSAGE = UNKNOWN;
     /**
      * @var int
-     * @cname TYPEAPPLICATION
+     * @cvalue TYPEAPPLICATION
      */
     const TYPEAPPLICATION = UNKNOWN;
     /**
      * @var int
-     * @cname TYPEAUDIO
+     * @cvalue TYPEAUDIO
      */
     const TYPEAUDIO = UNKNOWN;
     /**
      * @var int
-     * @cname TYPEIMAGE
+     * @cvalue TYPEIMAGE
      */
     const TYPEIMAGE = UNKNOWN;
     /**
      * @var int
-     * @cname TYPEVIDEO
+     * @cvalue TYPEVIDEO
      */
     const TYPEVIDEO = UNKNOWN;
     /**
      * @var int
-     * @cname TYPEMODEL
+     * @cvalue TYPEMODEL
      */
     const TYPEMODEL = UNKNOWN;
     /**
      * @var int
-     * @cname TYPEOTHER
+     * @cvalue TYPEOTHER
      */
     const TYPEOTHER = UNKNOWN;
 
     /**
      * @var int
-     * @cname ENC7BIT
+     * @cvalue ENC7BIT
      */
     const ENC7BIT = UNKNOWN;
     /**
      * @var int
-     * @cname ENC8BIT
+     * @cvalue ENC8BIT
      */
     const ENC8BIT = UNKNOWN;
     /**
      * @var int
-     * @cname ENCBINARY
+     * @cvalue ENCBINARY
      */
     const ENCBINARY = UNKNOWN;
     /**
      * @var int
-     * @cname ENCBASE64
+     * @cvalue ENCBASE64
      */
     const ENCBASE64 = UNKNOWN;
     /**
      * @var int
-     * @cname ENCQUOTEDPRINTABLE
+     * @cvalue ENCQUOTEDPRINTABLE
      */
     const ENCQUOTEDPRINTABLE = UNKNOWN;
     /**
      * @var int
-     * @cname ENCOTHER
+     * @cvalue ENCOTHER
      */
     const ENCOTHER = UNKNOWN;
 
     /**
      * message cache elements
      * @var int
-     * @cname GC_ELT
+     * @cvalue GC_ELT
      */
     const IMAP_GC_ELT = UNKNOWN;
     /**
      * ENVELOPEs and BODYs
      * @var int
-     * @cname GC_ENV
+     * @cvalue GC_ENV
      */
     const IMAP_GC_ENV = UNKNOWN;
     /**
      * texts
      * @var int
-     * @cname GC_TEXTS
+     * @cvalue GC_TEXTS
      */
     const IMAP_GC_TEXTS = UNKNOWN;
 
diff --git a/ext/imap/php_imap_arginfo.h b/ext/imap/php_imap_arginfo.h
index 6b6c416747a38..1c409f2da27c0 100644
--- a/ext/imap/php_imap_arginfo.h
+++ b/ext/imap/php_imap_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 822fbcdcfe25192fe22bea50766cf798aee76865 */
+ * Stub hash: eebef4c1eaf464b0ff093516cf13f1c33d7d0911 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_imap_open, 0, 3, IMAP\\Connection, MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, mailbox, IS_STRING, 0)
diff --git a/ext/json/json.stub.php b/ext/json/json.stub.php
index 5aec6a3577497..7a8b479ab7657 100644
--- a/ext/json/json.stub.php
+++ b/ext/json/json.stub.php
@@ -4,150 +4,150 @@
 
 /**
  * @var int
- * @cname PHP_JSON_HEX_TAG
+ * @cvalue PHP_JSON_HEX_TAG
  */
 const JSON_HEX_TAG = UNKNOWN;
 /**
  * @var int
- * @cname PHP_JSON_HEX_AMP
+ * @cvalue PHP_JSON_HEX_AMP
  */
 const JSON_HEX_AMP = UNKNOWN;
 /**
  * @var int
- * @cname PHP_JSON_HEX_APOS
+ * @cvalue PHP_JSON_HEX_APOS
  */
 const JSON_HEX_APOS = UNKNOWN;
 /**
  * @var int
- * @cname PHP_JSON_HEX_QUOT
+ * @cvalue PHP_JSON_HEX_QUOT
  */
 const JSON_HEX_QUOT = UNKNOWN;
 /**
  * @var int
- * @cname PHP_JSON_FORCE_OBJECT
+ * @cvalue PHP_JSON_FORCE_OBJECT
  */
 const JSON_FORCE_OBJECT = UNKNOWN;
 /**
  * @var int
- * @cname PHP_JSON_NUMERIC_CHECK
+ * @cvalue PHP_JSON_NUMERIC_CHECK
  */
 const JSON_NUMERIC_CHECK = UNKNOWN;
 /**
  * @var int
- * @cname PHP_JSON_UNESCAPED_SLASHES
+ * @cvalue PHP_JSON_UNESCAPED_SLASHES
  */
 const JSON_UNESCAPED_SLASHES = UNKNOWN;
 /**
  * @var int
- * @cname PHP_JSON_PRETTY_PRINT
+ * @cvalue PHP_JSON_PRETTY_PRINT
  */
 const JSON_PRETTY_PRINT = UNKNOWN;
 /**
  * @var int
- * @cname PHP_JSON_UNESCAPED_UNICODE
+ * @cvalue PHP_JSON_UNESCAPED_UNICODE
  */
 const JSON_UNESCAPED_UNICODE = UNKNOWN;
 /**
  * @var int
- * @cname PHP_JSON_PARTIAL_OUTPUT_ON_ERROR
+ * @cvalue PHP_JSON_PARTIAL_OUTPUT_ON_ERROR
  */
 const JSON_PARTIAL_OUTPUT_ON_ERROR = UNKNOWN;
 /**
  * @var int
- * @cname PHP_JSON_PRESERVE_ZERO_FRACTION
+ * @cvalue PHP_JSON_PRESERVE_ZERO_FRACTION
  */
 const JSON_PRESERVE_ZERO_FRACTION = UNKNOWN;
 /**
  * @var int
- * @cname PHP_JSON_UNESCAPED_LINE_TERMINATORS
+ * @cvalue PHP_JSON_UNESCAPED_LINE_TERMINATORS
  */
 const JSON_UNESCAPED_LINE_TERMINATORS = UNKNOWN;
 
 /**
  * @var int
- * @cname PHP_JSON_OBJECT_AS_ARRAY
+ * @cvalue PHP_JSON_OBJECT_AS_ARRAY
  */
 const JSON_OBJECT_AS_ARRAY = UNKNOWN;
 /**
  * @var int
- * @cname PHP_JSON_BIGINT_AS_STRING
+ * @cvalue PHP_JSON_BIGINT_AS_STRING
  */
 const JSON_BIGINT_AS_STRING = UNKNOWN;
 
 /**
  * @var int
- * @cname PHP_JSON_INVALID_UTF8_IGNORE
+ * @cvalue PHP_JSON_INVALID_UTF8_IGNORE
  */
 const JSON_INVALID_UTF8_IGNORE = UNKNOWN;
 /**
  * @var int
- * @cname PHP_JSON_INVALID_UTF8_SUBSTITUTE
+ * @cvalue PHP_JSON_INVALID_UTF8_SUBSTITUTE
  */
 const JSON_INVALID_UTF8_SUBSTITUTE = UNKNOWN;
 /**
  * @var int
- * @cname PHP_JSON_THROW_ON_ERROR
+ * @cvalue PHP_JSON_THROW_ON_ERROR
  */
 const JSON_THROW_ON_ERROR = UNKNOWN;
 
 /**
  * @var int
- * @cname PHP_JSON_ERROR_NONE
+ * @cvalue PHP_JSON_ERROR_NONE
  */
 const JSON_ERROR_NONE = UNKNOWN;
 /**
  * @var int
- * @cname PHP_JSON_ERROR_DEPTH
+ * @cvalue PHP_JSON_ERROR_DEPTH
  */
 const JSON_ERROR_DEPTH = UNKNOWN;
 /**
  * @var int
- * @cname PHP_JSON_ERROR_STATE_MISMATCH
+ * @cvalue PHP_JSON_ERROR_STATE_MISMATCH
  */
 const JSON_ERROR_STATE_MISMATCH = UNKNOWN;
 /**
  * @var int
- * @cname PHP_JSON_ERROR_CTRL_CHAR
+ * @cvalue PHP_JSON_ERROR_CTRL_CHAR
  */
 const JSON_ERROR_CTRL_CHAR = UNKNOWN;
 /**
  * @var int
- * @cname PHP_JSON_ERROR_SYNTAX
+ * @cvalue PHP_JSON_ERROR_SYNTAX
  */
 const JSON_ERROR_SYNTAX = UNKNOWN;
 /**
  * @var int
- * @cname PHP_JSON_ERROR_UTF8
+ * @cvalue PHP_JSON_ERROR_UTF8
  */
 const JSON_ERROR_UTF8 = UNKNOWN;
 /**
  * @var int
- * @cname PHP_JSON_ERROR_RECURSION
+ * @cvalue PHP_JSON_ERROR_RECURSION
  */
 const JSON_ERROR_RECURSION = UNKNOWN;
 /**
  * @var int
- * @cname PHP_JSON_ERROR_INF_OR_NAN
+ * @cvalue PHP_JSON_ERROR_INF_OR_NAN
  */
 const JSON_ERROR_INF_OR_NAN = UNKNOWN;
 /**
  * @var int
- * @cname PHP_JSON_ERROR_UNSUPPORTED_TYPE
+ * @cvalue PHP_JSON_ERROR_UNSUPPORTED_TYPE
  */
 const JSON_ERROR_UNSUPPORTED_TYPE = UNKNOWN;
 /**
  * @var int
- * @cname PHP_JSON_ERROR_INVALID_PROPERTY_NAME
+ * @cvalue PHP_JSON_ERROR_INVALID_PROPERTY_NAME
  */
 const JSON_ERROR_INVALID_PROPERTY_NAME = UNKNOWN;
 /**
  * @var int
- * @cname PHP_JSON_ERROR_UTF16
+ * @cvalue PHP_JSON_ERROR_UTF16
  */
 const JSON_ERROR_UTF16 = UNKNOWN;
 /**
  * @var int
- * @cname PHP_JSON_ERROR_NON_BACKED_ENUM
+ * @cvalue PHP_JSON_ERROR_NON_BACKED_ENUM
  */
 const JSON_ERROR_NON_BACKED_ENUM = UNKNOWN;
 
diff --git a/ext/json/json_arginfo.h b/ext/json/json_arginfo.h
index 1276675b6db08..8c88f24c403cd 100644
--- a/ext/json/json_arginfo.h
+++ b/ext/json/json_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 6ff8c3c3f815a7ba887d2fc5e76285925c7fed90 */
+ * Stub hash: 91b1a992a7020081c42e1db876e5cdce94b681dd */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_json_encode, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, value, IS_MIXED, 0)
diff --git a/ext/ldap/ldap.stub.php b/ext/ldap/ldap.stub.php
index dd35c90777b07..3b5aaae78a848 100644
--- a/ext/ldap/ldap.stub.php
+++ b/ext/ldap/ldap.stub.php
@@ -5,154 +5,154 @@
 namespace {
     /**
      * @var int
-     * @cname LDAP_DEREF_NEVER
+     * @cvalue LDAP_DEREF_NEVER
      */
     const LDAP_DEREF_NEVER = UNKNOWN;
     /**
      * @var int
-     * @cname LDAP_DEREF_SEARCHING
+     * @cvalue LDAP_DEREF_SEARCHING
      */
     const LDAP_DEREF_SEARCHING = UNKNOWN;
     /**
      * @var int
-     * @cname LDAP_DEREF_FINDING
+     * @cvalue LDAP_DEREF_FINDING
      */
     const LDAP_DEREF_FINDING = UNKNOWN;
     /**
      * @var int
-     * @cname LDAP_DEREF_ALWAYS
+     * @cvalue LDAP_DEREF_ALWAYS
      */
     const LDAP_DEREF_ALWAYS = UNKNOWN;
 
     /**
      * @var int
-     * @cname LDAP_MODIFY_BATCH_ADD
+     * @cvalue LDAP_MODIFY_BATCH_ADD
      */
     const LDAP_MODIFY_BATCH_ADD = UNKNOWN;
     /**
      * @var int
-     * @cname LDAP_MODIFY_BATCH_REMOVE
+     * @cvalue LDAP_MODIFY_BATCH_REMOVE
      */
     const LDAP_MODIFY_BATCH_REMOVE = UNKNOWN;
     /**
      * @var int
-     * @cname LDAP_MODIFY_BATCH_REMOVE_ALL
+     * @cvalue LDAP_MODIFY_BATCH_REMOVE_ALL
      */
     const LDAP_MODIFY_BATCH_REMOVE_ALL = UNKNOWN;
     /**
      * @var int
-     * @cname LDAP_MODIFY_BATCH_REPLACE
+     * @cvalue LDAP_MODIFY_BATCH_REPLACE
      */
     const LDAP_MODIFY_BATCH_REPLACE = UNKNOWN;
     /**
      * @var string
-     * @cname LDAP_MODIFY_BATCH_ATTRIB
+     * @cvalue LDAP_MODIFY_BATCH_ATTRIB
      */
     const LDAP_MODIFY_BATCH_ATTRIB = UNKNOWN;
     /**
      * @var string
-     * @cname LDAP_MODIFY_BATCH_MODTYPE
+     * @cvalue LDAP_MODIFY_BATCH_MODTYPE
      */
     const LDAP_MODIFY_BATCH_MODTYPE = UNKNOWN;
     /**
      * @var string
-     * @cname LDAP_MODIFY_BATCH_VALUES
+     * @cvalue LDAP_MODIFY_BATCH_VALUES
      */
     const LDAP_MODIFY_BATCH_VALUES = UNKNOWN;
 
 #if ((LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP))
     /**
      * @var int
-     * @cname LDAP_OPT_DEREF
+     * @cvalue LDAP_OPT_DEREF
      */
     const LDAP_OPT_DEREF = UNKNOWN;
     /**
      * @var int
-     * @cname LDAP_OPT_SIZELIMIT
+     * @cvalue LDAP_OPT_SIZELIMIT
      */
     const LDAP_OPT_SIZELIMIT = UNKNOWN;
     /**
      * @var int
-     * @cname LDAP_OPT_TIMELIMIT
+     * @cvalue LDAP_OPT_TIMELIMIT
      */
     const LDAP_OPT_TIMELIMIT = UNKNOWN;
 #ifdef LDAP_OPT_NETWORK_TIMEOUT
     /**
      * @var int
-     * @cname LDAP_OPT_NETWORK_TIMEOUT
+     * @cvalue LDAP_OPT_NETWORK_TIMEOUT
      */
     const LDAP_OPT_NETWORK_TIMEOUT = UNKNOWN;
 #endif
 #if (!defined(LDAP_OPT_NETWORK_TIMEOUT) && defined(LDAP_X_OPT_CONNECT_TIMEOUT))
     /**
      * @var int
-     * @cname LDAP_X_OPT_CONNECT_TIMEOUT
+     * @cvalue LDAP_X_OPT_CONNECT_TIMEOUT
      */
     const LDAP_OPT_NETWORK_TIMEOUT = UNKNOWN;
 #endif
 #ifdef LDAP_OPT_TIMEOUT
     /**
      * @var int
-     * @cname LDAP_OPT_TIMEOUT
+     * @cvalue LDAP_OPT_TIMEOUT
      */
     const LDAP_OPT_TIMEOUT = UNKNOWN;
 #endif
     /**
      * @var int
-     * @cname LDAP_OPT_PROTOCOL_VERSION
+     * @cvalue LDAP_OPT_PROTOCOL_VERSION
      */
     const LDAP_OPT_PROTOCOL_VERSION = UNKNOWN;
     /**
      * @var int
-     * @cname LDAP_OPT_ERROR_NUMBER
+     * @cvalue LDAP_OPT_ERROR_NUMBER
      */
     const LDAP_OPT_ERROR_NUMBER = UNKNOWN;
     /**
      * @var int
-     * @cname LDAP_OPT_REFERRALS
+     * @cvalue LDAP_OPT_REFERRALS
      */
     const LDAP_OPT_REFERRALS = UNKNOWN;
 #ifdef LDAP_OPT_RESTART
     /**
      * @var int
-     * @cname LDAP_OPT_RESTART
+     * @cvalue LDAP_OPT_RESTART
      */
     const LDAP_OPT_RESTART = UNKNOWN;
 #endif
 #ifdef LDAP_OPT_HOST_NAME
     /**
      * @var int
-     * @cname LDAP_OPT_HOST_NAME
+     * @cvalue LDAP_OPT_HOST_NAME
      */
     const LDAP_OPT_HOST_NAME = UNKNOWN;
 #endif
     /**
      * @var int
-     * @cname LDAP_OPT_ERROR_STRING
+     * @cvalue LDAP_OPT_ERROR_STRING
      */
     const LDAP_OPT_ERROR_STRING = UNKNOWN;
 #ifdef LDAP_OPT_MATCHED_DN
     /**
      * @var int
-     * @cname LDAP_OPT_MATCHED_DN
+     * @cvalue LDAP_OPT_MATCHED_DN
      */
     const LDAP_OPT_MATCHED_DN = UNKNOWN;
 #endif
     /**
      * @var int
-     * @cname LDAP_OPT_SERVER_CONTROLS
+     * @cvalue LDAP_OPT_SERVER_CONTROLS
      */
     const LDAP_OPT_SERVER_CONTROLS = UNKNOWN;
     /**
      * @var int
-     * @cname LDAP_OPT_CLIENT_CONTROLS
+     * @cvalue LDAP_OPT_CLIENT_CONTROLS
      */
     const LDAP_OPT_CLIENT_CONTROLS = UNKNOWN;
 #endif
 #ifdef LDAP_OPT_DEBUG_LEVEL
     /**
      * @var int
-     * @cname LDAP_OPT_DEBUG_LEVEL
+     * @cvalue LDAP_OPT_DEBUG_LEVEL
      */
     const LDAP_OPT_DEBUG_LEVEL = UNKNOWN;
 #endif
@@ -160,7 +160,7 @@
 #ifdef LDAP_OPT_DIAGNOSTIC_MESSAGE
     /**
      * @var int
-     * @cname LDAP_OPT_DIAGNOSTIC_MESSAGE
+     * @cvalue LDAP_OPT_DIAGNOSTIC_MESSAGE
      */
     const LDAP_OPT_DIAGNOSTIC_MESSAGE = UNKNOWN;
 #endif
@@ -168,22 +168,22 @@
 #ifdef HAVE_LDAP_SASL
     /**
      * @var int
-     * @cname LDAP_OPT_X_SASL_MECH
+     * @cvalue LDAP_OPT_X_SASL_MECH
      */
     const LDAP_OPT_X_SASL_MECH = UNKNOWN;
     /**
      * @var int
-     * @cname LDAP_OPT_X_SASL_REALM
+     * @cvalue LDAP_OPT_X_SASL_REALM
      */
     const LDAP_OPT_X_SASL_REALM = UNKNOWN;
     /**
      * @var int
-     * @cname LDAP_OPT_X_SASL_AUTHCID
+     * @cvalue LDAP_OPT_X_SASL_AUTHCID
      */
     const LDAP_OPT_X_SASL_AUTHCID = UNKNOWN;
     /**
      * @var int
-     * @cname LDAP_OPT_X_SASL_AUTHZID
+     * @cvalue LDAP_OPT_X_SASL_AUTHZID
      */
     const LDAP_OPT_X_SASL_AUTHZID = UNKNOWN;
 #endif
@@ -191,14 +191,14 @@
 #ifdef LDAP_OPT_X_SASL_NOCANON
     /**
      * @var int
-     * @cname LDAP_OPT_X_SASL_NOCANON
+     * @cvalue LDAP_OPT_X_SASL_NOCANON
      */
     const LDAP_OPT_X_SASL_NOCANON = UNKNOWN;
 #endif
 #ifdef LDAP_OPT_X_SASL_USERNAME
     /**
      * @var int
-     * @cname LDAP_OPT_X_SASL_USERNAME
+     * @cvalue LDAP_OPT_X_SASL_USERNAME
      */
     const LDAP_OPT_X_SASL_USERNAME = UNKNOWN;
 #endif
@@ -206,17 +206,17 @@
 #ifdef ORALDAP
     /**
      * @var int
-     * @cname GSLC_SSL_NO_AUTH
+     * @cvalue GSLC_SSL_NO_AUTH
      */
     const GSLC_SSL_NO_AUTH = UNKNOWN;
     /**
      * @var int
-     * @cname GSLC_SSL_ONEWAY_AUTH
+     * @cvalue GSLC_SSL_ONEWAY_AUTH
      */
     const GSLC_SSL_ONEWAY_AUTH = UNKNOWN;
     /**
      * @var int
-     * @cname GSLC_SSL_TWOWAY_AUTH
+     * @cvalue GSLC_SSL_TWOWAY_AUTH
      */
     const GSLC_SSL_TWOWAY_AUTH = UNKNOWN;
 #endif
@@ -224,64 +224,64 @@
 #if (LDAP_API_VERSION > 2000)
     /**
      * @var int
-     * @cname LDAP_OPT_X_TLS_REQUIRE_CERT
+     * @cvalue LDAP_OPT_X_TLS_REQUIRE_CERT
      */
     const LDAP_OPT_X_TLS_REQUIRE_CERT = UNKNOWN;
 
     /**
      * @var int
-     * @cname LDAP_OPT_X_TLS_NEVER
+     * @cvalue LDAP_OPT_X_TLS_NEVER
      */
     const LDAP_OPT_X_TLS_NEVER = UNKNOWN;
     /**
      * @var int
-     * @cname LDAP_OPT_X_TLS_HARD
+     * @cvalue LDAP_OPT_X_TLS_HARD
      */
     const LDAP_OPT_X_TLS_HARD = UNKNOWN;
     /**
      * @var int
-     * @cname LDAP_OPT_X_TLS_DEMAND
+     * @cvalue LDAP_OPT_X_TLS_DEMAND
      */
     const LDAP_OPT_X_TLS_DEMAND = UNKNOWN;
     /**
      * @var int
-     * @cname LDAP_OPT_X_TLS_ALLOW
+     * @cvalue LDAP_OPT_X_TLS_ALLOW
      */
     const LDAP_OPT_X_TLS_ALLOW = UNKNOWN;
     /**
      * @var int
-     * @cname LDAP_OPT_X_TLS_TRY
+     * @cvalue LDAP_OPT_X_TLS_TRY
      */
     const LDAP_OPT_X_TLS_TRY = UNKNOWN;
 
     /**
      * @var int
-     * @cname LDAP_OPT_X_TLS_CACERTDIR
+     * @cvalue LDAP_OPT_X_TLS_CACERTDIR
      */
     const LDAP_OPT_X_TLS_CACERTDIR = UNKNOWN;
     /**
      * @var int
-     * @cname LDAP_OPT_X_TLS_CACERTFILE
+     * @cvalue LDAP_OPT_X_TLS_CACERTFILE
      */
     const LDAP_OPT_X_TLS_CACERTFILE = UNKNOWN;
     /**
      * @var int
-     * @cname LDAP_OPT_X_TLS_CERTFILE
+     * @cvalue LDAP_OPT_X_TLS_CERTFILE
      */
     const LDAP_OPT_X_TLS_CERTFILE = UNKNOWN;
     /**
      * @var int
-     * @cname LDAP_OPT_X_TLS_CIPHER_SUITE
+     * @cvalue LDAP_OPT_X_TLS_CIPHER_SUITE
      */
     const LDAP_OPT_X_TLS_CIPHER_SUITE = UNKNOWN;
     /**
      * @var int
-     * @cname LDAP_OPT_X_TLS_KEYFILE
+     * @cvalue LDAP_OPT_X_TLS_KEYFILE
      */
     const LDAP_OPT_X_TLS_KEYFILE = UNKNOWN;
     /**
      * @var int
-     * @cname LDAP_OPT_X_TLS_RANDOM_FILE
+     * @cvalue LDAP_OPT_X_TLS_RANDOM_FILE
      */
     const LDAP_OPT_X_TLS_RANDOM_FILE = UNKNOWN;
 #endif
@@ -289,22 +289,22 @@
 #ifdef LDAP_OPT_X_TLS_CRLCHECK
     /**
      * @var int
-     * @cname LDAP_OPT_X_TLS_CRLCHECK
+     * @cvalue LDAP_OPT_X_TLS_CRLCHECK
      */
     const LDAP_OPT_X_TLS_CRLCHECK = UNKNOWN;
     /**
      * @var int
-     * @cname LDAP_OPT_X_TLS_CRL_NONE
+     * @cvalue LDAP_OPT_X_TLS_CRL_NONE
      */
     const LDAP_OPT_X_TLS_CRL_NONE = UNKNOWN;
     /**
      * @var int
-     * @cname LDAP_OPT_X_TLS_CRL_PEER
+     * @cvalue LDAP_OPT_X_TLS_CRL_PEER
      */
     const LDAP_OPT_X_TLS_CRL_PEER = UNKNOWN;
     /**
      * @var int
-     * @cname LDAP_OPT_X_TLS_CRL_ALL
+     * @cvalue LDAP_OPT_X_TLS_CRL_ALL
      */
     const LDAP_OPT_X_TLS_CRL_ALL = UNKNOWN;
 #endif
@@ -312,7 +312,7 @@
 #ifdef LDAP_OPT_X_TLS_DHFILE
     /**
      * @var int
-     * @cname LDAP_OPT_X_TLS_DHFILE
+     * @cvalue LDAP_OPT_X_TLS_DHFILE
      */
     const LDAP_OPT_X_TLS_DHFILE = UNKNOWN;
 #endif
@@ -320,7 +320,7 @@
 #ifdef LDAP_OPT_X_TLS_CRLFILE
     /**
      * @var int
-     * @cname LDAP_OPT_X_TLS_CRLFILE
+     * @cvalue LDAP_OPT_X_TLS_CRLFILE
      */
     const LDAP_OPT_X_TLS_CRLFILE = UNKNOWN;
 #endif
@@ -328,33 +328,33 @@
 #ifdef LDAP_OPT_X_TLS_PROTOCOL_MIN
     /**
      * @var int
-     * @cname LDAP_OPT_X_TLS_PROTOCOL_MIN
+     * @cvalue LDAP_OPT_X_TLS_PROTOCOL_MIN
      */
     const LDAP_OPT_X_TLS_PROTOCOL_MIN = UNKNOWN;
 
     /**
      * @var int
-     * @cname LDAP_OPT_X_TLS_PROTOCOL_SSL2
+     * @cvalue LDAP_OPT_X_TLS_PROTOCOL_SSL2
      */
     const LDAP_OPT_X_TLS_PROTOCOL_SSL2 = UNKNOWN;
     /**
      * @var int
-     * @cname LDAP_OPT_X_TLS_PROTOCOL_SSL3
+     * @cvalue LDAP_OPT_X_TLS_PROTOCOL_SSL3
      */
     const LDAP_OPT_X_TLS_PROTOCOL_SSL3 = UNKNOWN;
     /**
      * @var int
-     * @cname LDAP_OPT_X_TLS_PROTOCOL_TLS1_0
+     * @cvalue LDAP_OPT_X_TLS_PROTOCOL_TLS1_0
      */
     const LDAP_OPT_X_TLS_PROTOCOL_TLS1_0 = UNKNOWN;
     /**
      * @var int
-     * @cname LDAP_OPT_X_TLS_PROTOCOL_TLS1_1
+     * @cvalue LDAP_OPT_X_TLS_PROTOCOL_TLS1_1
      */
     const LDAP_OPT_X_TLS_PROTOCOL_TLS1_1 = UNKNOWN;
     /**
      * @var int
-     * @cname LDAP_OPT_X_TLS_PROTOCOL_TLS1_2
+     * @cvalue LDAP_OPT_X_TLS_PROTOCOL_TLS1_2
      */
     const LDAP_OPT_X_TLS_PROTOCOL_TLS1_2 = UNKNOWN;
 #endif
@@ -362,7 +362,7 @@
 #ifdef LDAP_OPT_X_TLS_PACKAGE
     /**
      * @var int
-     * @cname LDAP_OPT_X_TLS_PACKAGE
+     * @cvalue LDAP_OPT_X_TLS_PACKAGE
      */
     const LDAP_OPT_X_TLS_PACKAGE = UNKNOWN;
 #endif
@@ -370,56 +370,56 @@
 #ifdef LDAP_OPT_X_KEEPALIVE_IDLE
     /**
      * @var int
-     * @cname LDAP_OPT_X_KEEPALIVE_IDLE
+     * @cvalue LDAP_OPT_X_KEEPALIVE_IDLE
      */
     const LDAP_OPT_X_KEEPALIVE_IDLE = UNKNOWN;
     /**
      * @var int
-     * @cname LDAP_OPT_X_KEEPALIVE_PROBES
+     * @cvalue LDAP_OPT_X_KEEPALIVE_PROBES
      */
     const LDAP_OPT_X_KEEPALIVE_PROBES = UNKNOWN;
     /**
      * @var int
-     * @cname LDAP_OPT_X_KEEPALIVE_INTERVAL
+     * @cvalue LDAP_OPT_X_KEEPALIVE_INTERVAL
      */
     const LDAP_OPT_X_KEEPALIVE_INTERVAL = UNKNOWN;
 #endif
 
     /**
      * @var int
-     * @cname PHP_LDAP_ESCAPE_FILTER
+     * @cvalue PHP_LDAP_ESCAPE_FILTER
      */
     const LDAP_ESCAPE_FILTER = UNKNOWN;
     /**
      * @var int
-     * @cname PHP_LDAP_ESCAPE_DN
+     * @cvalue PHP_LDAP_ESCAPE_DN
      */
     const LDAP_ESCAPE_DN = UNKNOWN;
 
 #ifdef HAVE_LDAP_EXTENDED_OPERATION_S
     /**
      * @var string
-     * @cname LDAP_EXOP_START_TLS
+     * @cvalue LDAP_EXOP_START_TLS
      */
     const LDAP_EXOP_START_TLS = UNKNOWN;
     /**
      * @var string
-     * @cname LDAP_EXOP_MODIFY_PASSWD
+     * @cvalue LDAP_EXOP_MODIFY_PASSWD
      */
     const LDAP_EXOP_MODIFY_PASSWD = UNKNOWN;
     /**
      * @var string
-     * @cname LDAP_EXOP_REFRESH
+     * @cvalue LDAP_EXOP_REFRESH
      */
     const LDAP_EXOP_REFRESH = UNKNOWN;
     /**
      * @var string
-     * @cname LDAP_EXOP_WHO_AM_I
+     * @cvalue LDAP_EXOP_WHO_AM_I
      */
     const LDAP_EXOP_WHO_AM_I = UNKNOWN;
     /**
      * @var string
-     * @cname LDAP_EXOP_TURN
+     * @cvalue LDAP_EXOP_TURN
      */
     const LDAP_EXOP_TURN = UNKNOWN;
 #endif
@@ -428,7 +428,7 @@
     /**
      * RFC 3296
      * @var string
-     * @cname LDAP_CONTROL_MANAGEDSAIT
+     * @cvalue LDAP_CONTROL_MANAGEDSAIT
      */
     const LDAP_CONTROL_MANAGEDSAIT = UNKNOWN;
 #endif
@@ -436,7 +436,7 @@
     /**
      * RFC 4370
      * @var string
-     * @cname LDAP_CONTROL_PROXY_AUTHZ
+     * @cvalue LDAP_CONTROL_PROXY_AUTHZ
      */
     const LDAP_CONTROL_PROXY_AUTHZ = UNKNOWN;
 #endif
@@ -444,7 +444,7 @@
     /**
      * RFC 3672
      * @var string
-     * @cname LDAP_CONTROL_SUBENTRIES
+     * @cvalue LDAP_CONTROL_SUBENTRIES
      */
     const LDAP_CONTROL_SUBENTRIES = UNKNOWN;
 #endif
@@ -452,7 +452,7 @@
     /**
      * RFC 3876
      * @var string
-     * @cname LDAP_CONTROL_VALUESRETURNFILTER
+     * @cvalue LDAP_CONTROL_VALUESRETURNFILTER
      */
     const LDAP_CONTROL_VALUESRETURNFILTER = UNKNOWN;
 #endif
@@ -460,19 +460,19 @@
     /**
      * RFC 4528
      * @var string
-     * @cname LDAP_CONTROL_ASSERT
+     * @cvalue LDAP_CONTROL_ASSERT
      */
     const LDAP_CONTROL_ASSERT = UNKNOWN;
     /**
      * RFC 4527
      * @var string
-     * @cname LDAP_CONTROL_PRE_READ
+     * @cvalue LDAP_CONTROL_PRE_READ
      */
     const LDAP_CONTROL_PRE_READ = UNKNOWN;
     /**
      * RFC 4527
      * @var string
-     * @cname LDAP_CONTROL_POST_READ
+     * @cvalue LDAP_CONTROL_POST_READ
      */
     const LDAP_CONTROL_POST_READ = UNKNOWN;
 #endif
@@ -480,13 +480,13 @@
     /**
      * RFC 2891
      * @var string
-     * @cname LDAP_CONTROL_SORTREQUEST
+     * @cvalue LDAP_CONTROL_SORTREQUEST
      */
     const LDAP_CONTROL_SORTREQUEST = UNKNOWN;
     /**
      * RFC 2891
      * @var string
-     * @cname LDAP_CONTROL_SORTRESPONSE
+     * @cvalue LDAP_CONTROL_SORTRESPONSE
      */
     const LDAP_CONTROL_SORTRESPONSE = UNKNOWN;
 #endif
@@ -494,7 +494,7 @@
     /**
      * RFC 2696
      * @var string
-     * @cname LDAP_CONTROL_PAGEDRESULTS
+     * @cvalue LDAP_CONTROL_PAGEDRESULTS
      */
     const LDAP_CONTROL_PAGEDRESULTS = UNKNOWN;
 #endif
@@ -502,13 +502,13 @@
     /**
      * RFC 3829
      * @var string
-     * @cname LDAP_CONTROL_AUTHZID_REQUEST
+     * @cvalue LDAP_CONTROL_AUTHZID_REQUEST
      */
     const LDAP_CONTROL_AUTHZID_REQUEST = UNKNOWN;
     /**
      * RFC 3829
      * @var string
-     * @cname LDAP_CONTROL_AUTHZID_RESPONSE
+     * @cvalue LDAP_CONTROL_AUTHZID_RESPONSE
      */
     const LDAP_CONTROL_AUTHZID_RESPONSE = UNKNOWN;
 #endif
@@ -516,19 +516,19 @@
     /**
      * LDAP Content Synchronization Operation -- RFC 4533
      * @var string
-     * @cname LDAP_CONTROL_SYNC
+     * @cvalue LDAP_CONTROL_SYNC
      */
     const LDAP_CONTROL_SYNC = UNKNOWN;
     /**
      * RLDAP Content Synchronization Operation -- RFC 4533
      * @var string
-     * @cname LDAP_CONTROL_SYNC_STATE
+     * @cvalue LDAP_CONTROL_SYNC_STATE
      */
     const LDAP_CONTROL_SYNC_STATE = UNKNOWN;
     /**
      * RLDAP Content Synchronization Operation -- RFC 4533
      * @var string
-     * @cname LDAP_CONTROL_SYNC_DONE
+     * @cvalue LDAP_CONTROL_SYNC_DONE
      */
     const LDAP_CONTROL_SYNC_DONE = UNKNOWN;
 #endif
@@ -537,7 +537,7 @@
     /**
      * LDAP Don't Use Copy Control (RFC 6171)
      * @var string
-     * @cname LDAP_CONTROL_DONTUSECOPY
+     * @cvalue LDAP_CONTROL_DONTUSECOPY
      */
     const LDAP_CONTROL_DONTUSECOPY = UNKNOWN;
 #endif
@@ -545,13 +545,13 @@
     /**
      * Password policy Controls
      * @var string
-     * @cname LDAP_CONTROL_PASSWORDPOLICYREQUEST
+     * @cvalue LDAP_CONTROL_PASSWORDPOLICYREQUEST
      */
     const LDAP_CONTROL_PASSWORDPOLICYREQUEST = UNKNOWN;
     /**
      * Password policy Controls
      * @var string
-     * @cname LDAP_CONTROL_PASSWORDPOLICYRESPONSE
+     * @cvalue LDAP_CONTROL_PASSWORDPOLICYRESPONSE
      */
     const LDAP_CONTROL_PASSWORDPOLICYRESPONSE = UNKNOWN;
 #endif
@@ -559,37 +559,37 @@
     /**
      * MS Active Directory controls
      * @var string
-     * @cname LDAP_CONTROL_X_INCREMENTAL_VALUES
+     * @cvalue LDAP_CONTROL_X_INCREMENTAL_VALUES
      */
     const LDAP_CONTROL_X_INCREMENTAL_VALUES = UNKNOWN;
     /**
      * MS Active Directory controls
      * @var string
-     * @cname LDAP_CONTROL_X_DOMAIN_SCOPE
+     * @cvalue LDAP_CONTROL_X_DOMAIN_SCOPE
      */
     const LDAP_CONTROL_X_DOMAIN_SCOPE = UNKNOWN;
     /**
      * MS Active Directory controls
      * @var string
-     * @cname LDAP_CONTROL_X_PERMISSIVE_MODIFY
+     * @cvalue LDAP_CONTROL_X_PERMISSIVE_MODIFY
      */
     const LDAP_CONTROL_X_PERMISSIVE_MODIFY = UNKNOWN;
     /**
      * MS Active Directory controls
      * @var string
-     * @cname LDAP_CONTROL_X_SEARCH_OPTIONS
+     * @cvalue LDAP_CONTROL_X_SEARCH_OPTIONS
      */
     const LDAP_CONTROL_X_SEARCH_OPTIONS = UNKNOWN;
     /**
      * MS Active Directory controls
      * @var string
-     * @cname LDAP_CONTROL_X_TREE_DELETE
+     * @cvalue LDAP_CONTROL_X_TREE_DELETE
      */
     const LDAP_CONTROL_X_TREE_DELETE = UNKNOWN;
     /**
      * MS Active Directory controls
      * @var string
-     * @cname LDAP_CONTROL_X_EXTENDED_DN
+     * @cvalue LDAP_CONTROL_X_EXTENDED_DN
      */
     const LDAP_CONTROL_X_EXTENDED_DN = UNKNOWN;
 #endif
@@ -598,13 +598,13 @@
     /**
      * LDAP VLV
      * @var string
-     * @cname LDAP_CONTROL_VLVREQUEST
+     * @cvalue LDAP_CONTROL_VLVREQUEST
      */
     const LDAP_CONTROL_VLVREQUEST = UNKNOWN;
     /**
      * LDAP VLV
      * @var string
-     * @cname LDAP_CONTROL_VLVRESPONSE
+     * @cvalue LDAP_CONTROL_VLVRESPONSE
      */
     const LDAP_CONTROL_VLVRESPONSE = UNKNOWN;
 #endif
diff --git a/ext/ldap/ldap_arginfo.h b/ext/ldap/ldap_arginfo.h
index 79820a2757bb9..858840f4750b3 100644
--- a/ext/ldap/ldap_arginfo.h
+++ b/ext/ldap/ldap_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: d13eb65a462e331f393657ce748e29f0c582b993 */
+ * Stub hash: 470fcd62773b033ac200d7817b7917eee5bb812e */
 
 #if defined(HAVE_ORALDAP)
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_ldap_connect, 0, 0, LDAP\\Connection, MAY_BE_FALSE)
diff --git a/ext/libxml/libxml.stub.php b/ext/libxml/libxml.stub.php
index 02ceee6f4ad91..747e43d035b14 100644
--- a/ext/libxml/libxml.stub.php
+++ b/ext/libxml/libxml.stub.php
@@ -4,112 +4,112 @@
 
 /**
  * @var int
- * @cname LIBXML_VERSION
+ * @cvalue LIBXML_VERSION
  */
 const LIBXML_VERSION = UNKNOWN;
 /**
  * @var string
- * @cname LIBXML_DOTTED_VERSION
+ * @cvalue LIBXML_DOTTED_VERSION
  */
 const LIBXML_DOTTED_VERSION = UNKNOWN;
 /**
  * @var string
- * @cname PHP_LIBXML_LOADED_VERSION
+ * @cvalue PHP_LIBXML_LOADED_VERSION
  */
 const LIBXML_LOADED_VERSION = UNKNOWN;
 
 /**
  * @var int
- * @cname XML_PARSE_NOENT
+ * @cvalue XML_PARSE_NOENT
  */
 const LIBXML_NOENT = UNKNOWN;
 /**
  * @var int
- * @cname XML_PARSE_DTDLOAD
+ * @cvalue XML_PARSE_DTDLOAD
  */
 const LIBXML_DTDLOAD = UNKNOWN;
 /**
  * @var int
- * @cname XML_PARSE_DTDATTR
+ * @cvalue XML_PARSE_DTDATTR
  */
 const LIBXML_DTDATTR = UNKNOWN;
 /**
  * @var int
- * @cname XML_PARSE_DTDVALID
+ * @cvalue XML_PARSE_DTDVALID
  */
 const LIBXML_DTDVALID = UNKNOWN;
 /**
  * @var int
- * @cname XML_PARSE_NOERROR
+ * @cvalue XML_PARSE_NOERROR
  */
 const LIBXML_NOERROR = UNKNOWN;
 /**
  * @var int
- * @cname XML_PARSE_NOWARNING
+ * @cvalue XML_PARSE_NOWARNING
  */
 const LIBXML_NOWARNING = UNKNOWN;
 /**
  * @var int
- * @cname XML_PARSE_NOBLANKS
+ * @cvalue XML_PARSE_NOBLANKS
  */
 const LIBXML_NOBLANKS = UNKNOWN;
 /**
  * @var int
- * @cname XML_PARSE_XINCLUDE
+ * @cvalue XML_PARSE_XINCLUDE
  */
 const LIBXML_XINCLUDE = UNKNOWN;
 /**
  * @var int
- * @cname XML_PARSE_NSCLEAN
+ * @cvalue XML_PARSE_NSCLEAN
  */
 const LIBXML_NSCLEAN = UNKNOWN;
 /**
  * @var int
- * @cname XML_PARSE_NOCDATA
+ * @cvalue XML_PARSE_NOCDATA
  */
 const LIBXML_NOCDATA = UNKNOWN;
 /**
  * @var int
- * @cname XML_PARSE_NONET
+ * @cvalue XML_PARSE_NONET
  */
 const LIBXML_NONET = UNKNOWN;
 /**
  * @var int
- * @cname XML_PARSE_PEDANTIC
+ * @cvalue XML_PARSE_PEDANTIC
  */
 const LIBXML_PEDANTIC = UNKNOWN;
 /**
  * @var int
- * @cname XML_PARSE_COMPACT
+ * @cvalue XML_PARSE_COMPACT
  */
 const LIBXML_COMPACT = UNKNOWN;
 /**
  * @var int
- * @cname XML_SAVE_NO_DECL
+ * @cvalue XML_SAVE_NO_DECL
  */
 const LIBXML_NOXMLDECL = UNKNOWN;
 /**
  * @var int
- * @cname XML_PARSE_HUGE
+ * @cvalue XML_PARSE_HUGE
  */
 const LIBXML_PARSEHUGE = UNKNOWN;
 #if LIBXML_VERSION >= 20900
 /**
  * @var int
- * @cname XML_PARSE_BIG_LINES
+ * @cvalue XML_PARSE_BIG_LINES
  */
 const LIBXML_BIGLINES = UNKNOWN;
 #endif
 /**
  * @var int
- * @cname LIBXML_SAVE_NOEMPTYTAG
+ * @cvalue LIBXML_SAVE_NOEMPTYTAG
  */
 const LIBXML_NOEMPTYTAG = UNKNOWN;
 
 #ifdef LIBXML_SCHEMAS_ENABLED
 /**
  * @var int
- * @cname XML_SCHEMA_VAL_VC_I_CREATE
+ * @cvalue XML_SCHEMA_VAL_VC_I_CREATE
  */
 const LIBXML_SCHEMA_CREATE = UNKNOWN;
 #endif
@@ -117,7 +117,7 @@
 #if LIBXML_VERSION >= 20707
 /**
  * @var int
- * @cname HTML_PARSE_NOIMPLIED
+ * @cvalue HTML_PARSE_NOIMPLIED
  */
 const LIBXML_HTML_NOIMPLIED = UNKNOWN;
 #endif
@@ -125,29 +125,29 @@
 #if LIBXML_VERSION >= 20708
 /**
  * @var int
- * @cname HTML_PARSE_NODEFDTD
+ * @cvalue HTML_PARSE_NODEFDTD
  */
 const LIBXML_HTML_NODEFDTD = UNKNOWN;
 #endif
 
 /**
  * @var int
- * @cname XML_ERR_NONE
+ * @cvalue XML_ERR_NONE
  */
 const LIBXML_ERR_NONE = UNKNOWN;
 /**
  * @var int
- * @cname XML_ERR_WARNING
+ * @cvalue XML_ERR_WARNING
  */
 const LIBXML_ERR_WARNING = UNKNOWN;
 /**
  * @var int
- * @cname XML_ERR_ERROR
+ * @cvalue XML_ERR_ERROR
  */
 const LIBXML_ERR_ERROR = UNKNOWN;
 /**
  * @var int
- * @cname XML_ERR_FATAL
+ * @cvalue XML_ERR_FATAL
  */
 const LIBXML_ERR_FATAL = UNKNOWN;
 
diff --git a/ext/libxml/libxml_arginfo.h b/ext/libxml/libxml_arginfo.h
index 1d369c4de1635..09ba9fa5871a0 100644
--- a/ext/libxml/libxml_arginfo.h
+++ b/ext/libxml/libxml_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 92c1a93932fbd2c2738e30c705716b846eadc40c */
+ * Stub hash: d0c03ca63f0403ea38a59bde94510715e993b423 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_libxml_set_streams_context, 0, 1, IS_VOID, 0)
 	ZEND_ARG_INFO(0, context)
diff --git a/ext/mbstring/mbstring.stub.php b/ext/mbstring/mbstring.stub.php
index 9163ac0b7090c..bfd7024320d5e 100644
--- a/ext/mbstring/mbstring.stub.php
+++ b/ext/mbstring/mbstring.stub.php
@@ -5,49 +5,49 @@
 #ifdef HAVE_MBREGEX
 /**
  * @var string
- * @cname php_mb_oniguruma_version
+ * @cvalue php_mb_oniguruma_version
  */
 const MB_ONIGURUMA_VERSION = UNKNOWN;
 #endif
 
 /**
  * @var int
- * @cname PHP_UNICODE_CASE_UPPER
+ * @cvalue PHP_UNICODE_CASE_UPPER
  */
 const MB_CASE_UPPER = UNKNOWN;
 /**
  * @var int
- * @cname PHP_UNICODE_CASE_LOWER
+ * @cvalue PHP_UNICODE_CASE_LOWER
  */
 const MB_CASE_LOWER = UNKNOWN;
 /**
  * @var int
- * @cname PHP_UNICODE_CASE_TITLE
+ * @cvalue PHP_UNICODE_CASE_TITLE
  */
 const MB_CASE_TITLE = UNKNOWN;
 /**
  * @var int
- * @cname PHP_UNICODE_CASE_FOLD
+ * @cvalue PHP_UNICODE_CASE_FOLD
  */
 const MB_CASE_FOLD = UNKNOWN;
 /**
  * @var int
- * @cname PHP_UNICODE_CASE_UPPER_SIMPLE
+ * @cvalue PHP_UNICODE_CASE_UPPER_SIMPLE
  */
 const MB_CASE_UPPER_SIMPLE = UNKNOWN;
 /**
  * @var int
- * @cname PHP_UNICODE_CASE_LOWER_SIMPLE
+ * @cvalue PHP_UNICODE_CASE_LOWER_SIMPLE
  */
 const MB_CASE_LOWER_SIMPLE = UNKNOWN;
 /**
  * @var int
- * @cname PHP_UNICODE_CASE_TITLE_SIMPLE
+ * @cvalue PHP_UNICODE_CASE_TITLE_SIMPLE
  */
 const MB_CASE_TITLE_SIMPLE = UNKNOWN;
 /**
  * @var int
- * @cname PHP_UNICODE_CASE_FOLD_SIMPLE
+ * @cvalue PHP_UNICODE_CASE_FOLD_SIMPLE
  */
 const MB_CASE_FOLD_SIMPLE = UNKNOWN;
 
diff --git a/ext/mbstring/mbstring_arginfo.h b/ext/mbstring/mbstring_arginfo.h
index 17e49c118f61c..c86209a55099f 100644
--- a/ext/mbstring/mbstring_arginfo.h
+++ b/ext/mbstring/mbstring_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: be25a22e4e90b0a7e7cbcb0b8684c5e691aee0cd */
+ * Stub hash: 48835e813592a48570d258a97dbf00f2e19d8b3a */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_mb_language, 0, 0, MAY_BE_STRING|MAY_BE_BOOL)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, language, IS_STRING, 1, "null")
diff --git a/ext/mysqli/mysqli.stub.php b/ext/mysqli/mysqli.stub.php
index e1e5d0b0c5a2c..bb39ab5bbd147 100644
--- a/ext/mysqli/mysqli.stub.php
+++ b/ext/mysqli/mysqli.stub.php
@@ -5,454 +5,454 @@
 /* mysqli_options */
 /**
  * @var int
- * @cname MYSQL_READ_DEFAULT_GROUP
+ * @cvalue MYSQL_READ_DEFAULT_GROUP
  */
 const MYSQLI_READ_DEFAULT_GROUP = UNKNOWN;
 /**
  * @var int
- * @cname MYSQL_READ_DEFAULT_FILE
+ * @cvalue MYSQL_READ_DEFAULT_FILE
  */
 const MYSQLI_READ_DEFAULT_FILE = UNKNOWN;
 /**
  * @var int
- * @cname MYSQL_OPT_CONNECT_TIMEOUT
+ * @cvalue MYSQL_OPT_CONNECT_TIMEOUT
  */
 const MYSQLI_OPT_CONNECT_TIMEOUT = UNKNOWN;
 /**
  * @var int
- * @cname MYSQL_OPT_LOCAL_INFILE
+ * @cvalue MYSQL_OPT_LOCAL_INFILE
  */
 const MYSQLI_OPT_LOCAL_INFILE = UNKNOWN;
 /**
  * @var int
- * @cname MYSQL_OPT_LOAD_DATA_LOCAL_DIR
+ * @cvalue MYSQL_OPT_LOAD_DATA_LOCAL_DIR
  */
 const MYSQLI_OPT_LOAD_DATA_LOCAL_DIR = UNKNOWN;
 /**
  * @var int
- * @cname MYSQL_INIT_COMMAND
+ * @cvalue MYSQL_INIT_COMMAND
  */
 const MYSQLI_INIT_COMMAND = UNKNOWN;
 /**
  * @var int
- * @cname MYSQL_OPT_READ_TIMEOUT
+ * @cvalue MYSQL_OPT_READ_TIMEOUT
  */
 const MYSQLI_OPT_READ_TIMEOUT = UNKNOWN;
 /**
  * @var int
- * @cname MYSQLND_OPT_NET_CMD_BUFFER_SIZE
+ * @cvalue MYSQLND_OPT_NET_CMD_BUFFER_SIZE
  */
 const MYSQLI_OPT_NET_CMD_BUFFER_SIZE = UNKNOWN;
 /**
  * @var int
- * @cname MYSQLND_OPT_NET_READ_BUFFER_SIZE
+ * @cvalue MYSQLND_OPT_NET_READ_BUFFER_SIZE
  */
 const MYSQLI_OPT_NET_READ_BUFFER_SIZE = UNKNOWN;
 /**
  * @var int
- * @cname MYSQLND_OPT_INT_AND_FLOAT_NATIVE
+ * @cvalue MYSQLND_OPT_INT_AND_FLOAT_NATIVE
  */
 const MYSQLI_OPT_INT_AND_FLOAT_NATIVE = UNKNOWN;
 /**
  * @var int
- * @cname MYSQL_OPT_SSL_VERIFY_SERVER_CERT
+ * @cvalue MYSQL_OPT_SSL_VERIFY_SERVER_CERT
  */
 const MYSQLI_OPT_SSL_VERIFY_SERVER_CERT = UNKNOWN;
 
 /**
  * @var int
- * @cname MYSQL_SERVER_PUBLIC_KEY
+ * @cvalue MYSQL_SERVER_PUBLIC_KEY
  */
 const MYSQLI_SERVER_PUBLIC_KEY = UNKNOWN;
 
 /* mysqli_real_connect flags */
 /**
  * @var int
- * @cname CLIENT_SSL
+ * @cvalue CLIENT_SSL
  */
 const MYSQLI_CLIENT_SSL = UNKNOWN;
 /**
  * @var int
- * @cname CLIENT_COMPRESS
+ * @cvalue CLIENT_COMPRESS
  */
 const MYSQLI_CLIENT_COMPRESS = UNKNOWN;
 /**
  * @var int
- * @cname CLIENT_INTERACTIVE
+ * @cvalue CLIENT_INTERACTIVE
  */
 const MYSQLI_CLIENT_INTERACTIVE = UNKNOWN;
 /**
  * @var int
- * @cname CLIENT_IGNORE_SPACE
+ * @cvalue CLIENT_IGNORE_SPACE
  */
 const MYSQLI_CLIENT_IGNORE_SPACE = UNKNOWN;
 /**
  * @var int
- * @cname CLIENT_NO_SCHEMA
+ * @cvalue CLIENT_NO_SCHEMA
  */
 const MYSQLI_CLIENT_NO_SCHEMA = UNKNOWN;
 /**
  * @var int
- * @cname CLIENT_FOUND_ROWS
+ * @cvalue CLIENT_FOUND_ROWS
  */
 const MYSQLI_CLIENT_FOUND_ROWS = UNKNOWN;
 #ifdef CLIENT_SSL_VERIFY_SERVER_CERT
 /**
  * @var int
- * @cname CLIENT_SSL_VERIFY_SERVER_CERT
+ * @cvalue CLIENT_SSL_VERIFY_SERVER_CERT
  */
 const MYSQLI_CLIENT_SSL_VERIFY_SERVER_CERT = UNKNOWN;
 /**
  * @var int
- * @cname CLIENT_SSL_DONT_VERIFY_SERVER_CERT
+ * @cvalue CLIENT_SSL_DONT_VERIFY_SERVER_CERT
  */
 const MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT = UNKNOWN;
 #endif
 /**
  * @var int
- * @cname CLIENT_CAN_HANDLE_EXPIRED_PASSWORDS
+ * @cvalue CLIENT_CAN_HANDLE_EXPIRED_PASSWORDS
  */
 const MYSQLI_CLIENT_CAN_HANDLE_EXPIRED_PASSWORDS = UNKNOWN;
 /**
  * @var int
- * @cname MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS
+ * @cvalue MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS
  */
 const MYSQLI_OPT_CAN_HANDLE_EXPIRED_PASSWORDS = UNKNOWN;
 
 /* for mysqli_query */
 /**
  * @var int
- * @cname MYSQLI_STORE_RESULT
+ * @cvalue MYSQLI_STORE_RESULT
  */
 const MYSQLI_STORE_RESULT = UNKNOWN;
 /**
  * @var int
- * @cname MYSQLI_USE_RESULT
+ * @cvalue MYSQLI_USE_RESULT
  */
 const MYSQLI_USE_RESULT = UNKNOWN;
 /**
  * @var int
- * @cname MYSQLI_ASYNC
+ * @cvalue MYSQLI_ASYNC
  */
 const MYSQLI_ASYNC = UNKNOWN;
 /**
  * @var int
- * @cname MYSQLI_STORE_RESULT_COPY_DATA
+ * @cvalue MYSQLI_STORE_RESULT_COPY_DATA
  */
 const MYSQLI_STORE_RESULT_COPY_DATA = UNKNOWN;
 
 /* for mysqli_fetch_assoc */
 /**
  * @var int
- * @cname MYSQLI_ASSOC
+ * @cvalue MYSQLI_ASSOC
  */
 const MYSQLI_ASSOC = UNKNOWN;
 /**
  * @var int
- * @cname MYSQLI_NUM
+ * @cvalue MYSQLI_NUM
  */
 const MYSQLI_NUM = UNKNOWN;
 /**
  * @var int
- * @cname MYSQLI_BOTH
+ * @cvalue MYSQLI_BOTH
  */
 const MYSQLI_BOTH = UNKNOWN;
 
 /* for mysqli_stmt_set_attr */
 /**
  * @var int
- * @cname STMT_ATTR_UPDATE_MAX_LENGTH
+ * @cvalue STMT_ATTR_UPDATE_MAX_LENGTH
  */
 const MYSQLI_STMT_ATTR_UPDATE_MAX_LENGTH = UNKNOWN;
 
 /**
  * @var int
- * @cname STMT_ATTR_CURSOR_TYPE
+ * @cvalue STMT_ATTR_CURSOR_TYPE
  */
 const MYSQLI_STMT_ATTR_CURSOR_TYPE = UNKNOWN;
 /**
  * @var int
- * @cname CURSOR_TYPE_NO_CURSOR
+ * @cvalue CURSOR_TYPE_NO_CURSOR
  */
 const MYSQLI_CURSOR_TYPE_NO_CURSOR = UNKNOWN;
 /**
  * @var int
- * @cname CURSOR_TYPE_READ_ONLY
+ * @cvalue CURSOR_TYPE_READ_ONLY
  */
 const MYSQLI_CURSOR_TYPE_READ_ONLY = UNKNOWN;
 /**
  * @var int
- * @cname CURSOR_TYPE_FOR_UPDATE
+ * @cvalue CURSOR_TYPE_FOR_UPDATE
  */
 const MYSQLI_CURSOR_TYPE_FOR_UPDATE = UNKNOWN;
 /**
  * @var int
- * @cname CURSOR_TYPE_SCROLLABLE
+ * @cvalue CURSOR_TYPE_SCROLLABLE
  */
 const MYSQLI_CURSOR_TYPE_SCROLLABLE = UNKNOWN;
 /**
  * @var int
- * @cname STMT_ATTR_PREFETCH_ROWS
+ * @cvalue STMT_ATTR_PREFETCH_ROWS
  */
 const MYSQLI_STMT_ATTR_PREFETCH_ROWS = UNKNOWN;
 
 /* column information */
 /**
  * @var int
- * @cname NOT_NULL_FLAG
+ * @cvalue NOT_NULL_FLAG
  */
 const MYSQLI_NOT_NULL_FLAG = UNKNOWN;
 /**
  * @var int
- * @cname PRI_KEY_FLAG
+ * @cvalue PRI_KEY_FLAG
  */
 const MYSQLI_PRI_KEY_FLAG = UNKNOWN;
 /**
  * @var int
- * @cname UNIQUE_KEY_FLAG
+ * @cvalue UNIQUE_KEY_FLAG
  */
 const MYSQLI_UNIQUE_KEY_FLAG = UNKNOWN;
 /**
  * @var int
- * @cname MULTIPLE_KEY_FLAG
+ * @cvalue MULTIPLE_KEY_FLAG
  */
 const MYSQLI_MULTIPLE_KEY_FLAG = UNKNOWN;
 /**
  * @var int
- * @cname BLOB_FLAG
+ * @cvalue BLOB_FLAG
  */
 const MYSQLI_BLOB_FLAG = UNKNOWN;
 /**
  * @var int
- * @cname UNSIGNED_FLAG
+ * @cvalue UNSIGNED_FLAG
  */
 const MYSQLI_UNSIGNED_FLAG = UNKNOWN;
 /**
  * @var int
- * @cname ZEROFILL_FLAG
+ * @cvalue ZEROFILL_FLAG
  */
 const MYSQLI_ZEROFILL_FLAG = UNKNOWN;
 /**
  * @var int
- * @cname AUTO_INCREMENT_FLAG
+ * @cvalue AUTO_INCREMENT_FLAG
  */
 const MYSQLI_AUTO_INCREMENT_FLAG = UNKNOWN;
 /**
  * @var int
- * @cname TIMESTAMP_FLAG
+ * @cvalue TIMESTAMP_FLAG
  */
 const MYSQLI_TIMESTAMP_FLAG = UNKNOWN;
 /**
  * @var int
- * @cname SET_FLAG
+ * @cvalue SET_FLAG
  */
 const MYSQLI_SET_FLAG = UNKNOWN;
 /**
  * @var int
- * @cname NUM_FLAG
+ * @cvalue NUM_FLAG
  */
 const MYSQLI_NUM_FLAG = UNKNOWN;
 /**
  * @var int
- * @cname PART_KEY_FLAG
+ * @cvalue PART_KEY_FLAG
  */
 const MYSQLI_PART_KEY_FLAG = UNKNOWN;
 /**
  * @var int
- * @cname GROUP_FLAG
+ * @cvalue GROUP_FLAG
  */
 const MYSQLI_GROUP_FLAG = UNKNOWN;
 /**
  * @var int
- * @cname ENUM_FLAG
+ * @cvalue ENUM_FLAG
  */
 const MYSQLI_ENUM_FLAG = UNKNOWN;
 /**
  * @var int
- * @cname BINARY_FLAG
+ * @cvalue BINARY_FLAG
  */
 const MYSQLI_BINARY_FLAG = UNKNOWN;
 /**
  * @var int
- * @cname NO_DEFAULT_VALUE_FLAG
+ * @cvalue NO_DEFAULT_VALUE_FLAG
  */
 const MYSQLI_NO_DEFAULT_VALUE_FLAG = UNKNOWN;
 
 /**
  * @var int
- * @cname ON_UPDATE_NOW_FLAG
+ * @cvalue ON_UPDATE_NOW_FLAG
  */
 const MYSQLI_ON_UPDATE_NOW_FLAG = UNKNOWN;
 
 /**
  * @var int
- * @cname FIELD_TYPE_DECIMAL
+ * @cvalue FIELD_TYPE_DECIMAL
  */
 const MYSQLI_TYPE_DECIMAL = UNKNOWN;
 /**
  * @var int
- * @cname FIELD_TYPE_TINY
+ * @cvalue FIELD_TYPE_TINY
  */
 const MYSQLI_TYPE_TINY = UNKNOWN;
 /**
  * @var int
- * @cname FIELD_TYPE_SHORT
+ * @cvalue FIELD_TYPE_SHORT
  */
 const MYSQLI_TYPE_SHORT = UNKNOWN;
 /**
  * @var int
- * @cname FIELD_TYPE_LONG
+ * @cvalue FIELD_TYPE_LONG
  */
 const MYSQLI_TYPE_LONG = UNKNOWN;
 /**
  * @var int
- * @cname FIELD_TYPE_FLOAT
+ * @cvalue FIELD_TYPE_FLOAT
  */
 const MYSQLI_TYPE_FLOAT = UNKNOWN;
 /**
  * @var int
- * @cname FIELD_TYPE_DOUBLE
+ * @cvalue FIELD_TYPE_DOUBLE
  */
 const MYSQLI_TYPE_DOUBLE = UNKNOWN;
 /**
  * @var int
- * @cname FIELD_TYPE_NULL
+ * @cvalue FIELD_TYPE_NULL
  */
 const MYSQLI_TYPE_NULL = UNKNOWN;
 /**
  * @var int
- * @cname FIELD_TYPE_TIMESTAMP
+ * @cvalue FIELD_TYPE_TIMESTAMP
  */
 const MYSQLI_TYPE_TIMESTAMP = UNKNOWN;
 /**
  * @var int
- * @cname FIELD_TYPE_LONGLONG
+ * @cvalue FIELD_TYPE_LONGLONG
  */
 const MYSQLI_TYPE_LONGLONG = UNKNOWN;
 /**
  * @var int
- * @cname FIELD_TYPE_INT24
+ * @cvalue FIELD_TYPE_INT24
  */
 const MYSQLI_TYPE_INT24 = UNKNOWN;
 /**
  * @var int
- * @cname FIELD_TYPE_DATE
+ * @cvalue FIELD_TYPE_DATE
  */
 const MYSQLI_TYPE_DATE = UNKNOWN;
 /**
  * @var int
- * @cname FIELD_TYPE_TIME
+ * @cvalue FIELD_TYPE_TIME
  */
 const MYSQLI_TYPE_TIME = UNKNOWN;
 /**
  * @var int
- * @cname FIELD_TYPE_DATETIME
+ * @cvalue FIELD_TYPE_DATETIME
  */
 const MYSQLI_TYPE_DATETIME = UNKNOWN;
 /**
  * @var int
- * @cname FIELD_TYPE_YEAR
+ * @cvalue FIELD_TYPE_YEAR
  */
 const MYSQLI_TYPE_YEAR = UNKNOWN;
 /**
  * @var int
- * @cname FIELD_TYPE_NEWDATE
+ * @cvalue FIELD_TYPE_NEWDATE
  */
 const MYSQLI_TYPE_NEWDATE = UNKNOWN;
 /**
  * @var int
- * @cname FIELD_TYPE_ENUM
+ * @cvalue FIELD_TYPE_ENUM
  */
 const MYSQLI_TYPE_ENUM = UNKNOWN;
 /**
  * @var int
- * @cname FIELD_TYPE_SET
+ * @cvalue FIELD_TYPE_SET
  */
 const MYSQLI_TYPE_SET = UNKNOWN;
 /**
  * @var int
- * @cname FIELD_TYPE_TINY_BLOB
+ * @cvalue FIELD_TYPE_TINY_BLOB
  */
 const MYSQLI_TYPE_TINY_BLOB = UNKNOWN;
 /**
  * @var int
- * @cname FIELD_TYPE_MEDIUM_BLOB
+ * @cvalue FIELD_TYPE_MEDIUM_BLOB
  */
 const MYSQLI_TYPE_MEDIUM_BLOB = UNKNOWN;
 /**
  * @var int
- * @cname FIELD_TYPE_LONG_BLOB
+ * @cvalue FIELD_TYPE_LONG_BLOB
  */
 const MYSQLI_TYPE_LONG_BLOB = UNKNOWN;
 /**
  * @var int
- * @cname FIELD_TYPE_BLOB
+ * @cvalue FIELD_TYPE_BLOB
  */
 const MYSQLI_TYPE_BLOB = UNKNOWN;
 /**
  * @var int
- * @cname FIELD_TYPE_VAR_STRING
+ * @cvalue FIELD_TYPE_VAR_STRING
  */
 const MYSQLI_TYPE_VAR_STRING = UNKNOWN;
 /**
  * @var int
- * @cname FIELD_TYPE_STRING
+ * @cvalue FIELD_TYPE_STRING
  */
 const MYSQLI_TYPE_STRING = UNKNOWN;
 /**
  * @var int
- * @cname FIELD_TYPE_CHAR
+ * @cvalue FIELD_TYPE_CHAR
  */
 const MYSQLI_TYPE_CHAR = UNKNOWN;
 /**
  * @var int
- * @cname FIELD_TYPE_INTERVAL
+ * @cvalue FIELD_TYPE_INTERVAL
  */
 const MYSQLI_TYPE_INTERVAL = UNKNOWN;
 /**
  * @var int
- * @cname FIELD_TYPE_GEOMETRY
+ * @cvalue FIELD_TYPE_GEOMETRY
  */
 const MYSQLI_TYPE_GEOMETRY = UNKNOWN;
 #ifdef FIELD_TYPE_JSON
 /**
  * @var int
- * @cname FIELD_TYPE_JSON
+ * @cvalue FIELD_TYPE_JSON
  */
 const MYSQLI_TYPE_JSON = UNKNOWN;
 #endif
 /**
  * @var int
- * @cname FIELD_TYPE_NEWDECIMAL
+ * @cvalue FIELD_TYPE_NEWDECIMAL
  */
 const MYSQLI_TYPE_NEWDECIMAL = UNKNOWN;
 /**
  * @var int
- * @cname FIELD_TYPE_BIT
+ * @cvalue FIELD_TYPE_BIT
  */
 const MYSQLI_TYPE_BIT = UNKNOWN;
 /**
  * @var int
- * @cname MYSQL_SET_CHARSET_NAME
+ * @cvalue MYSQL_SET_CHARSET_NAME
  */
 const MYSQLI_SET_CHARSET_NAME = UNKNOWN;
 /**
  * @var int
- * @cname MYSQL_SET_CHARSET_DIR
+ * @cvalue MYSQL_SET_CHARSET_DIR
  */
 const MYSQLI_SET_CHARSET_DIR = UNKNOWN;
 
 /* bind support */
 /**
  * @var int
- * @cname MYSQL_NO_DATA
+ * @cvalue MYSQL_NO_DATA
  * @deprecated
  */
 const MYSQLI_NO_DATA = UNKNOWN;
 #ifdef MYSQL_DATA_TRUNCATED
 /**
  * @var int
- * @cname MYSQL_DATA_TRUNCATED
+ * @cvalue MYSQL_DATA_TRUNCATED
  * @deprecated
  */
 const MYSQLI_DATA_TRUNCATED = UNKNOWN;
@@ -461,52 +461,52 @@
 /* reporting */
 /**
  * @var int
- * @cname MYSQLI_REPORT_INDEX
+ * @cvalue MYSQLI_REPORT_INDEX
  */
 const MYSQLI_REPORT_INDEX = UNKNOWN;
 /**
  * @var int
- * @cname MYSQLI_REPORT_ERROR
+ * @cvalue MYSQLI_REPORT_ERROR
  */
 const MYSQLI_REPORT_ERROR = UNKNOWN;
 /**
  * @var int
- * @cname MYSQLI_REPORT_STRICT
+ * @cvalue MYSQLI_REPORT_STRICT
  */
 const MYSQLI_REPORT_STRICT = UNKNOWN;
 /**
  * @var int
- * @cname MYSQLI_REPORT_ALL
+ * @cvalue MYSQLI_REPORT_ALL
  */
 const MYSQLI_REPORT_ALL = UNKNOWN;
 /**
  * @var int
- * @cname MYSQLI_REPORT_OFF
+ * @cvalue MYSQLI_REPORT_OFF
  */
 const MYSQLI_REPORT_OFF = UNKNOWN;
 
 /**
  * @var int
- * @cname MYSQLND_DBG_ENABLED
+ * @cvalue MYSQLND_DBG_ENABLED
  */
 const MYSQLI_DEBUG_TRACE_ENABLED = UNKNOWN;
 
 /**
  * @var int
- * @cname SERVER_QUERY_NO_GOOD_INDEX_USED
+ * @cvalue SERVER_QUERY_NO_GOOD_INDEX_USED
  * @deprecated
  */
 const MYSQLI_SERVER_QUERY_NO_GOOD_INDEX_USED = UNKNOWN;
 /**
  * @var int
- * @cname SERVER_QUERY_NO_INDEX_USED
+ * @cvalue SERVER_QUERY_NO_INDEX_USED
  * @deprecated
  */
 const MYSQLI_SERVER_QUERY_NO_INDEX_USED = UNKNOWN;
 #ifdef SERVER_QUERY_WAS_SLOW
 /**
  * @var int
- * @cname SERVER_QUERY_WAS_SLOW
+ * @cvalue SERVER_QUERY_WAS_SLOW
  * @deprecated
  */
 const MYSQLI_SERVER_QUERY_WAS_SLOW = UNKNOWN;
@@ -514,7 +514,7 @@
 #ifdef SERVER_PS_OUT_PARAMS
 /**
  * @var int
- * @cname SERVER_PS_OUT_PARAMS
+ * @cvalue SERVER_PS_OUT_PARAMS
  * @deprecated
  */
 const MYSQLI_SERVER_PS_OUT_PARAMS = UNKNOWN;
@@ -522,91 +522,91 @@
 
 /**
  * @var int
- * @cname REFRESH_GRANT
+ * @cvalue REFRESH_GRANT
  */
 const MYSQLI_REFRESH_GRANT = UNKNOWN;
 /**
  * @var int
- * @cname REFRESH_LOG
+ * @cvalue REFRESH_LOG
  */
 const MYSQLI_REFRESH_LOG = UNKNOWN;
 /**
  * @var int
- * @cname REFRESH_TABLES
+ * @cvalue REFRESH_TABLES
  */
 const MYSQLI_REFRESH_TABLES = UNKNOWN;
 /**
  * @var int
- * @cname REFRESH_HOSTS
+ * @cvalue REFRESH_HOSTS
  */
 const MYSQLI_REFRESH_HOSTS = UNKNOWN;
 /**
  * @var int
- * @cname REFRESH_STATUS
+ * @cvalue REFRESH_STATUS
  */
 const MYSQLI_REFRESH_STATUS = UNKNOWN;
 /**
  * @var int
- * @cname REFRESH_THREADS
+ * @cvalue REFRESH_THREADS
  */
 const MYSQLI_REFRESH_THREADS = UNKNOWN;
 /**
  * @var int
- * @cname REFRESH_SLAVE
+ * @cvalue REFRESH_SLAVE
  */
 const MYSQLI_REFRESH_REPLICA = UNKNOWN;
 /**
  * @var int
- * @cname REFRESH_SLAVE
+ * @cvalue REFRESH_SLAVE
  */
 const MYSQLI_REFRESH_SLAVE = UNKNOWN;
 /**
  * @var int
- * @cname REFRESH_MASTER
+ * @cvalue REFRESH_MASTER
  */
 const MYSQLI_REFRESH_MASTER = UNKNOWN;
 #ifdef REFRESH_BACKUP_LOG
 /**
  * @var int
- * @cname REFRESH_BACKUP_LOG
+ * @cvalue REFRESH_BACKUP_LOG
  */
 const MYSQLI_REFRESH_BACKUP_LOG = UNKNOWN;
 #endif
 
 /**
  * @var int
- * @cname TRANS_START_WITH_CONSISTENT_SNAPSHOT
+ * @cvalue TRANS_START_WITH_CONSISTENT_SNAPSHOT
  */
 const MYSQLI_TRANS_START_WITH_CONSISTENT_SNAPSHOT = UNKNOWN;
 /**
  * @var int
- * @cname TRANS_START_READ_WRITE
+ * @cvalue TRANS_START_READ_WRITE
  */
 const MYSQLI_TRANS_START_READ_WRITE = UNKNOWN;
 /**
  * @var int
- * @cname TRANS_START_READ_ONLY
+ * @cvalue TRANS_START_READ_ONLY
  */
 const MYSQLI_TRANS_START_READ_ONLY = UNKNOWN;
 
 /**
  * @var int
- * @cname TRANS_COR_AND_CHAIN
+ * @cvalue TRANS_COR_AND_CHAIN
  */
 const MYSQLI_TRANS_COR_AND_CHAIN = UNKNOWN;
 /**
  * @var int
- * @cname TRANS_COR_AND_NO_CHAIN
+ * @cvalue TRANS_COR_AND_NO_CHAIN
  */
 const MYSQLI_TRANS_COR_AND_NO_CHAIN = UNKNOWN;
 /**
  * @var int
- * @cname TRANS_COR_RELEASE
+ * @cvalue TRANS_COR_RELEASE
  */
 const MYSQLI_TRANS_COR_RELEASE = UNKNOWN;
 /**
  * @var int
- * @cname TRANS_COR_NO_RELEASE
+ * @cvalue TRANS_COR_NO_RELEASE
  */
 const MYSQLI_TRANS_COR_NO_RELEASE = UNKNOWN;
 
diff --git a/ext/mysqli/mysqli_arginfo.h b/ext/mysqli/mysqli_arginfo.h
index 4b23cac940b27..3efc9c6a19471 100644
--- a/ext/mysqli/mysqli_arginfo.h
+++ b/ext/mysqli/mysqli_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 72c98f6b54fbf42adab5a57dc0922d4a1649eed1 */
+ * Stub hash: 656fe3f3475bb2f43d89ebf34361940e2f746373 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_mysqli_affected_rows, 0, 1, MAY_BE_LONG|MAY_BE_STRING)
 	ZEND_ARG_OBJ_INFO(0, mysql, mysqli, 0)
diff --git a/ext/standard/basic_functions.stub.php b/ext/standard/basic_functions.stub.php
index eb611eb873f7d..fc138edc5076e 100755
--- a/ext/standard/basic_functions.stub.php
+++ b/ext/standard/basic_functions.stub.php
@@ -4,7 +4,7 @@
 
 /**
  * @var float
- * @cname M_E
+ * @cvalue M_E
  */
 const M_E = 2.7182818284590452354;
 
diff --git a/ext/standard/basic_functions_arginfo.h b/ext/standard/basic_functions_arginfo.h
index 31e0e440c1403..8db9bd1c1c17d 100644
--- a/ext/standard/basic_functions_arginfo.h
+++ b/ext/standard/basic_functions_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 2d80b5ae9dd49bb2e776fe3a03b43d339bccfca0 */
+ * Stub hash: f445ea17c00f60894eec13b99660c2056e1a6456 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_set_time_limit, 0, 1, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, seconds, IS_LONG, 0)