diff --git a/AllLangHelp_sdraw.mk b/AllLangHelp_sdraw.mk
index 410fc574aa..0b49ed98bb 100644
--- a/AllLangHelp_sdraw.mk
+++ b/AllLangHelp_sdraw.mk
@@ -38,11 +38,11 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sdraw,\
helpcontent2/source/text/sdraw/main0000 \
helpcontent2/source/text/sdraw/main0100 \
helpcontent2/source/text/sdraw/main0101 \
- helpcontent2/source/text/sdraw/main0102 \
+ helpcontent2/source/text/sdraw/main_edit \
helpcontent2/source/text/sdraw/main0103 \
helpcontent2/source/text/sdraw/main0104 \
- helpcontent2/source/text/sdraw/main0105 \
- helpcontent2/source/text/sdraw/main0106 \
+ helpcontent2/source/text/sdraw/main_format \
+ helpcontent2/source/text/sdraw/main_tools \
helpcontent2/source/text/sdraw/main0200 \
helpcontent2/source/text/sdraw/main0202 \
helpcontent2/source/text/sdraw/main0210 \
diff --git a/AllLangHelp_simpress.mk b/AllLangHelp_simpress.mk
index 5aa53b9d66..35eed8e684 100644
--- a/AllLangHelp_simpress.mk
+++ b/AllLangHelp_simpress.mk
@@ -29,7 +29,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,simpress,\
helpcontent2/source/text/simpress/00/00000413 \
helpcontent2/source/text/simpress/00/slide_menu \
helpcontent2/source/text/simpress/01/01170000 \
- helpcontent2/source/text/simpress/01/01180000 \
+ helpcontent2/source/text/simpress/01/slide_properties \
helpcontent2/source/text/simpress/01/01180001 \
helpcontent2/source/text/simpress/01/01180002 \
helpcontent2/source/text/simpress/01/02110000 \
@@ -202,15 +202,15 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,simpress,\
helpcontent2/source/text/simpress/main0000 \
helpcontent2/source/text/simpress/main0100 \
helpcontent2/source/text/simpress/main0101 \
- helpcontent2/source/text/simpress/main0102 \
+ helpcontent2/source/text/simpress/main_edit \
helpcontent2/source/text/simpress/main0103 \
helpcontent2/source/text/simpress/main0104 \
- helpcontent2/source/text/simpress/main0105 \
- helpcontent2/source/text/simpress/main0106 \
+ helpcontent2/source/text/simpress/main_format \
+ helpcontent2/source/text/simpress/main_tools \
helpcontent2/source/text/simpress/main0107 \
helpcontent2/source/text/simpress/main0113 \
helpcontent2/source/text/simpress/main0114 \
- helpcontent2/source/text/simpress/main0117 \
+ helpcontent2/source/text/simpress/main_slide \
helpcontent2/source/text/simpress/main0200 \
helpcontent2/source/text/simpress/main0202 \
helpcontent2/source/text/simpress/main0203 \
diff --git a/source/text/sdraw/main0100.xhp b/source/text/sdraw/main0100.xhp
index 09c2f1d46d..f791895a6c 100644
--- a/source/text/sdraw/main0100.xhp
+++ b/source/text/sdraw/main0100.xhp
@@ -39,11 +39,11 @@
-
+
-
-
+
+
diff --git a/source/text/sdraw/main0102.xhp b/source/text/sdraw/main_edit.xhp
similarity index 95%
rename from source/text/sdraw/main0102.xhp
rename to source/text/sdraw/main_edit.xhp
index bd3259ad87..2c40a115b6 100644
--- a/source/text/sdraw/main0102.xhp
+++ b/source/text/sdraw/main_edit.xhp
@@ -21,14 +21,14 @@
-
+
Edit
-/text/sdraw/main0102.xhp
+/text/sdraw/main_edit.xhp
-Edit
+Edit
The commands in this menu are used to edit Draw documents (for example, copying and pasting).
diff --git a/source/text/sdraw/main0105.xhp b/source/text/sdraw/main_format.xhp
similarity index 89%
rename from source/text/sdraw/main0105.xhp
rename to source/text/sdraw/main_format.xhp
index 6c36781b54..95c60f130e 100644
--- a/source/text/sdraw/main0105.xhp
+++ b/source/text/sdraw/main_format.xhp
@@ -18,12 +18,12 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-
+
-
+
Format
-/text/sdraw/main0105.xhp
+/text/sdraw/main_format.xhp
Sun Microsystems, Inc.
@@ -31,7 +31,7 @@
@@ -41,8 +41,8 @@
Bullets and Numbering
-Page
-
+Page
+
Position and Size
diff --git a/source/text/sdraw/main0106.xhp b/source/text/sdraw/main_tools.xhp
similarity index 92%
rename from source/text/sdraw/main0106.xhp
rename to source/text/sdraw/main_tools.xhp
index 2773aa90b6..0c98b8b90d 100644
--- a/source/text/sdraw/main0106.xhp
+++ b/source/text/sdraw/main_tools.xhp
@@ -21,14 +21,14 @@
-
+
Tools
-/text/sdraw/main0106.xhp
+/text/sdraw/main_tools.xhp
diff --git a/source/text/shared/00/edit_menu.xhp b/source/text/shared/00/edit_menu.xhp
index ca75fec67c..fa8a562018 100644
--- a/source/text/shared/00/edit_menu.xhp
+++ b/source/text/shared/00/edit_menu.xhp
@@ -21,7 +21,7 @@
-
+
diff --git a/source/text/simpress/01/01180000.xhp b/source/text/simpress/01/slide_properties.xhp
similarity index 93%
rename from source/text/simpress/01/01180000.xhp
rename to source/text/simpress/01/slide_properties.xhp
index d310b953c6..095e3b6905 100644
--- a/source/text/simpress/01/01180000.xhp
+++ b/source/text/simpress/01/slide_properties.xhp
@@ -18,9 +18,9 @@
-->
-
+
Page
- /text/simpress/01/01180000.xhp
+ /text/simpress/01/slide_properties.xhp
Sun Microsystems, Inc.
diff --git a/source/text/simpress/main0100.xhp b/source/text/simpress/main0100.xhp
index 4ed40c5e8d..d97b98e6f2 100644
--- a/source/text/simpress/main0100.xhp
+++ b/source/text/simpress/main0100.xhp
@@ -35,13 +35,13 @@
-
+
-
-
+
+
-
+
diff --git a/source/text/simpress/main0102.xhp b/source/text/simpress/main_edit.xhp
similarity index 93%
rename from source/text/simpress/main0102.xhp
rename to source/text/simpress/main_edit.xhp
index a0aefd6db1..5ebbd86432 100644
--- a/source/text/simpress/main0102.xhp
+++ b/source/text/simpress/main_edit.xhp
@@ -19,9 +19,9 @@
-->
-
+
Edit
- /text/simpress/main0102.xhp
+ /text/simpress/main_edit.xhp
@@ -31,7 +31,7 @@
-Edit
+Edit
This menu contains commands for editing the contents of the current document.
diff --git a/source/text/simpress/main0105.xhp b/source/text/simpress/main_format.xhp
similarity index 93%
rename from source/text/simpress/main0105.xhp
rename to source/text/simpress/main_format.xhp
index a90824393d..816c677a02 100644
--- a/source/text/simpress/main0105.xhp
+++ b/source/text/simpress/main_format.xhp
@@ -18,16 +18,16 @@
-->
-
+
Format
- /text/simpress/main0105.xhp
+ /text/simpress/main_format.xhp
diff --git a/source/text/simpress/main0117.xhp b/source/text/simpress/main_slide.xhp
similarity index 87%
rename from source/text/simpress/main0117.xhp
rename to source/text/simpress/main_slide.xhp
index 72dac41897..86669a1ece 100644
--- a/source/text/simpress/main0117.xhp
+++ b/source/text/simpress/main_slide.xhp
@@ -19,9 +19,9 @@
-->
-
+
Slide
- /text/simpress/main0117.xhp
+ /text/simpress/main_slide.xhp
@@ -31,11 +31,11 @@
-Slide
+Slide
This menu provides slide management and navigation commands.
New Page/Slide
-
\ No newline at end of file
+
diff --git a/source/text/simpress/main0106.xhp b/source/text/simpress/main_tools.xhp
similarity index 92%
rename from source/text/simpress/main0106.xhp
rename to source/text/simpress/main_tools.xhp
index 57f0536991..da26e7d5de 100644
--- a/source/text/simpress/main0106.xhp
+++ b/source/text/simpress/main_tools.xhp
@@ -19,9 +19,9 @@
-->
-
+
Tools
- /text/simpress/main0106.xhp
+ /text/simpress/main_tools.xhp
@@ -31,7 +31,7 @@