diff --git a/internals/tsrm/macros/VCWD_ACCESS.xml b/internals/tsrm/macros/VCWD_ACCESS.xml
index f5482bf474..3aef205082 100644
--- a/internals/tsrm/macros/VCWD_ACCESS.xml
+++ b/internals/tsrm/macros/VCWD_ACCESS.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.VCWD-ACCESS">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.vcwd-access">
  <refnamediv>
   <refname>VCWD_ACCESS</refname>
-  <refpurpose>...</refpurpose>
+  <refpurpose>Check users permissions for a file</refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
@@ -15,7 +15,7 @@
     <methodparam><type>mode_t</type><parameter>mode</parameter></methodparam>
   </methodsynopsis>
   <para>
-   ...
+   This is a convenience wrapper for <function role='zend-api'>virtual_access</function>.
   </para>
  </refsect1>
 
diff --git a/internals/tsrm/macros/VCWD_CHDIR.xml b/internals/tsrm/macros/VCWD_CHDIR.xml
index a6831678da..bf72aa6a34 100644
--- a/internals/tsrm/macros/VCWD_CHDIR.xml
+++ b/internals/tsrm/macros/VCWD_CHDIR.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.VCWD-CHDIR">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.vcwd-chdir">
  <refnamediv>
   <refname>VCWD_CHDIR</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/tsrm/macros/VCWD_CHDIR_FILE.xml b/internals/tsrm/macros/VCWD_CHDIR_FILE.xml
index 2f74589b1d..36441bd64f 100644
--- a/internals/tsrm/macros/VCWD_CHDIR_FILE.xml
+++ b/internals/tsrm/macros/VCWD_CHDIR_FILE.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<refentry id="zend-macro.VCWD-CHDIR-FILE">
+<!-- $Revision: 1.5 $ -->
+<refentry id="zend-macro.vcwd-chdir-file">
  <refnamediv>
   <refname>VCWD_CHDIR_FILE</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/tsrm/macros/VCWD_CHMOD.xml b/internals/tsrm/macros/VCWD_CHMOD.xml
index 0963af9cc9..d35241af36 100644
--- a/internals/tsrm/macros/VCWD_CHMOD.xml
+++ b/internals/tsrm/macros/VCWD_CHMOD.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.VCWD-CHMOD">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.vcwd-chmod">
  <refnamediv>
   <refname>VCWD_CHMOD</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/tsrm/macros/VCWD_CHOWN.xml b/internals/tsrm/macros/VCWD_CHOWN.xml
index c9e01c9caf..6bebaeec60 100644
--- a/internals/tsrm/macros/VCWD_CHOWN.xml
+++ b/internals/tsrm/macros/VCWD_CHOWN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.VCWD-CHOWN">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.vcwd-chown">
  <refnamediv>
   <refname>VCWD_CHOWN</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/tsrm/macros/VCWD_CREAT.xml b/internals/tsrm/macros/VCWD_CREAT.xml
index 899a400020..b1ef37deef 100644
--- a/internals/tsrm/macros/VCWD_CREAT.xml
+++ b/internals/tsrm/macros/VCWD_CREAT.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.VCWD-CREAT">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.vcwd-creat">
  <refnamediv>
   <refname>VCWD_CREAT</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/tsrm/macros/VCWD_FOPEN.xml b/internals/tsrm/macros/VCWD_FOPEN.xml
index 229b1c2f4a..a86e972abc 100644
--- a/internals/tsrm/macros/VCWD_FOPEN.xml
+++ b/internals/tsrm/macros/VCWD_FOPEN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.VCWD-FOPEN">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.vcwd-fopen">
  <refnamediv>
   <refname>VCWD_FOPEN</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/tsrm/macros/VCWD_GETCWD.xml b/internals/tsrm/macros/VCWD_GETCWD.xml
index d4f19b5177..7de0e371ef 100644
--- a/internals/tsrm/macros/VCWD_GETCWD.xml
+++ b/internals/tsrm/macros/VCWD_GETCWD.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.VCWD-GETCWD">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.vcwd-getcwd">
  <refnamediv>
   <refname>VCWD_GETCWD</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/tsrm/macros/VCWD_GETWD.xml b/internals/tsrm/macros/VCWD_GETWD.xml
index 4b73105fc4..b8ecfc3fb1 100644
--- a/internals/tsrm/macros/VCWD_GETWD.xml
+++ b/internals/tsrm/macros/VCWD_GETWD.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.VCWD-GETWD">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.vcwd-getwd">
  <refnamediv>
   <refname>VCWD_GETWD</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/tsrm/macros/VCWD_LCHOWN.xml b/internals/tsrm/macros/VCWD_LCHOWN.xml
index 5f934730a0..8d4091eaef 100644
--- a/internals/tsrm/macros/VCWD_LCHOWN.xml
+++ b/internals/tsrm/macros/VCWD_LCHOWN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.VCWD-LCHOWN">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.vcwd-lchown">
  <refnamediv>
   <refname>VCWD_LCHOWN</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/tsrm/macros/VCWD_LSTAT.xml b/internals/tsrm/macros/VCWD_LSTAT.xml
index 47f7a8dd82..17f0fa9223 100644
--- a/internals/tsrm/macros/VCWD_LSTAT.xml
+++ b/internals/tsrm/macros/VCWD_LSTAT.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.VCWD-LSTAT">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.vcwd-lstat">
  <refnamediv>
   <refname>VCWD_LSTAT</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/tsrm/macros/VCWD_MKDIR.xml b/internals/tsrm/macros/VCWD_MKDIR.xml
index d324ba368a..4130f06d6b 100644
--- a/internals/tsrm/macros/VCWD_MKDIR.xml
+++ b/internals/tsrm/macros/VCWD_MKDIR.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.VCWD-MKDIR">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.vcwd-mkdir">
  <refnamediv>
   <refname>VCWD_MKDIR</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/tsrm/macros/VCWD_OPEN.xml b/internals/tsrm/macros/VCWD_OPEN.xml
index 01a210a410..c7b2326842 100644
--- a/internals/tsrm/macros/VCWD_OPEN.xml
+++ b/internals/tsrm/macros/VCWD_OPEN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.VCWD-OPEN">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.vcwd-open">
  <refnamediv>
   <refname>VCWD_OPEN</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/tsrm/macros/VCWD_OPENDIR.xml b/internals/tsrm/macros/VCWD_OPENDIR.xml
index 32c7343402..8a6b821822 100644
--- a/internals/tsrm/macros/VCWD_OPENDIR.xml
+++ b/internals/tsrm/macros/VCWD_OPENDIR.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.VCWD-OPENDIR">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.vcwd-opendir">
  <refnamediv>
   <refname>VCWD_OPENDIR</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/tsrm/macros/VCWD_OPEN_MODE.xml b/internals/tsrm/macros/VCWD_OPEN_MODE.xml
index 079c3771bf..f04a5a962a 100644
--- a/internals/tsrm/macros/VCWD_OPEN_MODE.xml
+++ b/internals/tsrm/macros/VCWD_OPEN_MODE.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.VCWD-OPEN-MODE">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.vcwd-open-mode">
  <refnamediv>
   <refname>VCWD_OPEN_MODE</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/tsrm/macros/VCWD_POPEN.xml b/internals/tsrm/macros/VCWD_POPEN.xml
index 31171d8966..0bc44a3a44 100644
--- a/internals/tsrm/macros/VCWD_POPEN.xml
+++ b/internals/tsrm/macros/VCWD_POPEN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.VCWD-POPEN">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.vcwd-popen">
  <refnamediv>
   <refname>VCWD_POPEN</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/tsrm/macros/VCWD_REALPATH.xml b/internals/tsrm/macros/VCWD_REALPATH.xml
index e94e825939..6b4949a7f1 100644
--- a/internals/tsrm/macros/VCWD_REALPATH.xml
+++ b/internals/tsrm/macros/VCWD_REALPATH.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.VCWD-REALPATH">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.vcwd-realpath">
  <refnamediv>
   <refname>VCWD_REALPATH</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/tsrm/macros/VCWD_RENAME.xml b/internals/tsrm/macros/VCWD_RENAME.xml
index cb9aed0f0f..d39ecff860 100644
--- a/internals/tsrm/macros/VCWD_RENAME.xml
+++ b/internals/tsrm/macros/VCWD_RENAME.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.VCWD-RENAME">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.vcwd-rename">
  <refnamediv>
   <refname>VCWD_RENAME</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/tsrm/macros/VCWD_RMDIR.xml b/internals/tsrm/macros/VCWD_RMDIR.xml
index 0898caf251..4e2a487faa 100644
--- a/internals/tsrm/macros/VCWD_RMDIR.xml
+++ b/internals/tsrm/macros/VCWD_RMDIR.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.VCWD-RMDIR">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.vcwd-rmdir">
  <refnamediv>
   <refname>VCWD_RMDIR</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/tsrm/macros/VCWD_STAT.xml b/internals/tsrm/macros/VCWD_STAT.xml
index 8cae23fde8..d27ec80a9e 100644
--- a/internals/tsrm/macros/VCWD_STAT.xml
+++ b/internals/tsrm/macros/VCWD_STAT.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.VCWD-STAT">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.vcwd-stat">
  <refnamediv>
   <refname>VCWD_STAT</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/tsrm/macros/VCWD_UNLINK.xml b/internals/tsrm/macros/VCWD_UNLINK.xml
index 78c56a5c95..a4b69dfb22 100644
--- a/internals/tsrm/macros/VCWD_UNLINK.xml
+++ b/internals/tsrm/macros/VCWD_UNLINK.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.VCWD-UNLINK">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.vcwd-unlink">
  <refnamediv>
   <refname>VCWD_UNLINK</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/tsrm/macros/VCWD_UTIME.xml b/internals/tsrm/macros/VCWD_UTIME.xml
index a8a8ed38de..4cfc50e7ba 100644
--- a/internals/tsrm/macros/VCWD_UTIME.xml
+++ b/internals/tsrm/macros/VCWD_UTIME.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.VCWD-UTIME">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.vcwd-utime">
  <refnamediv>
   <refname>VCWD_UTIME</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/RETURN_ASCII_STRING.xml b/internals/zendapi/macros/RETURN_ASCII_STRING.xml
index 4303f19a6e..26f7992205 100644
--- a/internals/zendapi/macros/RETURN_ASCII_STRING.xml
+++ b/internals/zendapi/macros/RETURN_ASCII_STRING.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.RETURN-ASCII-STRING">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.return-ascii-string">
  <refnamediv>
   <refname>RETURN_ASCII_STRING</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/RETURN_ASCII_STRINGL.xml b/internals/zendapi/macros/RETURN_ASCII_STRINGL.xml
index d8be1d185e..4b9cd92e2b 100644
--- a/internals/zendapi/macros/RETURN_ASCII_STRINGL.xml
+++ b/internals/zendapi/macros/RETURN_ASCII_STRINGL.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.RETURN-ASCII-STRINGL">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.return-ascii-stringl">
  <refnamediv>
   <refname>RETURN_ASCII_STRINGL</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/RETURN_BINARY.xml b/internals/zendapi/macros/RETURN_BINARY.xml
index ba26fb079f..0669a2c825 100644
--- a/internals/zendapi/macros/RETURN_BINARY.xml
+++ b/internals/zendapi/macros/RETURN_BINARY.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.RETURN-BINARY">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.return-binary">
  <refnamediv>
   <refname>RETURN_BINARY</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/RETURN_BINARYL.xml b/internals/zendapi/macros/RETURN_BINARYL.xml
index 22f5c1b472..58ef0d262d 100644
--- a/internals/zendapi/macros/RETURN_BINARYL.xml
+++ b/internals/zendapi/macros/RETURN_BINARYL.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.RETURN-BINARYL">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.return-binaryl">
  <refnamediv>
   <refname>RETURN_BINARYL</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/RETURN_BOOL.xml b/internals/zendapi/macros/RETURN_BOOL.xml
index 7fbdfa0a54..e994ada97e 100644
--- a/internals/zendapi/macros/RETURN_BOOL.xml
+++ b/internals/zendapi/macros/RETURN_BOOL.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<refentry id="zend-macro.RETURN-BOOL">
+<!-- $Revision: 1.5 $ -->
+<refentry id="zend-macro.return-bool">
  <refnamediv>
   <refname>RETURN_BOOL</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/RETURN_DOUBLE.xml b/internals/zendapi/macros/RETURN_DOUBLE.xml
index 7dee2d5922..c76a58d3ac 100644
--- a/internals/zendapi/macros/RETURN_DOUBLE.xml
+++ b/internals/zendapi/macros/RETURN_DOUBLE.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<refentry id="zend-macro.RETURN-DOUBLE">
+<!-- $Revision: 1.5 $ -->
+<refentry id="zend-macro.return-double">
  <refnamediv>
   <refname>RETURN_DOUBLE</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/RETURN_EMPTY_BINARY.xml b/internals/zendapi/macros/RETURN_EMPTY_BINARY.xml
index 0646995e33..7b4c9217b7 100644
--- a/internals/zendapi/macros/RETURN_EMPTY_BINARY.xml
+++ b/internals/zendapi/macros/RETURN_EMPTY_BINARY.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<refentry id="zend-macro.RETURN-EMPTY-BINARY">
+<!-- $Revision: 1.5 $ -->
+<refentry id="zend-macro.return-empty-binary">
  <refnamediv>
   <refname>RETURN_EMPTY_BINARY</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/RETURN_EMPTY_STRING.xml b/internals/zendapi/macros/RETURN_EMPTY_STRING.xml
index 353659ff20..d7c81c41f5 100644
--- a/internals/zendapi/macros/RETURN_EMPTY_STRING.xml
+++ b/internals/zendapi/macros/RETURN_EMPTY_STRING.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<refentry id="zend-macro.RETURN-EMPTY-STRING">
+<!-- $Revision: 1.5 $ -->
+<refentry id="zend-macro.return-empty-string">
  <refnamediv>
   <refname>RETURN_EMPTY_STRING</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/RETURN_EMPTY_UNICODE.xml b/internals/zendapi/macros/RETURN_EMPTY_UNICODE.xml
index ad0e92766c..c35d0716aa 100644
--- a/internals/zendapi/macros/RETURN_EMPTY_UNICODE.xml
+++ b/internals/zendapi/macros/RETURN_EMPTY_UNICODE.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<refentry id="zend-macro.RETURN-EMPTY-UNICODE">
+<!-- $Revision: 1.5 $ -->
+<refentry id="zend-macro.return-empty-unicode">
  <refnamediv>
   <refname>RETURN_EMPTY_UNICODE</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/RETURN_LONG.xml b/internals/zendapi/macros/RETURN_LONG.xml
index 19393ac377..0aabdca7df 100644
--- a/internals/zendapi/macros/RETURN_LONG.xml
+++ b/internals/zendapi/macros/RETURN_LONG.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<refentry id="zend-macro.RETURN-LONG">
+<!-- $Revision: 1.5 $ -->
+<refentry id="zend-macro.return-long">
  <refnamediv>
   <refname>RETURN_LONG</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/RETURN_NULL.xml b/internals/zendapi/macros/RETURN_NULL.xml
index 95523aee8d..f625544fed 100644
--- a/internals/zendapi/macros/RETURN_NULL.xml
+++ b/internals/zendapi/macros/RETURN_NULL.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<refentry id="zend-macro.RETURN-NULL">
+<!-- $Revision: 1.5 $ -->
+<refentry id="zend-macro.return-null">
  <refnamediv>
   <refname>RETURN_NULL</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/RETURN_RESOURCE.xml b/internals/zendapi/macros/RETURN_RESOURCE.xml
index 50645a152a..c120cc686f 100644
--- a/internals/zendapi/macros/RETURN_RESOURCE.xml
+++ b/internals/zendapi/macros/RETURN_RESOURCE.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.RETURN-RESOURCE">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.return-resource">
  <refnamediv>
   <refname>RETURN_RESOURCE</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/RETURN_RT_STRING.xml b/internals/zendapi/macros/RETURN_RT_STRING.xml
index f0061ea98e..b2a3b4724b 100644
--- a/internals/zendapi/macros/RETURN_RT_STRING.xml
+++ b/internals/zendapi/macros/RETURN_RT_STRING.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.RETURN-RT-STRING">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.return-rt-string">
  <refnamediv>
   <refname>RETURN_RT_STRING</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/RETURN_RT_STRINGL.xml b/internals/zendapi/macros/RETURN_RT_STRINGL.xml
index 6dcad0b836..96344ad41b 100644
--- a/internals/zendapi/macros/RETURN_RT_STRINGL.xml
+++ b/internals/zendapi/macros/RETURN_RT_STRINGL.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.RETURN-RT-STRINGL">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.return-rt-stringl">
  <refnamediv>
   <refname>RETURN_RT_STRINGL</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/RETURN_STRING.xml b/internals/zendapi/macros/RETURN_STRING.xml
index 66411177dc..91144b0a5b 100644
--- a/internals/zendapi/macros/RETURN_STRING.xml
+++ b/internals/zendapi/macros/RETURN_STRING.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.RETURN-STRING">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.return-string">
  <refnamediv>
   <refname>RETURN_STRING</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/RETURN_STRINGL.xml b/internals/zendapi/macros/RETURN_STRINGL.xml
index e132c2891e..8058839621 100644
--- a/internals/zendapi/macros/RETURN_STRINGL.xml
+++ b/internals/zendapi/macros/RETURN_STRINGL.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.RETURN-STRINGL">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.return-stringl">
  <refnamediv>
   <refname>RETURN_STRINGL</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/RETURN_TEXT.xml b/internals/zendapi/macros/RETURN_TEXT.xml
index d17130f8de..7caa78c08a 100644
--- a/internals/zendapi/macros/RETURN_TEXT.xml
+++ b/internals/zendapi/macros/RETURN_TEXT.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.RETURN-TEXT">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.return-text">
  <refnamediv>
   <refname>RETURN_TEXT</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/RETURN_TEXTL.xml b/internals/zendapi/macros/RETURN_TEXTL.xml
index 6e0c3a2f5f..767c615f8a 100644
--- a/internals/zendapi/macros/RETURN_TEXTL.xml
+++ b/internals/zendapi/macros/RETURN_TEXTL.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.RETURN-TEXTL">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.return-textl">
  <refnamediv>
   <refname>RETURN_TEXTL</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/RETURN_UNICODE.xml b/internals/zendapi/macros/RETURN_UNICODE.xml
index ec94f6cf0a..e65744734e 100644
--- a/internals/zendapi/macros/RETURN_UNICODE.xml
+++ b/internals/zendapi/macros/RETURN_UNICODE.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.RETURN-UNICODE">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.return-unicode">
  <refnamediv>
   <refname>RETURN_UNICODE</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/RETURN_UNICODEL.xml b/internals/zendapi/macros/RETURN_UNICODEL.xml
index cd9429d92f..30eb019b87 100644
--- a/internals/zendapi/macros/RETURN_UNICODEL.xml
+++ b/internals/zendapi/macros/RETURN_UNICODEL.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.RETURN-UNICODEL">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.return-unicodel">
  <refnamediv>
   <refname>RETURN_UNICODEL</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/RETURN_U_STRING.xml b/internals/zendapi/macros/RETURN_U_STRING.xml
index 7984f1132b..70957c88b2 100644
--- a/internals/zendapi/macros/RETURN_U_STRING.xml
+++ b/internals/zendapi/macros/RETURN_U_STRING.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.RETURN-U-STRING">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.return-u-string">
  <refnamediv>
   <refname>RETURN_U_STRING</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/RETURN_U_STRINGL.xml b/internals/zendapi/macros/RETURN_U_STRINGL.xml
index 889df43589..ae37f9dc99 100644
--- a/internals/zendapi/macros/RETURN_U_STRINGL.xml
+++ b/internals/zendapi/macros/RETURN_U_STRINGL.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.RETURN-U-STRINGL">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.return-u-stringl">
  <refnamediv>
   <refname>RETURN_U_STRINGL</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/RETURN_ZVAL.xml b/internals/zendapi/macros/RETURN_ZVAL.xml
index 38acc2aaa2..f54678478e 100644
--- a/internals/zendapi/macros/RETURN_ZVAL.xml
+++ b/internals/zendapi/macros/RETURN_ZVAL.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.RETURN-ZVAL">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.return-zval">
  <refnamediv>
   <refname>RETURN_ZVAL</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/ZEND_ABSTRACT_ME.xml b/internals/zendapi/macros/ZEND_ABSTRACT_ME.xml
index 70f5d08c96..8d1ffe9534 100644
--- a/internals/zendapi/macros/ZEND_ABSTRACT_ME.xml
+++ b/internals/zendapi/macros/ZEND_ABSTRACT_ME.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.ZEND-ABSTRACT-ME">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.zend-abstract-me">
  <refnamediv>
   <refname>ZEND_ABSTRACT_ME</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/ZEND_ARG_ARRAY_INFO.xml b/internals/zendapi/macros/ZEND_ARG_ARRAY_INFO.xml
index 4868499ed5..e7efd32bef 100644
--- a/internals/zendapi/macros/ZEND_ARG_ARRAY_INFO.xml
+++ b/internals/zendapi/macros/ZEND_ARG_ARRAY_INFO.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.ZEND-ARG-ARRAY-INFO">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.zend-arg-array-info">
  <refnamediv>
   <refname>ZEND_ARG_ARRAY_INFO</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/ZEND_ARG_INFO.xml b/internals/zendapi/macros/ZEND_ARG_INFO.xml
index 831a438b78..c7515987b5 100644
--- a/internals/zendapi/macros/ZEND_ARG_INFO.xml
+++ b/internals/zendapi/macros/ZEND_ARG_INFO.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.ZEND-ARG-INFO">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.zend-arg-info">
  <refnamediv>
   <refname>ZEND_ARG_INFO</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/ZEND_ARG_OBJ_INFO.xml b/internals/zendapi/macros/ZEND_ARG_OBJ_INFO.xml
index ceab611d02..84d712172f 100644
--- a/internals/zendapi/macros/ZEND_ARG_OBJ_INFO.xml
+++ b/internals/zendapi/macros/ZEND_ARG_OBJ_INFO.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.ZEND-ARG-OBJ-INFO">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.zend-arg-obj-info">
  <refnamediv>
   <refname>ZEND_ARG_OBJ_INFO</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/ZEND_ARG_PASS_INFO.xml b/internals/zendapi/macros/ZEND_ARG_PASS_INFO.xml
index e940bf6d1f..33aa21793a 100644
--- a/internals/zendapi/macros/ZEND_ARG_PASS_INFO.xml
+++ b/internals/zendapi/macros/ZEND_ARG_PASS_INFO.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.ZEND-ARG-PASS-INFO">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.zend-arg-pass-info">
  <refnamediv>
   <refname>ZEND_ARG_PASS_INFO</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/ZEND_BEGIN_ARG_INFO.xml b/internals/zendapi/macros/ZEND_BEGIN_ARG_INFO.xml
index c0a994cb10..dd9bf6994c 100644
--- a/internals/zendapi/macros/ZEND_BEGIN_ARG_INFO.xml
+++ b/internals/zendapi/macros/ZEND_BEGIN_ARG_INFO.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.ZEND-BEGIN-ARG-INFO">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.zend-begin-arg-info">
  <refnamediv>
   <refname>ZEND_BEGIN_ARG_INFO</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/ZEND_BEGIN_ARG_INFO_EX.xml b/internals/zendapi/macros/ZEND_BEGIN_ARG_INFO_EX.xml
index a16563aeb8..1e6c9c2f79 100644
--- a/internals/zendapi/macros/ZEND_BEGIN_ARG_INFO_EX.xml
+++ b/internals/zendapi/macros/ZEND_BEGIN_ARG_INFO_EX.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.ZEND-BEGIN-ARG-INFO-EX">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.zend-begin-arg-info-ex">
  <refnamediv>
   <refname>ZEND_BEGIN_ARG_INFO_EX</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/ZEND_BEGIN_MODULE_GLOBALS.xml b/internals/zendapi/macros/ZEND_BEGIN_MODULE_GLOBALS.xml
index 022f63be0c..99dffb3683 100644
--- a/internals/zendapi/macros/ZEND_BEGIN_MODULE_GLOBALS.xml
+++ b/internals/zendapi/macros/ZEND_BEGIN_MODULE_GLOBALS.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.ZEND-BEGIN-MODULE-GLOBALS">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.zend-begin-module-globals">
  <refnamediv>
   <refname>ZEND_BEGIN_MODULE_GLOBALS</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/ZEND_COLL_RESULT.xml b/internals/zendapi/macros/ZEND_COLL_RESULT.xml
index c392c3226d..400e64905c 100644
--- a/internals/zendapi/macros/ZEND_COLL_RESULT.xml
+++ b/internals/zendapi/macros/ZEND_COLL_RESULT.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.ZEND-COLL-RESULT">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.zend-coll-result">
  <refnamediv>
   <refname>ZEND_COLL_RESULT</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/ZEND_DECLARE_MODULE_GLOBALS.xml b/internals/zendapi/macros/ZEND_DECLARE_MODULE_GLOBALS.xml
index b342d240f5..021c440161 100644
--- a/internals/zendapi/macros/ZEND_DECLARE_MODULE_GLOBALS.xml
+++ b/internals/zendapi/macros/ZEND_DECLARE_MODULE_GLOBALS.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.ZEND-DECLARE-MODULE-GLOBALS">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.zend-declare-module-globals">
  <refnamediv>
   <refname>ZEND_DECLARE_MODULE_GLOBALS</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/ZEND_DEFINE_PROPERTY.xml b/internals/zendapi/macros/ZEND_DEFINE_PROPERTY.xml
index 89f98b428f..8ac1817571 100644
--- a/internals/zendapi/macros/ZEND_DEFINE_PROPERTY.xml
+++ b/internals/zendapi/macros/ZEND_DEFINE_PROPERTY.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.ZEND-DEFINE-PROPERTY">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.zend-define-property">
  <refnamediv>
   <refname>ZEND_DEFINE_PROPERTY</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/ZEND_END_ARG_INFO.xml b/internals/zendapi/macros/ZEND_END_ARG_INFO.xml
index 7e332a12f0..90c460871b 100644
--- a/internals/zendapi/macros/ZEND_END_ARG_INFO.xml
+++ b/internals/zendapi/macros/ZEND_END_ARG_INFO.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.ZEND-END-ARG-INFO">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.zend-end-arg-info">
  <refnamediv>
   <refname>ZEND_END_ARG_INFO</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/ZEND_END_MODULE_GLOBALS.xml b/internals/zendapi/macros/ZEND_END_MODULE_GLOBALS.xml
index f00afaaa6f..3346e29336 100644
--- a/internals/zendapi/macros/ZEND_END_MODULE_GLOBALS.xml
+++ b/internals/zendapi/macros/ZEND_END_MODULE_GLOBALS.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.ZEND-END-MODULE-GLOBALS">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.zend-end-module-globals">
  <refnamediv>
   <refname>ZEND_END_MODULE_GLOBALS</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/ZEND_EXTERN_MODULE_GLOBALS.xml b/internals/zendapi/macros/ZEND_EXTERN_MODULE_GLOBALS.xml
index b8f528871b..621bba821f 100644
--- a/internals/zendapi/macros/ZEND_EXTERN_MODULE_GLOBALS.xml
+++ b/internals/zendapi/macros/ZEND_EXTERN_MODULE_GLOBALS.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.ZEND-EXTERN-MODULE-GLOBALS">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.zend-extern-module-globals">
  <refnamediv>
   <refname>ZEND_EXTERN_MODULE_GLOBALS</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/ZEND_FALIAS.xml b/internals/zendapi/macros/ZEND_FALIAS.xml
index ed1fd5835e..8297894316 100644
--- a/internals/zendapi/macros/ZEND_FALIAS.xml
+++ b/internals/zendapi/macros/ZEND_FALIAS.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.ZEND-FALIAS">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.zend-falias">
  <refnamediv>
   <refname>ZEND_FALIAS</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/ZEND_FE.xml b/internals/zendapi/macros/ZEND_FE.xml
index 72b0cf919e..560e211421 100644
--- a/internals/zendapi/macros/ZEND_FE.xml
+++ b/internals/zendapi/macros/ZEND_FE.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.ZEND-FE">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.zend-fe">
  <refnamediv>
   <refname>ZEND_FE</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/ZEND_FENTRY.xml b/internals/zendapi/macros/ZEND_FENTRY.xml
index b71512a28e..3bd19b3ec2 100644
--- a/internals/zendapi/macros/ZEND_FENTRY.xml
+++ b/internals/zendapi/macros/ZEND_FENTRY.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.ZEND-FENTRY">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.zend-fentry">
  <refnamediv>
   <refname>ZEND_FENTRY</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/ZEND_FETCH_RESOURCE.xml b/internals/zendapi/macros/ZEND_FETCH_RESOURCE.xml
index 7109d81619..bc7934820e 100644
--- a/internals/zendapi/macros/ZEND_FETCH_RESOURCE.xml
+++ b/internals/zendapi/macros/ZEND_FETCH_RESOURCE.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.ZEND-FETCH-RESOURCE">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.zend-fetch-resource">
  <refnamediv>
   <refname>ZEND_FETCH_RESOURCE</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/ZEND_FETCH_RESOURCE2.xml b/internals/zendapi/macros/ZEND_FETCH_RESOURCE2.xml
index f33b830bb5..9eeae009e9 100644
--- a/internals/zendapi/macros/ZEND_FETCH_RESOURCE2.xml
+++ b/internals/zendapi/macros/ZEND_FETCH_RESOURCE2.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.ZEND-FETCH-RESOURCE2">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.zend-fetch-resource2">
  <refnamediv>
   <refname>ZEND_FETCH_RESOURCE2</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/ZEND_FN.xml b/internals/zendapi/macros/ZEND_FN.xml
index c751788f4c..0d748f6d11 100644
--- a/internals/zendapi/macros/ZEND_FN.xml
+++ b/internals/zendapi/macros/ZEND_FN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.ZEND-FN">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.zend-fn">
  <refnamediv>
   <refname>ZEND_FN</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/ZEND_FUNCTION.xml b/internals/zendapi/macros/ZEND_FUNCTION.xml
index 7a13d8aa73..c1f09eec83 100644
--- a/internals/zendapi/macros/ZEND_FUNCTION.xml
+++ b/internals/zendapi/macros/ZEND_FUNCTION.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.ZEND-FUNCTION">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.zend-function">
  <refnamediv>
   <refname>ZEND_FUNCTION</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/ZEND_GET_MODULE.xml b/internals/zendapi/macros/ZEND_GET_MODULE.xml
index 5e540b22b1..9fe6ac105c 100644
--- a/internals/zendapi/macros/ZEND_GET_MODULE.xml
+++ b/internals/zendapi/macros/ZEND_GET_MODULE.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<refentry id="zend-macro.ZEND-GET-MODULE">
+<!-- $Revision: 1.5 $ -->
+<refentry id="zend-macro.zend-get-module">
  <refnamediv>
   <refname>ZEND_GET_MODULE</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/ZEND_GET_RESOURCE_TYPE_ID.xml b/internals/zendapi/macros/ZEND_GET_RESOURCE_TYPE_ID.xml
index 84f62ff5b1..f7d1f373ab 100644
--- a/internals/zendapi/macros/ZEND_GET_RESOURCE_TYPE_ID.xml
+++ b/internals/zendapi/macros/ZEND_GET_RESOURCE_TYPE_ID.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.ZEND-GET-RESOURCE-TYPE-ID">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.zend-get-resource-type-id">
  <refnamediv>
   <refname>ZEND_GET_RESOURCE_TYPE_ID</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/ZEND_INIT_MODULE_GLOBALS.xml b/internals/zendapi/macros/ZEND_INIT_MODULE_GLOBALS.xml
index bf89039f34..bfa2151ecb 100644
--- a/internals/zendapi/macros/ZEND_INIT_MODULE_GLOBALS.xml
+++ b/internals/zendapi/macros/ZEND_INIT_MODULE_GLOBALS.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.ZEND-INIT-MODULE-GLOBALS">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.zend-init-module-globals">
  <refnamediv>
   <refname>ZEND_INIT_MODULE_GLOBALS</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/ZEND_INIT_SYMTABLE.xml b/internals/zendapi/macros/ZEND_INIT_SYMTABLE.xml
index 6dea6c051a..99057fb6ee 100644
--- a/internals/zendapi/macros/ZEND_INIT_SYMTABLE.xml
+++ b/internals/zendapi/macros/ZEND_INIT_SYMTABLE.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.ZEND-INIT-SYMTABLE">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.zend-init-symtable">
  <refnamediv>
   <refname>ZEND_INIT_SYMTABLE</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/ZEND_INIT_SYMTABLE_EX.xml b/internals/zendapi/macros/ZEND_INIT_SYMTABLE_EX.xml
index e288f30c15..c8352d646c 100644
--- a/internals/zendapi/macros/ZEND_INIT_SYMTABLE_EX.xml
+++ b/internals/zendapi/macros/ZEND_INIT_SYMTABLE_EX.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.ZEND-INIT-SYMTABLE-EX">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.zend-init-symtable-ex">
  <refnamediv>
   <refname>ZEND_INIT_SYMTABLE_EX</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/ZEND_LOG_XOR.xml b/internals/zendapi/macros/ZEND_LOG_XOR.xml
index 45e82de4e6..6556c417d7 100644
--- a/internals/zendapi/macros/ZEND_LOG_XOR.xml
+++ b/internals/zendapi/macros/ZEND_LOG_XOR.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.ZEND-LOG-XOR">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.zend-log-xor">
  <refnamediv>
   <refname>ZEND_LOG_XOR</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/ZEND_MALIAS.xml b/internals/zendapi/macros/ZEND_MALIAS.xml
index b75ec54710..ce2c84d4ab 100644
--- a/internals/zendapi/macros/ZEND_MALIAS.xml
+++ b/internals/zendapi/macros/ZEND_MALIAS.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.ZEND-MALIAS">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.zend-malias">
  <refnamediv>
   <refname>ZEND_MALIAS</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/ZEND_ME.xml b/internals/zendapi/macros/ZEND_ME.xml
index 1875d8e1d5..3118584b0f 100644
--- a/internals/zendapi/macros/ZEND_ME.xml
+++ b/internals/zendapi/macros/ZEND_ME.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.ZEND-ME">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.zend-me">
  <refnamediv>
   <refname>ZEND_ME</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/ZEND_METHOD.xml b/internals/zendapi/macros/ZEND_METHOD.xml
index 770b2a99b6..6ab14a62e8 100644
--- a/internals/zendapi/macros/ZEND_METHOD.xml
+++ b/internals/zendapi/macros/ZEND_METHOD.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.ZEND-METHOD">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.zend-method">
  <refnamediv>
   <refname>ZEND_METHOD</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/ZEND_ME_MAPPING.xml b/internals/zendapi/macros/ZEND_ME_MAPPING.xml
index 1de8363186..69b75de8e9 100644
--- a/internals/zendapi/macros/ZEND_ME_MAPPING.xml
+++ b/internals/zendapi/macros/ZEND_ME_MAPPING.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.ZEND-ME-MAPPING">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.zend-me-mapping">
  <refnamediv>
   <refname>ZEND_ME_MAPPING</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/ZEND_MODULE_ACTIVATE_D.xml b/internals/zendapi/macros/ZEND_MODULE_ACTIVATE_D.xml
index 99c6a803a1..cdc8d3102e 100644
--- a/internals/zendapi/macros/ZEND_MODULE_ACTIVATE_D.xml
+++ b/internals/zendapi/macros/ZEND_MODULE_ACTIVATE_D.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.ZEND-MODULE-ACTIVATE-D">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.zend-module-activate-d">
  <refnamediv>
   <refname>ZEND_MODULE_ACTIVATE_D</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/ZEND_MODULE_ACTIVATE_N.xml b/internals/zendapi/macros/ZEND_MODULE_ACTIVATE_N.xml
index 634a4897c1..b8248aeb00 100644
--- a/internals/zendapi/macros/ZEND_MODULE_ACTIVATE_N.xml
+++ b/internals/zendapi/macros/ZEND_MODULE_ACTIVATE_N.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.ZEND-MODULE-ACTIVATE-N">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.zend-module-activate-n">
  <refnamediv>
   <refname>ZEND_MODULE_ACTIVATE_N</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/ZEND_MODULE_DEACTIVATE_D.xml b/internals/zendapi/macros/ZEND_MODULE_DEACTIVATE_D.xml
index 1bb85a512b..6e9fa84098 100644
--- a/internals/zendapi/macros/ZEND_MODULE_DEACTIVATE_D.xml
+++ b/internals/zendapi/macros/ZEND_MODULE_DEACTIVATE_D.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.ZEND-MODULE-DEACTIVATE-D">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.zend-module-deactivate-d">
  <refnamediv>
   <refname>ZEND_MODULE_DEACTIVATE_D</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/ZEND_MODULE_DEACTIVATE_N.xml b/internals/zendapi/macros/ZEND_MODULE_DEACTIVATE_N.xml
index ba041d3341..c8f6a0c66a 100644
--- a/internals/zendapi/macros/ZEND_MODULE_DEACTIVATE_N.xml
+++ b/internals/zendapi/macros/ZEND_MODULE_DEACTIVATE_N.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.ZEND-MODULE-DEACTIVATE-N">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.zend-module-deactivate-n">
  <refnamediv>
   <refname>ZEND_MODULE_DEACTIVATE_N</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/ZEND_MODULE_INFO_D.xml b/internals/zendapi/macros/ZEND_MODULE_INFO_D.xml
index 743895ef18..21973e82b6 100644
--- a/internals/zendapi/macros/ZEND_MODULE_INFO_D.xml
+++ b/internals/zendapi/macros/ZEND_MODULE_INFO_D.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.ZEND-MODULE-INFO-D">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.zend-module-info-d">
  <refnamediv>
   <refname>ZEND_MODULE_INFO_D</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/ZEND_MODULE_INFO_N.xml b/internals/zendapi/macros/ZEND_MODULE_INFO_N.xml
index 078581c6c1..614b9e736d 100644
--- a/internals/zendapi/macros/ZEND_MODULE_INFO_N.xml
+++ b/internals/zendapi/macros/ZEND_MODULE_INFO_N.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.ZEND-MODULE-INFO-N">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.zend-module-info-n">
  <refnamediv>
   <refname>ZEND_MODULE_INFO_N</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/ZEND_MODULE_POST_ZEND_DEACTIVATE_D.xml b/internals/zendapi/macros/ZEND_MODULE_POST_ZEND_DEACTIVATE_D.xml
index 9f4217b0cd..b978d90f03 100644
--- a/internals/zendapi/macros/ZEND_MODULE_POST_ZEND_DEACTIVATE_D.xml
+++ b/internals/zendapi/macros/ZEND_MODULE_POST_ZEND_DEACTIVATE_D.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.ZEND-MODULE-POST-ZEND-DEACTIVATE-D">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.zend-module-post-zend-deactivate-d">
  <refnamediv>
   <refname>ZEND_MODULE_POST_ZEND_DEACTIVATE_D</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/ZEND_MODULE_POST_ZEND_DEACTIVATE_N.xml b/internals/zendapi/macros/ZEND_MODULE_POST_ZEND_DEACTIVATE_N.xml
index e17a990ff2..1006c2f4b3 100644
--- a/internals/zendapi/macros/ZEND_MODULE_POST_ZEND_DEACTIVATE_N.xml
+++ b/internals/zendapi/macros/ZEND_MODULE_POST_ZEND_DEACTIVATE_N.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.ZEND-MODULE-POST-ZEND-DEACTIVATE-N">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.zend-module-post-zend-deactivate-n">
  <refnamediv>
   <refname>ZEND_MODULE_POST_ZEND_DEACTIVATE_N</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/ZEND_MODULE_SHUTDOWN_D.xml b/internals/zendapi/macros/ZEND_MODULE_SHUTDOWN_D.xml
index 208761cd2d..ae66ad6112 100644
--- a/internals/zendapi/macros/ZEND_MODULE_SHUTDOWN_D.xml
+++ b/internals/zendapi/macros/ZEND_MODULE_SHUTDOWN_D.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.ZEND-MODULE-SHUTDOWN-D">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.zend-module-shutdown-d">
  <refnamediv>
   <refname>ZEND_MODULE_SHUTDOWN_D</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/ZEND_MODULE_SHUTDOWN_N.xml b/internals/zendapi/macros/ZEND_MODULE_SHUTDOWN_N.xml
index b9c443e4c2..9a8b1d5e33 100644
--- a/internals/zendapi/macros/ZEND_MODULE_SHUTDOWN_N.xml
+++ b/internals/zendapi/macros/ZEND_MODULE_SHUTDOWN_N.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.ZEND-MODULE-SHUTDOWN-N">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.zend-module-shutdown-n">
  <refnamediv>
   <refname>ZEND_MODULE_SHUTDOWN_N</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/ZEND_MODULE_STARTUP_D.xml b/internals/zendapi/macros/ZEND_MODULE_STARTUP_D.xml
index ca02ba0d68..603764beca 100644
--- a/internals/zendapi/macros/ZEND_MODULE_STARTUP_D.xml
+++ b/internals/zendapi/macros/ZEND_MODULE_STARTUP_D.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.ZEND-MODULE-STARTUP-D">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.zend-module-startup-d">
  <refnamediv>
   <refname>ZEND_MODULE_STARTUP_D</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/ZEND_MODULE_STARTUP_N.xml b/internals/zendapi/macros/ZEND_MODULE_STARTUP_N.xml
index af01fb88af..dcab9d83d6 100644
--- a/internals/zendapi/macros/ZEND_MODULE_STARTUP_N.xml
+++ b/internals/zendapi/macros/ZEND_MODULE_STARTUP_N.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.ZEND-MODULE-STARTUP-N">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.zend-module-startup-n">
  <refnamediv>
   <refname>ZEND_MODULE_STARTUP_N</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/ZEND_MOD_CONFLICTS.xml b/internals/zendapi/macros/ZEND_MOD_CONFLICTS.xml
index 271ffcc069..87b39a815f 100644
--- a/internals/zendapi/macros/ZEND_MOD_CONFLICTS.xml
+++ b/internals/zendapi/macros/ZEND_MOD_CONFLICTS.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<refentry id="zend-macro.ZEND-MOD-CONFLICTS">
+<!-- $Revision: 1.5 $ -->
+<refentry id="zend-macro.zend-mod-conflicts">
  <refnamediv>
   <refname>ZEND_MOD_CONFLICTS</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/ZEND_MOD_CONFLICTS_EX.xml b/internals/zendapi/macros/ZEND_MOD_CONFLICTS_EX.xml
index 07d86aa07a..19b93945fc 100644
--- a/internals/zendapi/macros/ZEND_MOD_CONFLICTS_EX.xml
+++ b/internals/zendapi/macros/ZEND_MOD_CONFLICTS_EX.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<refentry id="zend-macro.ZEND-MOD-CONFLICTS-EX">
+<!-- $Revision: 1.5 $ -->
+<refentry id="zend-macro.zend-mod-conflicts-ex">
  <refnamediv>
   <refname>ZEND_MOD_CONFLICTS_EX</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/ZEND_MOD_OPTIONAL.xml b/internals/zendapi/macros/ZEND_MOD_OPTIONAL.xml
index 0ac23ecbc3..ba78577cc1 100644
--- a/internals/zendapi/macros/ZEND_MOD_OPTIONAL.xml
+++ b/internals/zendapi/macros/ZEND_MOD_OPTIONAL.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<refentry id="zend-macro.ZEND-MOD-OPTIONAL">
+<!-- $Revision: 1.5 $ -->
+<refentry id="zend-macro.zend-mod-optional">
  <refnamediv>
   <refname>ZEND_MOD_OPTIONAL</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/ZEND_MOD_OPTIONAL_EX.xml b/internals/zendapi/macros/ZEND_MOD_OPTIONAL_EX.xml
index c2ab4af394..0c533eccd8 100644
--- a/internals/zendapi/macros/ZEND_MOD_OPTIONAL_EX.xml
+++ b/internals/zendapi/macros/ZEND_MOD_OPTIONAL_EX.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<refentry id="zend-macro.ZEND-MOD-OPTIONAL-EX">
+<!-- $Revision: 1.5 $ -->
+<refentry id="zend-macro.zend-mod-optional-ex">
  <refnamediv>
   <refname>ZEND_MOD_OPTIONAL_EX</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/ZEND_MOD_REQUIRED.xml b/internals/zendapi/macros/ZEND_MOD_REQUIRED.xml
index 785ffac3ab..5ec07e2b81 100644
--- a/internals/zendapi/macros/ZEND_MOD_REQUIRED.xml
+++ b/internals/zendapi/macros/ZEND_MOD_REQUIRED.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<refentry id="zend-macro.ZEND-MOD-REQUIRED">
+<!-- $Revision: 1.5 $ -->
+<refentry id="zend-macro.zend-mod-required">
  <refnamediv>
   <refname>ZEND_MOD_REQUIRED</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/ZEND_MOD_REQUIRED_EX.xml b/internals/zendapi/macros/ZEND_MOD_REQUIRED_EX.xml
index 79cb4bc2b4..149693e483 100644
--- a/internals/zendapi/macros/ZEND_MOD_REQUIRED_EX.xml
+++ b/internals/zendapi/macros/ZEND_MOD_REQUIRED_EX.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<refentry id="zend-macro.ZEND-MOD-REQUIRED-EX">
+<!-- $Revision: 1.5 $ -->
+<refentry id="zend-macro.zend-mod-required-ex">
  <refnamediv>
   <refname>ZEND_MOD_REQUIRED_EX</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/ZEND_NAMED_FE.xml b/internals/zendapi/macros/ZEND_NAMED_FE.xml
index 726449ddfe..9c52ec765c 100644
--- a/internals/zendapi/macros/ZEND_NAMED_FE.xml
+++ b/internals/zendapi/macros/ZEND_NAMED_FE.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.ZEND-NAMED-FE">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.zend-named-fe">
  <refnamediv>
   <refname>ZEND_NAMED_FE</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/ZEND_NAMED_FUNCTION.xml b/internals/zendapi/macros/ZEND_NAMED_FUNCTION.xml
index fbe74f1e6e..1b302c2399 100644
--- a/internals/zendapi/macros/ZEND_NAMED_FUNCTION.xml
+++ b/internals/zendapi/macros/ZEND_NAMED_FUNCTION.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.ZEND-NAMED-FUNCTION">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.zend-named-function">
  <refnamediv>
   <refname>ZEND_NAMED_FUNCTION</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/ZEND_NORMALIZE_BOOL.xml b/internals/zendapi/macros/ZEND_NORMALIZE_BOOL.xml
index a399fa1acc..deaaf81b34 100644
--- a/internals/zendapi/macros/ZEND_NORMALIZE_BOOL.xml
+++ b/internals/zendapi/macros/ZEND_NORMALIZE_BOOL.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.ZEND-NORMALIZE-BOOL">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.zend-normalize-bool">
  <refnamediv>
   <refname>ZEND_NORMALIZE_BOOL</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/ZEND_NUM_ARGS.xml b/internals/zendapi/macros/ZEND_NUM_ARGS.xml
index 354685d6a6..0890cf397e 100644
--- a/internals/zendapi/macros/ZEND_NUM_ARGS.xml
+++ b/internals/zendapi/macros/ZEND_NUM_ARGS.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<refentry id="zend-macro.ZEND-NUM-ARGS">
+<!-- $Revision: 1.5 $ -->
+<refentry id="zend-macro.zend-num-args">
  <refnamediv>
   <refname>ZEND_NUM_ARGS</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/ZEND_PUTC.xml b/internals/zendapi/macros/ZEND_PUTC.xml
index c000eac060..3c71102240 100644
--- a/internals/zendapi/macros/ZEND_PUTC.xml
+++ b/internals/zendapi/macros/ZEND_PUTC.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<refentry id="zend-macro.ZEND-PUTC">
+<!-- $Revision: 1.5 $ -->
+<refentry id="zend-macro.zend-putc">
  <refnamediv>
   <refname>ZEND_PUTC</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/ZEND_PUTS.xml b/internals/zendapi/macros/ZEND_PUTS.xml
index 42dc39f10f..64d79e0c28 100644
--- a/internals/zendapi/macros/ZEND_PUTS.xml
+++ b/internals/zendapi/macros/ZEND_PUTS.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<refentry id="zend-macro.ZEND-PUTS">
+<!-- $Revision: 1.5 $ -->
+<refentry id="zend-macro.zend-puts">
  <refnamediv>
   <refname>ZEND_PUTS</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/ZEND_REGISTER_RESOURCE.xml b/internals/zendapi/macros/ZEND_REGISTER_RESOURCE.xml
index bd71b54fa4..0499dca2c3 100644
--- a/internals/zendapi/macros/ZEND_REGISTER_RESOURCE.xml
+++ b/internals/zendapi/macros/ZEND_REGISTER_RESOURCE.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.ZEND-REGISTER-RESOURCE">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.zend-register-resource">
  <refnamediv>
   <refname>ZEND_REGISTER_RESOURCE</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/ZEND_RSRC_DTOR_FUNC.xml b/internals/zendapi/macros/ZEND_RSRC_DTOR_FUNC.xml
index b833fd6aba..aa69bd546c 100644
--- a/internals/zendapi/macros/ZEND_RSRC_DTOR_FUNC.xml
+++ b/internals/zendapi/macros/ZEND_RSRC_DTOR_FUNC.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.ZEND-RSRC-DTOR-FUNC">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.zend-rsrc-dtor-func">
  <refnamediv>
   <refname>ZEND_RSRC_DTOR_FUNC</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/ZEND_SET_GLOBAL_VAR.xml b/internals/zendapi/macros/ZEND_SET_GLOBAL_VAR.xml
index b819212a1c..c7cf1d592b 100644
--- a/internals/zendapi/macros/ZEND_SET_GLOBAL_VAR.xml
+++ b/internals/zendapi/macros/ZEND_SET_GLOBAL_VAR.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.ZEND-SET-GLOBAL-VAR">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.zend-set-global-var">
  <refnamediv>
   <refname>ZEND_SET_GLOBAL_VAR</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/ZEND_SET_GLOBAL_VAR_WITH_LENGTH.xml b/internals/zendapi/macros/ZEND_SET_GLOBAL_VAR_WITH_LENGTH.xml
index 9609e2bcf9..f1ad72c0e5 100644
--- a/internals/zendapi/macros/ZEND_SET_GLOBAL_VAR_WITH_LENGTH.xml
+++ b/internals/zendapi/macros/ZEND_SET_GLOBAL_VAR_WITH_LENGTH.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.ZEND-SET-GLOBAL-VAR-WITH-LENGTH">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.zend-set-global-var-with-length">
  <refnamediv>
   <refname>ZEND_SET_GLOBAL_VAR_WITH_LENGTH</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/ZEND_SET_SYMBOL.xml b/internals/zendapi/macros/ZEND_SET_SYMBOL.xml
index eeeb1de2cb..72428e4aac 100644
--- a/internals/zendapi/macros/ZEND_SET_SYMBOL.xml
+++ b/internals/zendapi/macros/ZEND_SET_SYMBOL.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.ZEND-SET-SYMBOL">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.zend-set-symbol">
  <refnamediv>
   <refname>ZEND_SET_SYMBOL</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/ZEND_SET_SYMBOL_WITH_LENGTH.xml b/internals/zendapi/macros/ZEND_SET_SYMBOL_WITH_LENGTH.xml
index 2d1b49694e..53ab57180b 100644
--- a/internals/zendapi/macros/ZEND_SET_SYMBOL_WITH_LENGTH.xml
+++ b/internals/zendapi/macros/ZEND_SET_SYMBOL_WITH_LENGTH.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.ZEND-SET-SYMBOL-WITH-LENGTH">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.zend-set-symbol-with-length">
  <refnamediv>
   <refname>ZEND_SET_SYMBOL_WITH_LENGTH</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/ZEND_STRL.xml b/internals/zendapi/macros/ZEND_STRL.xml
index 19224ad880..210c5fed9f 100644
--- a/internals/zendapi/macros/ZEND_STRL.xml
+++ b/internals/zendapi/macros/ZEND_STRL.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.ZEND-STRL">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.zend-strl">
  <refnamediv>
   <refname>ZEND_STRL</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/ZEND_STRS.xml b/internals/zendapi/macros/ZEND_STRS.xml
index 52365757ff..5af65271d0 100644
--- a/internals/zendapi/macros/ZEND_STRS.xml
+++ b/internals/zendapi/macros/ZEND_STRS.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.ZEND-STRS">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.zend-strs">
  <refnamediv>
   <refname>ZEND_STRS</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/ZEND_TRUTH.xml b/internals/zendapi/macros/ZEND_TRUTH.xml
index 002b05f64b..91b371786b 100644
--- a/internals/zendapi/macros/ZEND_TRUTH.xml
+++ b/internals/zendapi/macros/ZEND_TRUTH.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<refentry id="zend-macro.ZEND-TRUTH">
+<!-- $Revision: 1.5 $ -->
+<refentry id="zend-macro.zend-truth">
  <refnamediv>
   <refname>ZEND_TRUTH</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/ZEND_UV.xml b/internals/zendapi/macros/ZEND_UV.xml
index f55c7beb5e..c0614048f0 100644
--- a/internals/zendapi/macros/ZEND_UV.xml
+++ b/internals/zendapi/macros/ZEND_UV.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.ZEND-UV">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.zend-uv">
  <refnamediv>
   <refname>ZEND_UV</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/ZEND_U_CONVERTER.xml b/internals/zendapi/macros/ZEND_U_CONVERTER.xml
index c5d38075f1..1b3026fb4d 100644
--- a/internals/zendapi/macros/ZEND_U_CONVERTER.xml
+++ b/internals/zendapi/macros/ZEND_U_CONVERTER.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.ZEND-U-CONVERTER">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.zend-u-converter">
  <refnamediv>
   <refname>ZEND_U_CONVERTER</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/ZEND_U_EQUAL.xml b/internals/zendapi/macros/ZEND_U_EQUAL.xml
index 354f333903..d7b14726de 100644
--- a/internals/zendapi/macros/ZEND_U_EQUAL.xml
+++ b/internals/zendapi/macros/ZEND_U_EQUAL.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.ZEND-U-EQUAL">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.zend-u-equal">
  <refnamediv>
   <refname>ZEND_U_EQUAL</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/ZEND_U_SET_SYMBOL_WITH_LENGTH.xml b/internals/zendapi/macros/ZEND_U_SET_SYMBOL_WITH_LENGTH.xml
index 4ae7cf36c7..001f92a74a 100644
--- a/internals/zendapi/macros/ZEND_U_SET_SYMBOL_WITH_LENGTH.xml
+++ b/internals/zendapi/macros/ZEND_U_SET_SYMBOL_WITH_LENGTH.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.ZEND-U-SET-SYMBOL-WITH-LENGTH">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.zend-u-set-symbol-with-length">
  <refnamediv>
   <refname>ZEND_U_SET_SYMBOL_WITH_LENGTH</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/ZEND_VERIFY_RESOURCE.xml b/internals/zendapi/macros/ZEND_VERIFY_RESOURCE.xml
index 1a6121a5e2..1f1fd7c09b 100644
--- a/internals/zendapi/macros/ZEND_VERIFY_RESOURCE.xml
+++ b/internals/zendapi/macros/ZEND_VERIFY_RESOURCE.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.ZEND-VERIFY-RESOURCE">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.zend-verify-resource">
  <refnamediv>
   <refname>ZEND_VERIFY_RESOURCE</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/ZEND_WRITE.xml b/internals/zendapi/macros/ZEND_WRITE.xml
index 03cfdb0bc4..7d0411ef6c 100644
--- a/internals/zendapi/macros/ZEND_WRITE.xml
+++ b/internals/zendapi/macros/ZEND_WRITE.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<refentry id="zend-macro.ZEND-WRITE">
+<!-- $Revision: 1.5 $ -->
+<refentry id="zend-macro.zend-write">
  <refnamediv>
   <refname>ZEND_WRITE</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/ZEND_WRONG_PARAM_COUNT.xml b/internals/zendapi/macros/ZEND_WRONG_PARAM_COUNT.xml
index b0397e411d..caa8c7ea52 100644
--- a/internals/zendapi/macros/ZEND_WRONG_PARAM_COUNT.xml
+++ b/internals/zendapi/macros/ZEND_WRONG_PARAM_COUNT.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.ZEND-WRONG-PARAM-COUNT">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.zend-wrong-param-count">
  <refnamediv>
   <refname>ZEND_WRONG_PARAM_COUNT</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/ZEND_WRONG_PARAM_COUNT_WITH_RETVAL.xml b/internals/zendapi/macros/ZEND_WRONG_PARAM_COUNT_WITH_RETVAL.xml
index 7f1ebffd43..5a0f5a12ec 100644
--- a/internals/zendapi/macros/ZEND_WRONG_PARAM_COUNT_WITH_RETVAL.xml
+++ b/internals/zendapi/macros/ZEND_WRONG_PARAM_COUNT_WITH_RETVAL.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
-<refentry id="zend-api-macro.ZEND-WRONG-PARAM-COUNT-WITH-RETVAL">
+<!-- $Revision: 1.3 $ -->
+<refentry id="zend-api-macro.zend-wrong-param-count-with-retval">
  <refnamediv>
   <refname>ZEND_WRONG_PARAM_COUNT_WITH_RETVAL</refname>
   <refpurpose>Generate standard error message and return custom value</refpurpose>
diff --git a/internals/zendapi/macros/Z_ARRVAL.xml b/internals/zendapi/macros/Z_ARRVAL.xml
index 2be4bf0507..13bb6cc9b7 100644
--- a/internals/zendapi/macros/Z_ARRVAL.xml
+++ b/internals/zendapi/macros/Z_ARRVAL.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
-<refentry id="zend-macro.Z-ARRVAL">
+<!-- $Revision: 1.6 $ -->
+<refentry id="zend-macro.z-arrval">
  <refnamediv>
   <refname>Z_ARRVAL</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/Z_ARRVAL_P.xml b/internals/zendapi/macros/Z_ARRVAL_P.xml
index ea2137c86b..990067569c 100644
--- a/internals/zendapi/macros/Z_ARRVAL_P.xml
+++ b/internals/zendapi/macros/Z_ARRVAL_P.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
-<refentry id="zend-macro.Z-ARRVAL-P">
+<!-- $Revision: 1.6 $ -->
+<refentry id="zend-macro.z-arrval-p">
  <refnamediv>
   <refname>Z_ARRVAL_P</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/Z_ARRVAL_PP.xml b/internals/zendapi/macros/Z_ARRVAL_PP.xml
index 69397140fd..0898a2664a 100644
--- a/internals/zendapi/macros/Z_ARRVAL_PP.xml
+++ b/internals/zendapi/macros/Z_ARRVAL_PP.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
-<refentry id="zend-macro.Z-ARRVAL-PP">
+<!-- $Revision: 1.6 $ -->
+<refentry id="zend-macro.z-arrval-pp">
  <refnamediv>
   <refname>Z_ARRVAL_PP</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/Z_BINLEN.xml b/internals/zendapi/macros/Z_BINLEN.xml
index e3e9c53fe5..e1f586348f 100644
--- a/internals/zendapi/macros/Z_BINLEN.xml
+++ b/internals/zendapi/macros/Z_BINLEN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<refentry id="zend-macro.Z-BINLEN">
+<!-- $Revision: 1.5 $ -->
+<refentry id="zend-macro.z-binlen">
  <refnamediv>
   <refname>Z_BINLEN</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/Z_BINLEN_P.xml b/internals/zendapi/macros/Z_BINLEN_P.xml
index 93f4e7d220..da5ac48c53 100644
--- a/internals/zendapi/macros/Z_BINLEN_P.xml
+++ b/internals/zendapi/macros/Z_BINLEN_P.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<refentry id="zend-macro.Z-BINLEN-P">
+<!-- $Revision: 1.5 $ -->
+<refentry id="zend-macro.z-binlen-p">
  <refnamediv>
   <refname>Z_BINLEN_P</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/Z_BINLEN_PP.xml b/internals/zendapi/macros/Z_BINLEN_PP.xml
index 98ea82da34..89745cce99 100644
--- a/internals/zendapi/macros/Z_BINLEN_PP.xml
+++ b/internals/zendapi/macros/Z_BINLEN_PP.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<refentry id="zend-macro.Z-BINLEN-PP">
+<!-- $Revision: 1.5 $ -->
+<refentry id="zend-macro.z-binlen-pp">
  <refnamediv>
   <refname>Z_BINLEN_PP</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/Z_BINVAL.xml b/internals/zendapi/macros/Z_BINVAL.xml
index 5e726e0538..c87dfd4160 100644
--- a/internals/zendapi/macros/Z_BINVAL.xml
+++ b/internals/zendapi/macros/Z_BINVAL.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.Z-BINVAL">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.z-binval">
  <refnamediv>
   <refname>Z_BINVAL</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/Z_BINVAL_P.xml b/internals/zendapi/macros/Z_BINVAL_P.xml
index 0e987b1ac9..ea5deb7d0c 100644
--- a/internals/zendapi/macros/Z_BINVAL_P.xml
+++ b/internals/zendapi/macros/Z_BINVAL_P.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.Z-BINVAL-P">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.z-binval-p">
  <refnamediv>
   <refname>Z_BINVAL_P</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/Z_BINVAL_PP.xml b/internals/zendapi/macros/Z_BINVAL_PP.xml
index 5bc11b9fcd..64b8cce3fa 100644
--- a/internals/zendapi/macros/Z_BINVAL_PP.xml
+++ b/internals/zendapi/macros/Z_BINVAL_PP.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.Z-BINVAL-PP">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.z-binval-pp">
  <refnamediv>
   <refname>Z_BINVAL_PP</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/Z_BVAL.xml b/internals/zendapi/macros/Z_BVAL.xml
index 2a1dd98d60..82610c27b8 100644
--- a/internals/zendapi/macros/Z_BVAL.xml
+++ b/internals/zendapi/macros/Z_BVAL.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
-<refentry id="zend-macro.Z-BVAL">
+<!-- $Revision: 1.6 $ -->
+<refentry id="zend-macro.z-bval">
  <refnamediv>
   <refname>Z_BVAL</refname>
   <refpurpose>Return a <type>zval</type> <varname>lval</varname> element as <type>bool</type></refpurpose>
diff --git a/internals/zendapi/macros/Z_BVAL_P.xml b/internals/zendapi/macros/Z_BVAL_P.xml
index b59c0de2e2..f3902a5475 100644
--- a/internals/zendapi/macros/Z_BVAL_P.xml
+++ b/internals/zendapi/macros/Z_BVAL_P.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
-<refentry id="zend-macro.Z-BVAL-P">
+<!-- $Revision: 1.6 $ -->
+<refentry id="zend-macro.z-bval-p">
  <refnamediv>
   <refname>Z_BVAL_P</refname>
   <refpurpose>Dereference a <type>zval</type> pointer and return its <varname>lval</varname> element as <type>bool</type></refpurpose>
diff --git a/internals/zendapi/macros/Z_BVAL_PP.xml b/internals/zendapi/macros/Z_BVAL_PP.xml
index 595d60e68a..f8d6614ba8 100644
--- a/internals/zendapi/macros/Z_BVAL_PP.xml
+++ b/internals/zendapi/macros/Z_BVAL_PP.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
-<refentry id="zend-macro.Z-BVAL-PP">
+<!-- $Revision: 1.6 $ -->
+<refentry id="zend-macro.z-bval-pp">
  <refnamediv>
   <refname>Z_BVAL_PP</refname>
   <refpurpose>Dereference a pointer to a <type>zval</type> pointer and return its <varname>lval</varname> element as <type>bool</type></refpurpose>
diff --git a/internals/zendapi/macros/Z_DBG.xml b/internals/zendapi/macros/Z_DBG.xml
index 07fbd6d376..38bd7c3bbf 100644
--- a/internals/zendapi/macros/Z_DBG.xml
+++ b/internals/zendapi/macros/Z_DBG.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.Z-DBG">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.z-dbg">
  <refnamediv>
   <refname>Z_DBG</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/Z_DVAL.xml b/internals/zendapi/macros/Z_DVAL.xml
index 1e1d820b35..807ddee26a 100644
--- a/internals/zendapi/macros/Z_DVAL.xml
+++ b/internals/zendapi/macros/Z_DVAL.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
-<refentry id="zend-macro.Z-DVAL">
+<!-- $Revision: 1.6 $ -->
+<refentry id="zend-macro.z-dval">
  <refnamediv>
   <refname>Z_DVAL</refname>
   <refpurpose>Return the dval element of a zval</refpurpose>
diff --git a/internals/zendapi/macros/Z_DVAL_P.xml b/internals/zendapi/macros/Z_DVAL_P.xml
index 1b106da257..c2d731a421 100644
--- a/internals/zendapi/macros/Z_DVAL_P.xml
+++ b/internals/zendapi/macros/Z_DVAL_P.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
-<refentry id="zend-macro.Z-DVAL-P">
+<!-- $Revision: 1.6 $ -->
+<refentry id="zend-macro.z-dval-p">
  <refnamediv>
   <refname>Z_DVAL_P</refname>
   <refpurpose>Dereference a <type>zval</type> pointer and return its <varname>dval</varname> element</refpurpose>
diff --git a/internals/zendapi/macros/Z_DVAL_PP.xml b/internals/zendapi/macros/Z_DVAL_PP.xml
index ec09e9b9fe..7bd69bfc8d 100644
--- a/internals/zendapi/macros/Z_DVAL_PP.xml
+++ b/internals/zendapi/macros/Z_DVAL_PP.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
-<refentry id="zend-macro.Z-DVAL-PP">
+<!-- $Revision: 1.6 $ -->
+<refentry id="zend-macro.z-dval-pp">
  <refnamediv>
   <refname>Z_DVAL_PP</refname>
   <refpurpose>Dereference a pointer to a <type>zval</type> pointer and return its <varname>dval</varname> element</refpurpose>
diff --git a/internals/zendapi/macros/Z_LVAL.xml b/internals/zendapi/macros/Z_LVAL.xml
index a731b6a7dc..c300ae88b7 100644
--- a/internals/zendapi/macros/Z_LVAL.xml
+++ b/internals/zendapi/macros/Z_LVAL.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
-<refentry id="zend-macro.Z-LVAL">
+<!-- $Revision: 1.6 $ -->
+<refentry id="zend-macro.z-lval">
  <refnamediv>
   <refname>Z_LVAL</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/Z_LVAL_P.xml b/internals/zendapi/macros/Z_LVAL_P.xml
index 8aef994ed2..6feb0c7d9a 100644
--- a/internals/zendapi/macros/Z_LVAL_P.xml
+++ b/internals/zendapi/macros/Z_LVAL_P.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
-<refentry id="zend-macro.Z-LVAL-P">
+<!-- $Revision: 1.6 $ -->
+<refentry id="zend-macro.z-lval-p">
  <refnamediv>
   <refname>Z_LVAL_P</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/Z_LVAL_PP.xml b/internals/zendapi/macros/Z_LVAL_PP.xml
index 9e25ac9dd7..2d1235234a 100644
--- a/internals/zendapi/macros/Z_LVAL_PP.xml
+++ b/internals/zendapi/macros/Z_LVAL_PP.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
-<refentry id="zend-macro.Z-LVAL-PP">
+<!-- $Revision: 1.6 $ -->
+<refentry id="zend-macro.z-lval-pp">
  <refnamediv>
   <refname>Z_LVAL_PP</refname>
   <refpurpose>Dereference a pointer to a <type>zval</type> pointer and return its <varname>lval</varname> element</refpurpose>
diff --git a/internals/zendapi/macros/Z_OBJCE.xml b/internals/zendapi/macros/Z_OBJCE.xml
index ef7d428543..36aa206fa7 100644
--- a/internals/zendapi/macros/Z_OBJCE.xml
+++ b/internals/zendapi/macros/Z_OBJCE.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<refentry id="zend-macro.Z-OBJCE">
+<!-- $Revision: 1.5 $ -->
+<refentry id="zend-macro.z-objce">
  <refnamediv>
   <refname>Z_OBJCE</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/Z_OBJCE_P.xml b/internals/zendapi/macros/Z_OBJCE_P.xml
index 6adf240289..01999594ae 100644
--- a/internals/zendapi/macros/Z_OBJCE_P.xml
+++ b/internals/zendapi/macros/Z_OBJCE_P.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<refentry id="zend-macro.Z-OBJCE-P">
+<!-- $Revision: 1.5 $ -->
+<refentry id="zend-macro.z-objce-p">
  <refnamediv>
   <refname>Z_OBJCE_P</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/Z_OBJCE_PP.xml b/internals/zendapi/macros/Z_OBJCE_PP.xml
index a3de50cf78..062f7cb20c 100644
--- a/internals/zendapi/macros/Z_OBJCE_PP.xml
+++ b/internals/zendapi/macros/Z_OBJCE_PP.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<refentry id="zend-macro.Z-OBJCE-PP">
+<!-- $Revision: 1.5 $ -->
+<refentry id="zend-macro.z-objce-pp">
  <refnamediv>
   <refname>Z_OBJCE_PP</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/Z_OBJPROP.xml b/internals/zendapi/macros/Z_OBJPROP.xml
index cf433abce1..c73d4f1f74 100644
--- a/internals/zendapi/macros/Z_OBJPROP.xml
+++ b/internals/zendapi/macros/Z_OBJPROP.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<refentry id="zend-macro.Z-OBJPROP">
+<!-- $Revision: 1.5 $ -->
+<refentry id="zend-macro.z-objprop">
  <refnamediv>
   <refname>Z_OBJPROP</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/Z_OBJPROP_P.xml b/internals/zendapi/macros/Z_OBJPROP_P.xml
index 64b1d5696a..dafd04b86b 100644
--- a/internals/zendapi/macros/Z_OBJPROP_P.xml
+++ b/internals/zendapi/macros/Z_OBJPROP_P.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<refentry id="zend-macro.Z-OBJPROP-P">
+<!-- $Revision: 1.5 $ -->
+<refentry id="zend-macro.z-objprop-p">
  <refnamediv>
   <refname>Z_OBJPROP_P</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/Z_OBJPROP_PP.xml b/internals/zendapi/macros/Z_OBJPROP_PP.xml
index 618a2fd4bc..6bd2957430 100644
--- a/internals/zendapi/macros/Z_OBJPROP_PP.xml
+++ b/internals/zendapi/macros/Z_OBJPROP_PP.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<refentry id="zend-macro.Z-OBJPROP-PP">
+<!-- $Revision: 1.5 $ -->
+<refentry id="zend-macro.z-objprop-pp">
  <refnamediv>
   <refname>Z_OBJPROP_PP</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/Z_OBJVAL.xml b/internals/zendapi/macros/Z_OBJVAL.xml
index 36ac28a85a..0654e12af7 100644
--- a/internals/zendapi/macros/Z_OBJVAL.xml
+++ b/internals/zendapi/macros/Z_OBJVAL.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.Z-OBJVAL">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.z-objval">
  <refnamediv>
   <refname>Z_OBJVAL</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/Z_OBJVAL_P.xml b/internals/zendapi/macros/Z_OBJVAL_P.xml
index 666c6aff0e..eba737ce86 100644
--- a/internals/zendapi/macros/Z_OBJVAL_P.xml
+++ b/internals/zendapi/macros/Z_OBJVAL_P.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.Z-OBJVAL-P">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.z-objval-p">
  <refnamediv>
   <refname>Z_OBJVAL_P</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/Z_OBJVAL_PP.xml b/internals/zendapi/macros/Z_OBJVAL_PP.xml
index 7aefaf3638..0287b735b3 100644
--- a/internals/zendapi/macros/Z_OBJVAL_PP.xml
+++ b/internals/zendapi/macros/Z_OBJVAL_PP.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<refentry id="zend-macro.Z-OBJVAL-PP">
+<!-- $Revision: 1.4 $ -->
+<refentry id="zend-macro.z-objval-pp">
  <refnamediv>
   <refname>Z_OBJVAL_PP</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/Z_OBJ_CLASS_NAME_P.xml b/internals/zendapi/macros/Z_OBJ_CLASS_NAME_P.xml
index 92d62a2c4e..e636787b79 100644
--- a/internals/zendapi/macros/Z_OBJ_CLASS_NAME_P.xml
+++ b/internals/zendapi/macros/Z_OBJ_CLASS_NAME_P.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<refentry id="zend-macro.Z-OBJ-CLASS-NAME-P">
+<!-- $Revision: 1.5 $ -->
+<refentry id="zend-macro.z-obj-class-name-p">
  <refnamediv>
   <refname>Z_OBJ_CLASS_NAME_P</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/Z_OBJ_HANDLE.xml b/internals/zendapi/macros/Z_OBJ_HANDLE.xml
index 70b3731c0c..f0123099cf 100644
--- a/internals/zendapi/macros/Z_OBJ_HANDLE.xml
+++ b/internals/zendapi/macros/Z_OBJ_HANDLE.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<refentry id="zend-macro.Z-OBJ-HANDLE">
+<!-- $Revision: 1.5 $ -->
+<refentry id="zend-macro.z-obj-handle">
  <refnamediv>
   <refname>Z_OBJ_HANDLE</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/Z_OBJ_HANDLER.xml b/internals/zendapi/macros/Z_OBJ_HANDLER.xml
index d47dae75f0..186b871553 100644
--- a/internals/zendapi/macros/Z_OBJ_HANDLER.xml
+++ b/internals/zendapi/macros/Z_OBJ_HANDLER.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<refentry id="zend-macro.Z-OBJ-HANDLER">
+<!-- $Revision: 1.5 $ -->
+<refentry id="zend-macro.z-obj-handler">
  <refnamediv>
   <refname>Z_OBJ_HANDLER</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/Z_OBJ_HANDLER_P.xml b/internals/zendapi/macros/Z_OBJ_HANDLER_P.xml
index dd99c99a1a..03ce99cacb 100644
--- a/internals/zendapi/macros/Z_OBJ_HANDLER_P.xml
+++ b/internals/zendapi/macros/Z_OBJ_HANDLER_P.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<refentry id="zend-macro.Z-OBJ-HANDLER-P">
+<!-- $Revision: 1.5 $ -->
+<refentry id="zend-macro.z-obj-handler-p">
  <refnamediv>
   <refname>Z_OBJ_HANDLER_P</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/Z_OBJ_HANDLER_PP.xml b/internals/zendapi/macros/Z_OBJ_HANDLER_PP.xml
index d6580359ae..a30dc7f8f6 100644
--- a/internals/zendapi/macros/Z_OBJ_HANDLER_PP.xml
+++ b/internals/zendapi/macros/Z_OBJ_HANDLER_PP.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<refentry id="zend-macro.Z-OBJ-HANDLER-PP">
+<!-- $Revision: 1.5 $ -->
+<refentry id="zend-macro.z-obj-handler-pp">
  <refnamediv>
   <refname>Z_OBJ_HANDLER_PP</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/Z_OBJ_HANDLE_P.xml b/internals/zendapi/macros/Z_OBJ_HANDLE_P.xml
index a52733b686..66244df167 100644
--- a/internals/zendapi/macros/Z_OBJ_HANDLE_P.xml
+++ b/internals/zendapi/macros/Z_OBJ_HANDLE_P.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<refentry id="zend-macro.Z-OBJ-HANDLE-P">
+<!-- $Revision: 1.5 $ -->
+<refentry id="zend-macro.z-obj-handle-p">
  <refnamediv>
   <refname>Z_OBJ_HANDLE_P</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/Z_OBJ_HANDLE_PP.xml b/internals/zendapi/macros/Z_OBJ_HANDLE_PP.xml
index 2f32eb9346..09be1217ed 100644
--- a/internals/zendapi/macros/Z_OBJ_HANDLE_PP.xml
+++ b/internals/zendapi/macros/Z_OBJ_HANDLE_PP.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<refentry id="zend-macro.Z-OBJ-HANDLE-PP">
+<!-- $Revision: 1.5 $ -->
+<refentry id="zend-macro.z-obj-handle-pp">
  <refnamediv>
   <refname>Z_OBJ_HANDLE_PP</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/Z_OBJ_HT.xml b/internals/zendapi/macros/Z_OBJ_HT.xml
index 548952855f..697898927c 100644
--- a/internals/zendapi/macros/Z_OBJ_HT.xml
+++ b/internals/zendapi/macros/Z_OBJ_HT.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<refentry id="zend-macro.Z-OBJ-HT">
+<!-- $Revision: 1.5 $ -->
+<refentry id="zend-macro.z-obj-ht">
  <refnamediv>
   <refname>Z_OBJ_HT</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/Z_OBJ_HT_P.xml b/internals/zendapi/macros/Z_OBJ_HT_P.xml
index be9c1c5874..677e0bbb21 100644
--- a/internals/zendapi/macros/Z_OBJ_HT_P.xml
+++ b/internals/zendapi/macros/Z_OBJ_HT_P.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<refentry id="zend-macro.Z-OBJ-HT-P">
+<!-- $Revision: 1.5 $ -->
+<refentry id="zend-macro.z-obj-ht-p">
  <refnamediv>
   <refname>Z_OBJ_HT_P</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/Z_OBJ_HT_PP.xml b/internals/zendapi/macros/Z_OBJ_HT_PP.xml
index 8a39dbb8ba..f9dba95719 100644
--- a/internals/zendapi/macros/Z_OBJ_HT_PP.xml
+++ b/internals/zendapi/macros/Z_OBJ_HT_PP.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<refentry id="zend-macro.Z-OBJ-HT-PP">
+<!-- $Revision: 1.5 $ -->
+<refentry id="zend-macro.z-obj-ht-pp">
  <refnamediv>
   <refname>Z_OBJ_HT_PP</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/Z_RESVAL.xml b/internals/zendapi/macros/Z_RESVAL.xml
index ede1190835..6bf5d1ba6c 100644
--- a/internals/zendapi/macros/Z_RESVAL.xml
+++ b/internals/zendapi/macros/Z_RESVAL.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<refentry id="zend-macro.Z-RESVAL">
+<!-- $Revision: 1.5 $ -->
+<refentry id="zend-macro.z-resval">
  <refnamediv>
   <refname>Z_RESVAL</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/Z_RESVAL_P.xml b/internals/zendapi/macros/Z_RESVAL_P.xml
index d69bfa67ea..3df422a6b7 100644
--- a/internals/zendapi/macros/Z_RESVAL_P.xml
+++ b/internals/zendapi/macros/Z_RESVAL_P.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<refentry id="zend-macro.Z-RESVAL-P">
+<!-- $Revision: 1.5 $ -->
+<refentry id="zend-macro.z-resval-p">
  <refnamediv>
   <refname>Z_RESVAL_P</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/Z_RESVAL_PP.xml b/internals/zendapi/macros/Z_RESVAL_PP.xml
index c711a11d7c..05f932a129 100644
--- a/internals/zendapi/macros/Z_RESVAL_PP.xml
+++ b/internals/zendapi/macros/Z_RESVAL_PP.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<refentry id="zend-macro.Z-RESVAL-PP">
+<!-- $Revision: 1.5 $ -->
+<refentry id="zend-macro.z-resval-pp">
  <refnamediv>
   <refname>Z_RESVAL_PP</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/Z_STRLEN.xml b/internals/zendapi/macros/Z_STRLEN.xml
index 4a3bdad0a7..da96a11a6c 100644
--- a/internals/zendapi/macros/Z_STRLEN.xml
+++ b/internals/zendapi/macros/Z_STRLEN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
-<refentry id="zend-macro.Z-STRLEN">
+<!-- $Revision: 1.6 $ -->
+<refentry id="zend-macro.z-strlen">
  <refnamediv>
   <refname>Z_STRLEN</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/Z_STRLEN_P.xml b/internals/zendapi/macros/Z_STRLEN_P.xml
index 3e5dfa898f..951dee5df5 100644
--- a/internals/zendapi/macros/Z_STRLEN_P.xml
+++ b/internals/zendapi/macros/Z_STRLEN_P.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
-<refentry id="zend-macro.Z-STRLEN-P">
+<!-- $Revision: 1.6 $ -->
+<refentry id="zend-macro.z-strlen-p">
  <refnamediv>
   <refname>Z_STRLEN_P</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/Z_STRLEN_PP.xml b/internals/zendapi/macros/Z_STRLEN_PP.xml
index f4f7211c7a..97cf6c95d5 100644
--- a/internals/zendapi/macros/Z_STRLEN_PP.xml
+++ b/internals/zendapi/macros/Z_STRLEN_PP.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
-<refentry id="zend-macro.Z-STRLEN-PP">
+<!-- $Revision: 1.6 $ -->
+<refentry id="zend-macro.z-strlen-pp">
  <refnamediv>
   <refname>Z_STRLEN_PP</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/Z_STRVAL.xml b/internals/zendapi/macros/Z_STRVAL.xml
index 30700fa660..f660ab748b 100644
--- a/internals/zendapi/macros/Z_STRVAL.xml
+++ b/internals/zendapi/macros/Z_STRVAL.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
-<refentry id="zend-macro.Z-STRVAL">
+<!-- $Revision: 1.6 $ -->
+<refentry id="zend-macro.z-strval">
  <refnamediv>
   <refname>Z_STRVAL</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/Z_STRVAL_P.xml b/internals/zendapi/macros/Z_STRVAL_P.xml
index d74f004d91..8b3772a40f 100644
--- a/internals/zendapi/macros/Z_STRVAL_P.xml
+++ b/internals/zendapi/macros/Z_STRVAL_P.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
-<refentry id="zend-macro.Z-STRVAL-P">
+<!-- $Revision: 1.6 $ -->
+<refentry id="zend-macro.z-strval-p">
  <refnamediv>
   <refname>Z_STRVAL_P</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/Z_STRVAL_PP.xml b/internals/zendapi/macros/Z_STRVAL_PP.xml
index 228540718a..13e6b339bc 100644
--- a/internals/zendapi/macros/Z_STRVAL_PP.xml
+++ b/internals/zendapi/macros/Z_STRVAL_PP.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
-<refentry id="zend-macro.Z-STRVAL-PP">
+<!-- $Revision: 1.6 $ -->
+<refentry id="zend-macro.z-strval-pp">
  <refnamediv>
   <refname>Z_STRVAL_PP</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/Z_TYPE.xml b/internals/zendapi/macros/Z_TYPE.xml
index da703782dd..7a8289f20f 100644
--- a/internals/zendapi/macros/Z_TYPE.xml
+++ b/internals/zendapi/macros/Z_TYPE.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
-<refentry id="zend-macro.Z-TYPE">
+<!-- $Revision: 1.6 $ -->
+<refentry id="zend-macro.z-type">
  <refnamediv>
   <refname>Z_TYPE</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/Z_TYPE_P.xml b/internals/zendapi/macros/Z_TYPE_P.xml
index e8fe307618..70147b910f 100644
--- a/internals/zendapi/macros/Z_TYPE_P.xml
+++ b/internals/zendapi/macros/Z_TYPE_P.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
-<refentry id="zend-macro.Z-TYPE-P">
+<!-- $Revision: 1.6 $ -->
+<refentry id="zend-macro.z-type-p">
  <refnamediv>
   <refname>Z_TYPE_P</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/Z_TYPE_PP.xml b/internals/zendapi/macros/Z_TYPE_PP.xml
index 57ceaae182..030796642d 100644
--- a/internals/zendapi/macros/Z_TYPE_PP.xml
+++ b/internals/zendapi/macros/Z_TYPE_PP.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
-<refentry id="zend-macro.Z-TYPE-PP">
+<!-- $Revision: 1.6 $ -->
+<refentry id="zend-macro.z-type-pp">
  <refnamediv>
   <refname>Z_TYPE_PP</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/Z_UNILEN.xml b/internals/zendapi/macros/Z_UNILEN.xml
index 3635d0d02c..70548ce71d 100644
--- a/internals/zendapi/macros/Z_UNILEN.xml
+++ b/internals/zendapi/macros/Z_UNILEN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<refentry id="zend-macro.Z-UNILEN">
+<!-- $Revision: 1.5 $ -->
+<refentry id="zend-macro.z-unilen">
  <refnamediv>
   <refname>Z_UNILEN</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/Z_UNILEN_P.xml b/internals/zendapi/macros/Z_UNILEN_P.xml
index 1874208d8c..1ac87c2e5b 100644
--- a/internals/zendapi/macros/Z_UNILEN_P.xml
+++ b/internals/zendapi/macros/Z_UNILEN_P.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<refentry id="zend-macro.Z-UNILEN-P">
+<!-- $Revision: 1.5 $ -->
+<refentry id="zend-macro.z-unilen-p">
  <refnamediv>
   <refname>Z_UNILEN_P</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/Z_UNILEN_PP.xml b/internals/zendapi/macros/Z_UNILEN_PP.xml
index bc7203dd23..5524e5918e 100644
--- a/internals/zendapi/macros/Z_UNILEN_PP.xml
+++ b/internals/zendapi/macros/Z_UNILEN_PP.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<refentry id="zend-macro.Z-UNILEN-PP">
+<!-- $Revision: 1.5 $ -->
+<refentry id="zend-macro.z-unilen-pp">
  <refnamediv>
   <refname>Z_UNILEN_PP</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/Z_UNIVAL.xml b/internals/zendapi/macros/Z_UNIVAL.xml
index ede8fce41d..ea8613989d 100644
--- a/internals/zendapi/macros/Z_UNIVAL.xml
+++ b/internals/zendapi/macros/Z_UNIVAL.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<refentry id="zend-macro.Z-UNIVAL">
+<!-- $Revision: 1.5 $ -->
+<refentry id="zend-macro.z-unival">
  <refnamediv>
   <refname>Z_UNIVAL</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/Z_UNIVAL_P.xml b/internals/zendapi/macros/Z_UNIVAL_P.xml
index 91c50ac43a..cf6b369f1d 100644
--- a/internals/zendapi/macros/Z_UNIVAL_P.xml
+++ b/internals/zendapi/macros/Z_UNIVAL_P.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<refentry id="zend-macro.Z-UNIVAL-P">
+<!-- $Revision: 1.5 $ -->
+<refentry id="zend-macro.z-unival-p">
  <refnamediv>
   <refname>Z_UNIVAL_P</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/Z_UNIVAL_PP.xml b/internals/zendapi/macros/Z_UNIVAL_PP.xml
index 5d56cce0c2..ce3f899e6f 100644
--- a/internals/zendapi/macros/Z_UNIVAL_PP.xml
+++ b/internals/zendapi/macros/Z_UNIVAL_PP.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<refentry id="zend-macro.Z-UNIVAL-PP">
+<!-- $Revision: 1.5 $ -->
+<refentry id="zend-macro.z-unival-pp">
  <refnamediv>
   <refname>Z_UNIVAL_PP</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/Z_USTRCPLEN.xml b/internals/zendapi/macros/Z_USTRCPLEN.xml
index 343737fb26..3476f7adc9 100644
--- a/internals/zendapi/macros/Z_USTRCPLEN.xml
+++ b/internals/zendapi/macros/Z_USTRCPLEN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<refentry id="zend-macro.Z-USTRCPLEN">
+<!-- $Revision: 1.5 $ -->
+<refentry id="zend-macro.z-ustrcplen">
  <refnamediv>
   <refname>Z_USTRCPLEN</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/Z_USTRCPLEN_P.xml b/internals/zendapi/macros/Z_USTRCPLEN_P.xml
index 9fcdea9186..1a2212223b 100644
--- a/internals/zendapi/macros/Z_USTRCPLEN_P.xml
+++ b/internals/zendapi/macros/Z_USTRCPLEN_P.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<refentry id="zend-macro.Z-USTRCPLEN-P">
+<!-- $Revision: 1.5 $ -->
+<refentry id="zend-macro.z-ustrcplen-p">
  <refnamediv>
   <refname>Z_USTRCPLEN_P</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/Z_USTRCPLEN_PP.xml b/internals/zendapi/macros/Z_USTRCPLEN_PP.xml
index 0b1ae89fde..217a085d9a 100644
--- a/internals/zendapi/macros/Z_USTRCPLEN_PP.xml
+++ b/internals/zendapi/macros/Z_USTRCPLEN_PP.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<refentry id="zend-macro.Z-USTRCPLEN-PP">
+<!-- $Revision: 1.5 $ -->
+<refentry id="zend-macro.z-ustrcplen-pp">
  <refnamediv>
   <refname>Z_USTRCPLEN_PP</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/Z_USTRLEN.xml b/internals/zendapi/macros/Z_USTRLEN.xml
index 289079af0e..b715430bb2 100644
--- a/internals/zendapi/macros/Z_USTRLEN.xml
+++ b/internals/zendapi/macros/Z_USTRLEN.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<refentry id="zend-macro.Z-USTRLEN">
+<!-- $Revision: 1.5 $ -->
+<refentry id="zend-macro.z-ustrlen">
  <refnamediv>
   <refname>Z_USTRLEN</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/Z_USTRLEN_P.xml b/internals/zendapi/macros/Z_USTRLEN_P.xml
index e1e9dd41dd..0b8cc66372 100644
--- a/internals/zendapi/macros/Z_USTRLEN_P.xml
+++ b/internals/zendapi/macros/Z_USTRLEN_P.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<refentry id="zend-macro.Z-USTRLEN-P">
+<!-- $Revision: 1.5 $ -->
+<refentry id="zend-macro.z-ustrlen-p">
  <refnamediv>
   <refname>Z_USTRLEN_P</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/Z_USTRLEN_PP.xml b/internals/zendapi/macros/Z_USTRLEN_PP.xml
index cc60b4979f..dc8e0fc9d1 100644
--- a/internals/zendapi/macros/Z_USTRLEN_PP.xml
+++ b/internals/zendapi/macros/Z_USTRLEN_PP.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<refentry id="zend-macro.Z-USTRLEN-PP">
+<!-- $Revision: 1.5 $ -->
+<refentry id="zend-macro.z-ustrlen-pp">
  <refnamediv>
   <refname>Z_USTRLEN_PP</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/Z_USTRVAL.xml b/internals/zendapi/macros/Z_USTRVAL.xml
index 2cd5ccf227..b63568576c 100644
--- a/internals/zendapi/macros/Z_USTRVAL.xml
+++ b/internals/zendapi/macros/Z_USTRVAL.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<refentry id="zend-macro.Z-USTRVAL">
+<!-- $Revision: 1.5 $ -->
+<refentry id="zend-macro.z-ustrval">
  <refnamediv>
   <refname>Z_USTRVAL</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/Z_USTRVAL_P.xml b/internals/zendapi/macros/Z_USTRVAL_P.xml
index af81946efc..deb3e1d05b 100644
--- a/internals/zendapi/macros/Z_USTRVAL_P.xml
+++ b/internals/zendapi/macros/Z_USTRVAL_P.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<refentry id="zend-macro.Z-USTRVAL-P">
+<!-- $Revision: 1.5 $ -->
+<refentry id="zend-macro.z-ustrval-p">
  <refnamediv>
   <refname>Z_USTRVAL_P</refname>
   <refpurpose>...</refpurpose>
diff --git a/internals/zendapi/macros/Z_USTRVAL_PP.xml b/internals/zendapi/macros/Z_USTRVAL_PP.xml
index 69f7ea13c5..8e00c4ed51 100644
--- a/internals/zendapi/macros/Z_USTRVAL_PP.xml
+++ b/internals/zendapi/macros/Z_USTRVAL_PP.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<refentry id="zend-macro.Z-USTRVAL-PP">
+<!-- $Revision: 1.5 $ -->
+<refentry id="zend-macro.z-ustrval-pp">
  <refnamediv>
   <refname>Z_USTRVAL_PP</refname>
   <refpurpose>...</refpurpose>