diff --git a/reference/swish/classes.xml b/reference/swish/classes.xml
index d7bd88e73a..9e7a3350f4 100644
--- a/reference/swish/classes.xml
+++ b/reference/swish/classes.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <section id="swish.classes">
  &reftitle.classes;
   <section>
@@ -44,11 +44,11 @@
        </para>
       </listitem>
       <listitem>
-       <para><xref linkend="function.swish-getMetaList" /> - returns an array
+       <para><xref linkend="function.swish-getmetalist" /> - returns an array
        of meta entries for the given index file.</para>
       </listitem>
       <listitem>
-       <para><xref linkend="function.swish-getPropertyList" /> - returns an array
+       <para><xref linkend="function.swish-getpropertylist" /> - returns an array
        of properties for the given index file.</para>
       </listitem>
      </itemizedlist>
@@ -63,33 +63,33 @@
      <itemizedlist>
       <listitem>
        <para>
-        <xref linkend="function.swishsearch-setStructure" /> - sets the
+        <xref linkend="function.swishsearch-setstructure" /> - sets the
         structure flag in the search object. This flag is used to limit search
         to certain parts of HTML documents.
        </para>
       </listitem>
       <listitem>
        <para>
-        <xref linkend="function.swishsearch-setPhraseDelimiter" /> - sets
+        <xref linkend="function.swishsearch-setphrasedelimiter" /> - sets
         the phrase delimiter character. The default delimiter is double-quotes.
        </para>
       </listitem>
       <listitem>
        <para>
-        <xref linkend="function.swishsearch-setSort" /> - sets the sort
+        <xref linkend="function.swishsearch-setsort" /> - sets the sort
         order of the results.
        </para>
       </listitem>
       <listitem>
        <para>
-        <xref linkend="function.swishsearch-setLimit" /> - sets the limits
+        <xref linkend="function.swishsearch-setlimit" /> - sets the limits
         for the search.
         Throws <classname>SwishException</classname> on error.
        </para>
       </listitem>
       <listitem>
        <para>
-        <xref linkend="function.swishsearch-resetLimit" /> - resets the
+        <xref linkend="function.swishsearch-resetlimit" /> - resets the
         limits.
        </para>
       </listitem>
@@ -128,14 +128,14 @@
      <itemizedlist>
       <listitem>
        <para>
-        <xref linkend="function.swishresults-nextResult" /> - returns
+        <xref linkend="function.swishresults-nextresult" /> - returns
         next <classname>SwishResult</classname> object or &false; if no
         more results are available.
        </para>
       </listitem>
       <listitem>
        <para>
-        <xref linkend="function.swishresults-seekResult" /> - sets the
+        <xref linkend="function.swishresults-seekresult" /> - sets the
         current seek position in the <classname>SwishResults</classname>
         object.
         Throws <classname>SwishException</classname> on error.
@@ -143,13 +143,13 @@
       </listitem>
       <listitem>
        <para>
-        <xref linkend="function.swishresults-getParsedWords" /> -
+        <xref linkend="function.swishresults-getparsedwords" /> -
         returns an array of words in the query with stopwords removed.
        </para>
       </listitem>
       <listitem>
        <para>
-        <xref linkend="function.swishresults-getRemovedStopwords" /> -
+        <xref linkend="function.swishresults-getremovedstopwords" /> -
         returns an array of removed stopwords.
        </para>
       </listitem>
@@ -173,7 +173,7 @@
      <itemizedlist>
       <listitem>
        <para>
-        <xref linkend="function.swishresult-getMetaList" /> - returns
+        <xref linkend="function.swishresult-getmetalist" /> - returns
         an array of meta entries for the index used in this result.
        </para>
       </listitem>
diff --git a/reference/swish/functions/swish-getMetaList.xml b/reference/swish/functions/swish-getmetalist.xml
similarity index 97%
rename from reference/swish/functions/swish-getMetaList.xml
rename to reference/swish/functions/swish-getmetalist.xml
index 158f6cd0ac..661962b56c 100644
--- a/reference/swish/functions/swish-getMetaList.xml
+++ b/reference/swish/functions/swish-getmetalist.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!-- $Revision: 1.1 $ -->
-<refentry id="function.swish-getMetaList">
+<refentry id="function.swish-getmetalist">
  <refnamediv>
   <refname>Swish-&gt;getMetaList</refname>
   <refpurpose>Get the list of meta entries for the index</refpurpose>
diff --git a/reference/swish/functions/swish-getPropertyList.xml b/reference/swish/functions/swish-getpropertylist.xml
similarity index 97%
rename from reference/swish/functions/swish-getPropertyList.xml
rename to reference/swish/functions/swish-getpropertylist.xml
index aa1518f9d3..27bfa8f934 100644
--- a/reference/swish/functions/swish-getPropertyList.xml
+++ b/reference/swish/functions/swish-getpropertylist.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!-- $Revision: 1.1 $ -->
-<refentry id="function.swish-getPropertyList">
+<refentry id="function.swish-getpropertylist">
  <refnamediv>
   <refname>Swish-&gt;getPropertyList</refname>
   <refpurpose>Get the list of properties for the index</refpurpose>
diff --git a/reference/swish/functions/swishresult-getMetaList.xml b/reference/swish/functions/swishresult-getmetalist.xml
similarity index 88%
rename from reference/swish/functions/swishresult-getMetaList.xml
rename to reference/swish/functions/swishresult-getmetalist.xml
index f050bb2424..2db699fec9 100644
--- a/reference/swish/functions/swishresult-getMetaList.xml
+++ b/reference/swish/functions/swishresult-getmetalist.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!-- $Revision: 1.1 $ -->
-<refentry id="function.swishresult-getMetaList">
+<refentry id="function.swishresult-getmetalist">
  <refnamediv>
   <refname>SwishResult-&gt;getMetaList</refname>
   <refpurpose>Get a list of meta entries</refpurpose>
@@ -17,7 +17,7 @@
   &reftitle.returnvalues;
   <para>
    Returns the same array as <link
-    linkend="function.swish-getMetaList"><function>Swish-&gt;getMetaList</function></link>,
+    linkend="function.swish-getmetalist"><function>swish-&gt;getmetalist</function></link>,
    but uses the index file from the result handle.
   </para>
  </refsect1>
diff --git a/reference/swish/functions/swishresults-getParsedWords.xml b/reference/swish/functions/swishresults-getparsedwords.xml
similarity index 97%
rename from reference/swish/functions/swishresults-getParsedWords.xml
rename to reference/swish/functions/swishresults-getparsedwords.xml
index a4d0921ab4..b11f899d41 100644
--- a/reference/swish/functions/swishresults-getParsedWords.xml
+++ b/reference/swish/functions/swishresults-getparsedwords.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!-- $Revision: 1.1 $ -->
-<refentry id="function.swishresults-getParsedWords">
+<refentry id="function.swishresults-getparsedwords">
  <refnamediv>
   <refname>SwishResults-&gt;getParsedWords</refname>
   <refpurpose>Get an array of parsed words</refpurpose>
diff --git a/reference/swish/functions/swishresults-getRemovedStopwords.xml b/reference/swish/functions/swishresults-getremovedstopwords.xml
similarity index 96%
rename from reference/swish/functions/swishresults-getRemovedStopwords.xml
rename to reference/swish/functions/swishresults-getremovedstopwords.xml
index 839ba77258..b169cab186 100644
--- a/reference/swish/functions/swishresults-getRemovedStopwords.xml
+++ b/reference/swish/functions/swishresults-getremovedstopwords.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!-- $Revision: 1.1 $ -->
-<refentry id="function.swishresults-getRemovedStopwords">
+<refentry id="function.swishresults-getremovedstopwords">
  <refnamediv>
   <refname>SwishResults-&gt;getRemovedStopwords</refname>
   <refpurpose>Get an array of stopwords removed from the query</refpurpose>
diff --git a/reference/swish/functions/swishresults-nextResult.xml b/reference/swish/functions/swishresults-nextresult.xml
similarity index 97%
rename from reference/swish/functions/swishresults-nextResult.xml
rename to reference/swish/functions/swishresults-nextresult.xml
index 451fb96d15..fef90db54a 100644
--- a/reference/swish/functions/swishresults-nextResult.xml
+++ b/reference/swish/functions/swishresults-nextresult.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!-- $Revision: 1.1 $ -->
-<refentry id="function.swishresults-nextResult">
+<refentry id="function.swishresults-nextresult">
  <refnamediv>
   <refname>SwishResults-&gt;nextResult</refname>
   <refpurpose>Get the next search result</refpurpose>
diff --git a/reference/swish/functions/swishresults-seekResult.xml b/reference/swish/functions/swishresults-seekresult.xml
similarity index 97%
rename from reference/swish/functions/swishresults-seekResult.xml
rename to reference/swish/functions/swishresults-seekresult.xml
index a554cb51a6..f3ee642966 100644
--- a/reference/swish/functions/swishresults-seekResult.xml
+++ b/reference/swish/functions/swishresults-seekresult.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!-- $Revision: 1.1 $ -->
-<refentry id="function.swishresults-seekResult">
+<refentry id="function.swishresults-seekresult">
  <refnamediv>
   <refname>SwishResults-&gt;seekResult</refname>
   <refpurpose>Set current seek pointer to the given position</refpurpose>
diff --git a/reference/swish/functions/swishsearch-resetLimit.xml b/reference/swish/functions/swishsearch-resetlimit.xml
similarity index 95%
rename from reference/swish/functions/swishsearch-resetLimit.xml
rename to reference/swish/functions/swishsearch-resetlimit.xml
index 091d181c44..c0076a93b1 100644
--- a/reference/swish/functions/swishsearch-resetLimit.xml
+++ b/reference/swish/functions/swishsearch-resetlimit.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!-- $Revision: 1.1 $ -->
-<refentry id="function.swishsearch-resetLimit">
+<refentry id="function.swishsearch-resetlimit">
  <refnamediv>
   <refname>SwishSearch-&gt;resetLimit</refname>
   <refpurpose>Reset the search limits</refpurpose>
@@ -14,7 +14,7 @@
   &warn.experimental.func;
   <para>
    Reset the search limits previous set by
-   <xref linkend="function.swishsearch-setLimit" />.
+   <xref linkend="function.swishsearch-setlimit" />.
   </para>
  </refsect1>
  <refsect1 role="examples">
diff --git a/reference/swish/functions/swishsearch-setLimit.xml b/reference/swish/functions/swishsearch-setlimit.xml
similarity index 98%
rename from reference/swish/functions/swishsearch-setLimit.xml
rename to reference/swish/functions/swishsearch-setlimit.xml
index 91285159b8..816afc393f 100644
--- a/reference/swish/functions/swishsearch-setLimit.xml
+++ b/reference/swish/functions/swishsearch-setlimit.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!-- $Revision: 1.1 $ -->
-<refentry id="function.swishsearch-setLimit">
+<refentry id="function.swishsearch-setlimit">
  <refnamediv>
   <refname>SwishSearch-&gt;setLimit</refname>
   <refpurpose>Set the search limits</refpurpose>
diff --git a/reference/swish/functions/swishsearch-setPhraseDelimiter.xml b/reference/swish/functions/swishsearch-setphrasedelimiter.xml
similarity index 97%
rename from reference/swish/functions/swishsearch-setPhraseDelimiter.xml
rename to reference/swish/functions/swishsearch-setphrasedelimiter.xml
index d69e9e0416..7c4c913f56 100644
--- a/reference/swish/functions/swishsearch-setPhraseDelimiter.xml
+++ b/reference/swish/functions/swishsearch-setphrasedelimiter.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!-- $Revision: 1.1 $ -->
-<refentry id="function.swishsearch-setPhraseDelimiter">
+<refentry id="function.swishsearch-setphrasedelimiter">
  <refnamediv>
   <refname>SwishSearch-&gt;setPhraseDelimiter</refname>
   <refpurpose>Set the phrase delimiter</refpurpose>
diff --git a/reference/swish/functions/swishsearch-setSort.xml b/reference/swish/functions/swishsearch-setsort.xml
similarity index 98%
rename from reference/swish/functions/swishsearch-setSort.xml
rename to reference/swish/functions/swishsearch-setsort.xml
index 27406eb3ba..12fb7997d8 100644
--- a/reference/swish/functions/swishsearch-setSort.xml
+++ b/reference/swish/functions/swishsearch-setsort.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!-- $Revision: 1.1 $ -->
-<refentry id="function.swishsearch-setSort">
+<refentry id="function.swishsearch-setsort">
  <refnamediv>
   <refname>SwishSearch-&gt;setSort</refname>
   <refpurpose>Set the sort order</refpurpose>
diff --git a/reference/swish/functions/swishsearch-setStructure.xml b/reference/swish/functions/swishsearch-setstructure.xml
similarity index 98%
rename from reference/swish/functions/swishsearch-setStructure.xml
rename to reference/swish/functions/swishsearch-setstructure.xml
index bb6f0f82bd..2cd173a871 100644
--- a/reference/swish/functions/swishsearch-setStructure.xml
+++ b/reference/swish/functions/swishsearch-setstructure.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!-- $Revision: 1.1 $ -->
-<refentry id="function.swishsearch-setStructure">
+<refentry id="function.swishsearch-setstructure">
  <refnamediv>
   <refname>SwishSearch-&gt;setStructure</refname>
   <refpurpose>Set the structure flag in the search object</refpurpose>