diff --git a/xsl/annotation.xsl b/xsl/annotation.xsl
index 1b339c8..853f401 100644
--- a/xsl/annotation.xsl
+++ b/xsl/annotation.xsl
@@ -9,9 +9,16 @@
   <xsl:key name="headers" match="header" use="@name"/>
 
   <xsl:template match="function|overloaded-function" mode="generate.id">
+    <xsl:variable name="name" select="normalize-space(@name)"/>
+    <xsl:variable name="translated-name"
+                  select="translate($name, 
+                                    '~!%^&amp;*()[].,&lt;&gt;|/ +-=', 
+                                    'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX')"/>
+                      
     <xsl:choose>
-      <xsl:when test="count(key('functions', @name))=1">
-        <xsl:value-of select="@name"/>
+      <xsl:when test="count(key('functions', $name))=1
+                      and ($translated-name=$name)">
+        <xsl:value-of select="$name"/>
       </xsl:when>
       <xsl:otherwise>
         <xsl:value-of select="generate-id(.)"/>
diff --git a/xsl/doxygen/doxygen2boostbook.xsl b/xsl/doxygen/doxygen2boostbook.xsl
index f0d6b1a..e694f07 100644
--- a/xsl/doxygen/doxygen2boostbook.xsl
+++ b/xsl/doxygen/doxygen2boostbook.xsl
@@ -439,7 +439,7 @@ Cannot handle compounddef with kind=<xsl:value-of select="@kind"/>
       <xsl:when test="string(type)='class' or string(type)='typename'">
         <template-type-parameter>
           <xsl:attribute name="name">
-            <xsl:value-of select="string(declname)"/>
+            <xsl:value-of select="normalize-space(string(declname))"/>
           </xsl:attribute>
           <xsl:if test="defval">
             <default>
@@ -452,7 +452,7 @@ Cannot handle compounddef with kind=<xsl:value-of select="@kind"/>
       <xsl:otherwise>
         <template-nontype-parameter>
           <xsl:attribute name="name">
-            <xsl:value-of select="string(declname)"/>
+            <xsl:value-of select="normalize-space(string(declname))"/>
           </xsl:attribute>
           <type>
             <xsl:apply-templates select="type"/>
@@ -705,7 +705,7 @@ Cannot handle memberdef element with kind=<xsl:value-of select="@kind"/>
     <parameter>
       <!-- Parameter name -->
       <xsl:attribute name="name">
-        <xsl:value-of select="declname/text()"/>
+        <xsl:value-of select="normalize-space(declname/text())"/>
       </xsl:attribute>
 
       <!-- Parameter type -->
@@ -729,7 +729,7 @@ Cannot handle memberdef element with kind=<xsl:value-of select="@kind"/>
 
       <!-- Parameter description -->
       <xsl:variable name="name">
-        <xsl:value-of select="declname/text()"/>
+        <xsl:value-of select="normalize-space(declname/text())"/>
       </xsl:variable>
 
       <xsl:apply-templates select="../detaileddescription/para/parameterlist[attribute::kind='param']/parameterdescription"