3 files changed, 13 insertions, 13 deletions
diff --git a/helpcontent2/to-wiki/convall.py b/helpcontent2/to-wiki/convall.py
index bb0483fed5..cc02822e0d 100755
--- a/helpcontent2/to-wiki/convall.py
+++ b/helpcontent2/to-wiki/convall.py
@@ -20,7 +20,7 @@ for title in titles:
     try:
         outfile = "wiki/"+title[1].strip()
         infile  = title[0].strip()
-        command = "python wikiconv2.py "+infile+" > "+outfile
+        command = "python to-wiki/wikiconv2.py "+infile+" > "+outfile
     except:
         continue
 
diff --git a/helpcontent2/to-wiki/getalltitles.py b/helpcontent2/to-wiki/getalltitles.py
index cb0527e88b..50ca03dc7d 100755
--- a/helpcontent2/to-wiki/getalltitles.py
+++ b/helpcontent2/to-wiki/getalltitles.py
@@ -41,25 +41,25 @@ replace_text_list = [
         ]
 
 modules_list = [
-        "sbasic",
-        "scalc",
-        "schart",
-        "sdraw",
-        "shared",
-        "simpress",
-        "smath",
-        "swriter"
+        ["sbasic","Basic"],
+        ["scalc","Calc"],
+        ["schart","Chart"],
+        ["sdraw","Draw"],
+        ["shared","All"],
+        ["simpress","Impress"],
+        ["smath","Math"],
+        ["swriter","Writer"]
         ]
 
 def get_module(text):
     for i in modules_list:
-        if text.find(i) >=0:
-            return i
+        if text.find(i[0]) >=0:
+            return i[1]
     return ""
 
 def replace_text(text):
     for i in replace_text_list:
-        if text.find(i[0]) >= 0:
+        while text.find(i[0]) >= 0:
             text = text.replace(i[0],i[1])
     return text
 
diff --git a/helpcontent2/to-wiki/wikiconv2.py b/helpcontent2/to-wiki/wikiconv2.py
index 11dfb97cd2..4f884e617b 100755
--- a/helpcontent2/to-wiki/wikiconv2.py
+++ b/helpcontent2/to-wiki/wikiconv2.py
@@ -3,7 +3,7 @@
 import sys
 import xml.parsers.expat
 
-root="helpcontent2/source/"
+root="source/"
 
 titles = [[]]