diff --git a/reference/parle/parle.lexer.xml b/reference/parle/parle.lexer.xml
index 3ef1962ca9..1362ed6ddd 100644
--- a/reference/parle/parle.lexer.xml
+++ b/reference/parle/parle.lexer.xml
@@ -35,31 +35,31 @@
     <fieldsynopsis>
      <modifier>const</modifier>
      <type>integer</type>
-     <varname linkend="parle-lexer.constants.flag-regex-icase">Parle\Lexer::FLAG_REGEX_ICASE</varname>
+     <varname linkend="parle-lexer.constants.flag-regex-icase">Parle\Lexer::ICASE</varname>
      <initializer>1</initializer>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>const</modifier>
      <type>integer</type>
-     <varname linkend="parle-lexer.constants.flag-regex-dot-not-lf">Parle\Lexer::FLAG_REGEX_DOT_NOT_LF</varname>
+     <varname linkend="parle-lexer.constants.flag-regex-dot-not-lf">Parle\Lexer::DOT_NOT_LF</varname>
      <initializer>2</initializer>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>const</modifier>
      <type>integer</type>
-     <varname linkend="parle-lexer.constants.flag-regex-dot-not-cr-lf">Parle\Lexer::FLAG_REGEX_DOT_NOT_CR_LF</varname>
+     <varname linkend="parle-lexer.constants.flag-regex-dot-not-cr-lf">Parle\Lexer::DOT_NOT_CRLF</varname>
      <initializer>4</initializer>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>const</modifier>
      <type>integer</type>
-     <varname linkend="parle-lexer.constants.flag-regex-skip-ws">Parle\Lexer::FLAG_REGEX_SKIP_WS</varname>
+     <varname linkend="parle-lexer.constants.flag-regex-skip-ws">Parle\Lexer::SKIP_WS</varname>
      <initializer>8</initializer>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>const</modifier>
      <type>integer</type>
-     <varname linkend="parle-lexer.constants.flag-regex-match-zero-len">Parle\Lexer::FLAG_REGEX_MATCH_ZERO_LEN</varname>
+     <varname linkend="parle-lexer.constants.flag-regex-match-zero-len">Parle\Lexer::MATCH_ZERO_LEN</varname>
      <initializer>16</initializer>
     </fieldsynopsis>
     
@@ -96,35 +96,35 @@
    <variablelist>
 
     <varlistentry xml:id="parle-lexer.constants.flag-regex-icase">
-     <term><constant>Parle\Lexer::FLAG_REGEX_ICASE</constant></term>
+     <term><constant>Parle\Lexer::ICASE</constant></term>
      <listitem>
       <para></para>
      </listitem>
     </varlistentry>
 
     <varlistentry xml:id="parle-lexer.constants.flag-regex-dot-not-lf">
-     <term><constant>Parle\Lexer::FLAG_REGEX_DOT_NOT_LF</constant></term>
+     <term><constant>Parle\Lexer::DOT_NOT_LF</constant></term>
      <listitem>
       <para></para>
      </listitem>
     </varlistentry>
 
     <varlistentry xml:id="parle-lexer.constants.flag-regex-dot-not-cr-lf">
-     <term><constant>Parle\Lexer::FLAG_REGEX_DOT_NOT_CR_LF</constant></term>
+     <term><constant>Parle\Lexer::DOT_NOT_CRLF</constant></term>
      <listitem>
       <para></para>
      </listitem>
     </varlistentry>
 
     <varlistentry xml:id="parle-lexer.constants.flag-regex-skip-ws">
-     <term><constant>Parle\Lexer::FLAG_REGEX_SKIP_WS</constant></term>
+     <term><constant>Parle\Lexer::SKIP_WS</constant></term>
      <listitem>
       <para></para>
      </listitem>
     </varlistentry>
 
     <varlistentry xml:id="parle-lexer.constants.flag-regex-match-zero-len">
-     <term><constant>Parle\Lexer::FLAG_REGEX_MATCH_ZERO_LEN</constant></term>
+     <term><constant>Parle\Lexer::MATCH_ZERO_LEN</constant></term>
      <listitem>
       <para></para>
      </listitem>
diff --git a/reference/parle/parle.rlexer.xml b/reference/parle/parle.rlexer.xml
index 2b3eec1116..866f1b8e87 100644
--- a/reference/parle/parle.rlexer.xml
+++ b/reference/parle/parle.rlexer.xml
@@ -40,31 +40,31 @@
     <fieldsynopsis>
      <modifier>const</modifier>
      <type>integer</type>
-     <varname linkend="parle-rlexer.constants.flag-regex-icase">Parle\RLexer::FLAG_REGEX_ICASE</varname>
+     <varname linkend="parle-rlexer.constants.flag-regex-icase">Parle\RLexer::ICASE</varname>
      <initializer>1</initializer>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>const</modifier>
      <type>integer</type>
-     <varname linkend="parle-rlexer.constants.flag-regex-dot-not-lf">Parle\RLexer::FLAG_REGEX_DOT_NOT_LF</varname>
+     <varname linkend="parle-rlexer.constants.flag-regex-dot-not-lf">Parle\RLexer::DOT_NOT_LF</varname>
      <initializer>2</initializer>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>const</modifier>
      <type>integer</type>
-     <varname linkend="parle-rlexer.constants.flag-regex-dot-not-cr-lf">Parle\RLexer::FLAG_REGEX_DOT_NOT_CR_LF</varname>
+     <varname linkend="parle-rlexer.constants.flag-regex-dot-not-cr-lf">Parle\RLexer::DOT_NOT_CRLF</varname>
      <initializer>4</initializer>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>const</modifier>
      <type>integer</type>
-     <varname linkend="parle-rlexer.constants.flag-regex-skip-ws">Parle\RLexer::FLAG_REGEX_SKIP_WS</varname>
+     <varname linkend="parle-rlexer.constants.flag-regex-skip-ws">Parle\RLexer::SKIP_WS</varname>
      <initializer>8</initializer>
     </fieldsynopsis>
     <fieldsynopsis>
      <modifier>const</modifier>
      <type>integer</type>
-     <varname linkend="parle-rlexer.constants.flag-regex-match-zero-len">Parle\RLexer::FLAG_REGEX_MATCH_ZERO_LEN</varname>
+     <varname linkend="parle-rlexer.constants.flag-regex-match-zero-len">Parle\RLexer::MATCH_ZERO_LEN</varname>
      <initializer>16</initializer>
     </fieldsynopsis>
     
@@ -105,35 +105,35 @@
    <variablelist>
 
     <varlistentry xml:id="parle-rlexer.constants.flag-regex-icase">
-     <term><constant>Parle\RLexer::FLAG_REGEX_ICASE</constant></term>
+     <term><constant>Parle\RLexer::ICASE</constant></term>
      <listitem>
       <para></para>
      </listitem>
     </varlistentry>
 
     <varlistentry xml:id="parle-rlexer.constants.flag-regex-dot-not-lf">
-     <term><constant>Parle\RLexer::FLAG_REGEX_DOT_NOT_LF</constant></term>
+     <term><constant>Parle\RLexer::DOT_NOT_LF</constant></term>
      <listitem>
       <para></para>
      </listitem>
     </varlistentry>
 
     <varlistentry xml:id="parle-rlexer.constants.flag-regex-dot-not-cr-lf">
-     <term><constant>Parle\RLexer::FLAG_REGEX_DOT_NOT_CR_LF</constant></term>
+     <term><constant>Parle\RLexer::DOT_NOT_CRLF</constant></term>
      <listitem>
       <para></para>
      </listitem>
     </varlistentry>
 
     <varlistentry xml:id="parle-rlexer.constants.flag-regex-skip-ws">
-     <term><constant>Parle\RLexer::FLAG_REGEX_SKIP_WS</constant></term>
+     <term><constant>Parle\RLexer::SKIP_WS</constant></term>
      <listitem>
       <para></para>
      </listitem>
     </varlistentry>
 
     <varlistentry xml:id="parle-rlexer.constants.flag-regex-match-zero-len">
-     <term><constant>Parle\RLexer::FLAG_REGEX_MATCH_ZERO_LEN</constant></term>
+     <term><constant>Parle\RLexer::MATCH_ZERO_LEN</constant></term>
      <listitem>
       <para></para>
      </listitem>
diff --git a/reference/parle/parle/lexer/insertmacro.xml b/reference/parle/parle/lexer/insertmacro.xml
index b19c66c001..979dd723d2 100644
--- a/reference/parle/parle/lexer/insertmacro.xml
+++ b/reference/parle/parle/lexer/insertmacro.xml
@@ -14,12 +14,6 @@
    <methodparam><type>string</type><parameter>name</parameter></methodparam>
    <methodparam><type>string</type><parameter>regex</parameter></methodparam>
   </methodsynopsis>
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Parle\Lexer::insertMacro</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam><type>string</type><parameter>regexStart</parameter></methodparam>
-   <methodparam><type>string</type><parameter>regexEnd</parameter></methodparam>
-  </methodsynopsis>
   <para>
    Insert a regex macro, that can be later used as a shortcut and included in other regular expressions.
   </para>
@@ -44,22 +38,6 @@
      </para>
     </listitem>
    </varlistentry>
-   <varlistentry>
-    <term><parameter>regexStart</parameter></term>
-    <listitem>
-     <para>
-      Regular expression start.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>regexEnd</parameter></term>
-    <listitem>
-     <para>
-      Regular expression end.
-     </para>
-    </listitem>
-   </varlistentry>
   </variablelist>
  </refsect1>