@@ -29,11 +29,11 @@
 
 def storeAction (sActionId, aAction):
     "store <aAction> in <dACTIONS> avoiding duplicates"
     nVar = 0
     while True:
-        sActionName = sActionId + str(nVar)
+        sActionName = sActionId + "_" + str(nVar)
         if sActionName not in dACTIONS:
             dACTIONS[sActionName] = aAction
             return sActionName
         elif aAction == dACTIONS[sActionName]:
             return sActionName
@@ -64,10 +64,11 @@
     sCode = re.sub(r"\bspell *[(]", '_oSpellChecker.isValid(', sCode)
     sCode = re.sub(r"\bbefore\(\s*", 'look(sSentence[:lToken[1+nTokenOffset]["nStart"]], ', sCode)          # before(sCode)
     sCode = re.sub(r"\bafter\(\s*", 'look(sSentence[lToken[nLastToken]["nEnd"]:], ', sCode)                 # after(sCode)
     sCode = re.sub(r"\bbefore0\(\s*", 'look(sSentence0[:lToken[1+nTokenOffset]["nStart"]], ', sCode)        # before0(sCode)
     sCode = re.sub(r"\bafter0\(\s*", 'look(sSentence[lToken[nLastToken]["nEnd"]:], ', sCode)                # after0(sCode)
+    sCode = re.sub(r"analyseWord[(]", 'analyse(', sCode)
     sCode = re.sub(r"[\\](\d+)", 'lToken[nTokenOffset+\\1]["sValue"]', sCode)
     sCode = re.sub(r"[\\]-(\d+)", 'lToken[nLastToken-\\1+1]["sValue"]', sCode)
     return sCode