From 5d656f212fe1a6875cdf638b3d8bf2179e34152e Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Wed, 14 Jan 2015 17:32:11 +0100
Subject: remove unneeded UI fragments

Change-Id: I8e004e7261420354f7e383f4a5b4a1170476e8ba
---
 filter/source/config/fragments/filters/HTML.xcu    |  3 +++
 .../config/fragments/filters/HTML_MasterDoc_ui.xcu | 22 ----------------------
 .../config/fragments/filters/HTML__StarCalc_.xcu   |  3 +++
 .../fragments/filters/HTML__StarCalc__ui.xcu       | 22 ----------------------
 .../config/fragments/filters/HTML__StarWriter_.xcu |  3 +++
 .../fragments/filters/HTML__StarWriter__ui.xcu     | 22 ----------------------
 filter/source/config/fragments/filters/HTML_ui.xcu | 22 ----------------------
 .../config/fragments/filters/MS_Excel_2003_XML.xcu |  3 +++
 .../fragments/filters/MS_Excel_2003_XML_ui.xcu     | 22 ----------------------
 .../filters/MS_Excel_4_0_Vorlage_Template.xcu      |  5 ++++-
 .../filters/MS_Excel_4_0_Vorlage_Template_ui.xcu   | 22 ----------------------
 .../filters/MS_Excel_5_0_95_Vorlage_Template.xcu   |  5 ++++-
 .../MS_Excel_5_0_95_Vorlage_Template_ui.xcu        | 22 ----------------------
 .../filters/MS_Excel_95_Vorlage_Template.xcu       |  5 ++++-
 .../filters/MS_Excel_95_Vorlage_Template_ui.xcu    | 22 ----------------------
 .../filters/MS_Excel_97_Vorlage_Template.xcu       |  5 ++++-
 .../filters/MS_Excel_97_Vorlage_Template_ui.xcu    | 22 ----------------------
 .../fragments/filters/MS_PowerPoint_97_Vorlage.xcu |  3 +++
 .../filters/MS_PowerPoint_97_Vorlage_ui.xcu        | 22 ----------------------
 .../config/fragments/filters/MS_Word_2003_XML.xcu  |  3 +++
 .../fragments/filters/MS_Word_2003_XML_ui.xcu      | 22 ----------------------
 .../filters/MS_Word_2007_XML_Template_ui.xcu       | 22 ----------------------
 .../fragments/filters/MS_Word_2007_XML_ui.xcu      | 22 ----------------------
 .../fragments/filters/MS_Word_95_Vorlage.xcu       |  3 +++
 .../fragments/filters/MS_Word_95_Vorlage_ui.xcu    | 22 ----------------------
 .../fragments/filters/MS_Word_97_Vorlage.xcu       |  3 +++
 .../fragments/filters/MS_Word_97_Vorlage_ui.xcu    | 22 ----------------------
 .../fragments/filters/OOXML_Text_Template_ui.xcu   | 22 ----------------------
 .../config/fragments/filters/OOXML_Text_ui.xcu     | 22 ----------------------
 .../config/fragments/filters/StarBaseReport.xcu    |  3 +++
 .../fragments/filters/StarBaseReportChart.xcu      |  3 +++
 .../fragments/filters/StarBaseReportChart_ui.xcu   | 22 ----------------------
 .../config/fragments/filters/StarBaseReport_ui.xcu | 22 ----------------------
 .../fragments/filters/StarOffice_XML__Base_.xcu    |  3 +++
 .../fragments/filters/StarOffice_XML__Base__ui.xcu | 22 ----------------------
 .../fragments/filters/StarOffice_XML__Calc_.xcu    |  3 +++
 .../fragments/filters/StarOffice_XML__Calc__ui.xcu | 22 ----------------------
 .../fragments/filters/StarOffice_XML__Chart_.xcu   |  3 +++
 .../filters/StarOffice_XML__Chart__ui.xcu          | 22 ----------------------
 .../fragments/filters/StarOffice_XML__Draw_.xcu    |  3 +++
 .../fragments/filters/StarOffice_XML__Draw__ui.xcu | 22 ----------------------
 .../fragments/filters/StarOffice_XML__Impress_.xcu |  3 +++
 .../filters/StarOffice_XML__Impress__ui.xcu        | 22 ----------------------
 .../fragments/filters/StarOffice_XML__Math_.xcu    |  3 +++
 .../fragments/filters/StarOffice_XML__Math__ui.xcu | 22 ----------------------
 .../fragments/filters/StarOffice_XML__Writer_.xcu  |  3 +++
 .../filters/StarOffice_XML__Writer__ui.xcu         | 22 ----------------------
 filter/source/config/fragments/filters/Text.xcu    |  3 +++
 .../fragments/filters/Text__StarWriter_Web_.xcu    |  3 +++
 .../fragments/filters/Text__StarWriter_Web__ui.xcu | 22 ----------------------
 .../filters/Text___txt___csv__StarCalc_.xcu        |  3 +++
 .../filters/Text___txt___csv__StarCalc__ui.xcu     | 22 ----------------------
 .../config/fragments/filters/Text__encoded_.xcu    |  3 +++
 .../Text__encoded___StarWriter_GlobalDocument_.xcu |  3 +++
 ...xt__encoded___StarWriter_GlobalDocument__ui.xcu | 22 ----------------------
 .../filters/Text__encoded___StarWriter_Web_.xcu    |  3 +++
 .../filters/Text__encoded___StarWriter_Web__ui.xcu | 22 ----------------------
 .../config/fragments/filters/Text__encoded__ui.xcu | 22 ----------------------
 filter/source/config/fragments/filters/Text_ui.xcu | 22 ----------------------
 .../config/fragments/filters/UOF_presentation.xcu  |  2 +-
 .../fragments/filters/UOF_presentation_ui.xcu      | 22 ----------------------
 .../config/fragments/filters/UOF_spreadsheet.xcu   |  2 +-
 .../fragments/filters/UOF_spreadsheet_ui.xcu       | 22 ----------------------
 .../source/config/fragments/filters/UOF_text.xcu   |  2 +-
 .../config/fragments/filters/UOF_text_ui.xcu       | 22 ----------------------
 filter/source/config/fragments/filters/calc8.xcu   |  3 +++
 .../config/fragments/filters/calc8_template.xcu    |  3 +++
 .../config/fragments/filters/calc8_template_ui.xcu | 22 ----------------------
 .../source/config/fragments/filters/calc8_ui.xcu   | 22 ----------------------
 .../fragments/filters/calc_HTML_WebQuery.xcu       |  3 +++
 .../fragments/filters/calc_HTML_WebQuery_ui.xcu    | 22 ----------------------
 .../filters/calc_MS_Excel_2007_Binary.xcu          |  5 ++++-
 .../filters/calc_MS_Excel_2007_Binary_ui.xcu       | 22 ----------------------
 .../fragments/filters/calc_MS_Excel_2007_XML.xcu   |  5 ++++-
 .../filters/calc_MS_Excel_2007_XML_Template.xcu    |  5 ++++-
 .../filters/calc_MS_Excel_2007_XML_Template_ui.xcu | 22 ----------------------
 .../filters/calc_MS_Excel_2007_XML_ui.xcu          | 22 ----------------------
 .../source/config/fragments/filters/calc_OOXML.xcu |  5 ++++-
 .../fragments/filters/calc_OOXML_Template.xcu      |  5 ++++-
 .../fragments/filters/calc_OOXML_Template_ui.xcu   | 22 ----------------------
 .../config/fragments/filters/calc_OOXML_ui.xcu     | 22 ----------------------
 .../filters/calc_StarOffice_XML_Calc_Template.xcu  |  3 +++
 .../calc_StarOffice_XML_Calc_Template_ui.xcu       | 22 ----------------------
 filter/source/config/fragments/filters/chart8.xcu  |  3 +++
 .../source/config/fragments/filters/chart8_ui.xcu  | 22 ----------------------
 filter/source/config/fragments/filters/draw8.xcu   |  3 +++
 .../config/fragments/filters/draw8_template.xcu    |  3 +++
 .../config/fragments/filters/draw8_template_ui.xcu | 22 ----------------------
 .../source/config/fragments/filters/draw8_ui.xcu   | 22 ----------------------
 .../filters/draw_StarOffice_XML_Draw_Template.xcu  |  3 +++
 .../draw_StarOffice_XML_Draw_Template_ui.xcu       | 22 ----------------------
 .../config/fragments/filters/draw_html_Export.xcu  |  3 +++
 .../fragments/filters/draw_html_Export_ui.xcu      | 22 ----------------------
 .../source/config/fragments/filters/impress8.xcu   |  3 +++
 .../config/fragments/filters/impress8_draw.xcu     |  3 +++
 .../config/fragments/filters/impress8_draw_ui.xcu  | 22 ----------------------
 .../config/fragments/filters/impress8_template.xcu |  3 +++
 .../fragments/filters/impress8_template_ui.xcu     | 22 ----------------------
 .../config/fragments/filters/impress8_ui.xcu       | 22 ----------------------
 .../filters/impress_MS_PowerPoint_2007_XML.xcu     |  5 ++++-
 .../impress_MS_PowerPoint_2007_XML_Template_ui.xcu | 22 ----------------------
 .../filters/impress_MS_PowerPoint_2007_XML_ui.xcu  | 22 ----------------------
 .../filters/impress_OOXML_Template_ui.xcu          | 22 ----------------------
 .../config/fragments/filters/impress_OOXML_ui.xcu  | 22 ----------------------
 .../filters/impress_StarOffice_XML_Draw.xcu        |  3 +++
 .../filters/impress_StarOffice_XML_Draw_ui.xcu     | 22 ----------------------
 .../impress_StarOffice_XML_Impress_Template.xcu    |  3 +++
 .../impress_StarOffice_XML_Impress_Template_ui.xcu | 22 ----------------------
 .../fragments/filters/impress_html_Export.xcu      |  3 +++
 .../fragments/filters/impress_html_Export_ui.xcu   | 22 ----------------------
 filter/source/config/fragments/filters/math8.xcu   |  3 +++
 .../source/config/fragments/filters/math8_ui.xcu   | 22 ----------------------
 filter/source/config/fragments/filters/writer8.xcu |  3 +++
 .../config/fragments/filters/writer8_template.xcu  |  3 +++
 .../fragments/filters/writer8_template_ui.xcu      | 22 ----------------------
 .../source/config/fragments/filters/writer8_ui.xcu | 22 ----------------------
 .../writer_StarOffice_XML_Writer_Template.xcu      |  3 +++
 .../writer_StarOffice_XML_Writer_Template_ui.xcu   | 22 ----------------------
 ...writer_globaldocument_StarOffice_XML_Writer.xcu |  3 +++
 ...cument_StarOffice_XML_Writer_GlobalDocument.xcu |  3 +++
 ...ent_StarOffice_XML_Writer_GlobalDocument_ui.xcu | 22 ----------------------
 ...ter_globaldocument_StarOffice_XML_Writer_ui.xcu | 22 ----------------------
 .../filters/writer_web_StarOffice_XML_Writer.xcu   |  3 +++
 ...iter_web_StarOffice_XML_Writer_Web_Template.xcu |  3 +++
 ...r_web_StarOffice_XML_Writer_Web_Template_ui.xcu | 22 ----------------------
 .../writer_web_StarOffice_XML_Writer_ui.xcu        | 22 ----------------------
 .../config/fragments/filters/writerglobal8.xcu     |  3 +++
 .../fragments/filters/writerglobal8_template.xcu   |  3 +++
 .../filters/writerglobal8_template_ui.xcu          | 12 ------------
 .../config/fragments/filters/writerglobal8_ui.xcu  | 22 ----------------------
 .../fragments/filters/writerglobal8_writer.xcu     |  3 +++
 .../fragments/filters/writerglobal8_writer_ui.xcu  | 22 ----------------------
 .../config/fragments/filters/writerweb8_writer.xcu |  3 +++
 .../filters/writerweb8_writer_template.xcu         |  3 +++
 .../filters/writerweb8_writer_template_ui.xcu      | 22 ----------------------
 .../fragments/filters/writerweb8_writer_ui.xcu     | 22 ----------------------
 136 files changed, 196 insertions(+), 1587 deletions(-)
 delete mode 100644 filter/source/config/fragments/filters/HTML_MasterDoc_ui.xcu
 delete mode 100644 filter/source/config/fragments/filters/HTML__StarCalc__ui.xcu
 delete mode 100644 filter/source/config/fragments/filters/HTML__StarWriter__ui.xcu
 delete mode 100644 filter/source/config/fragments/filters/HTML_ui.xcu
 delete mode 100644 filter/source/config/fragments/filters/MS_Excel_2003_XML_ui.xcu
 delete mode 100644 filter/source/config/fragments/filters/MS_Excel_4_0_Vorlage_Template_ui.xcu
 delete mode 100644 filter/source/config/fragments/filters/MS_Excel_5_0_95_Vorlage_Template_ui.xcu
 delete mode 100644 filter/source/config/fragments/filters/MS_Excel_95_Vorlage_Template_ui.xcu
 delete mode 100644 filter/source/config/fragments/filters/MS_Excel_97_Vorlage_Template_ui.xcu
 delete mode 100644 filter/source/config/fragments/filters/MS_PowerPoint_97_Vorlage_ui.xcu
 delete mode 100644 filter/source/config/fragments/filters/MS_Word_2003_XML_ui.xcu
 delete mode 100644 filter/source/config/fragments/filters/MS_Word_2007_XML_Template_ui.xcu
 delete mode 100644 filter/source/config/fragments/filters/MS_Word_2007_XML_ui.xcu
 delete mode 100644 filter/source/config/fragments/filters/MS_Word_95_Vorlage_ui.xcu
 delete mode 100644 filter/source/config/fragments/filters/MS_Word_97_Vorlage_ui.xcu
 delete mode 100644 filter/source/config/fragments/filters/OOXML_Text_Template_ui.xcu
 delete mode 100644 filter/source/config/fragments/filters/OOXML_Text_ui.xcu
 delete mode 100644 filter/source/config/fragments/filters/StarBaseReportChart_ui.xcu
 delete mode 100644 filter/source/config/fragments/filters/StarBaseReport_ui.xcu
 delete mode 100644 filter/source/config/fragments/filters/StarOffice_XML__Base__ui.xcu
 delete mode 100644 filter/source/config/fragments/filters/StarOffice_XML__Calc__ui.xcu
 delete mode 100644 filter/source/config/fragments/filters/StarOffice_XML__Chart__ui.xcu
 delete mode 100644 filter/source/config/fragments/filters/StarOffice_XML__Draw__ui.xcu
 delete mode 100644 filter/source/config/fragments/filters/StarOffice_XML__Impress__ui.xcu
 delete mode 100644 filter/source/config/fragments/filters/StarOffice_XML__Math__ui.xcu
 delete mode 100644 filter/source/config/fragments/filters/StarOffice_XML__Writer__ui.xcu
 delete mode 100644 filter/source/config/fragments/filters/Text__StarWriter_Web__ui.xcu
 delete mode 100644 filter/source/config/fragments/filters/Text___txt___csv__StarCalc__ui.xcu
 delete mode 100644 filter/source/config/fragments/filters/Text__encoded___StarWriter_GlobalDocument__ui.xcu
 delete mode 100644 filter/source/config/fragments/filters/Text__encoded___StarWriter_Web__ui.xcu
 delete mode 100644 filter/source/config/fragments/filters/Text__encoded__ui.xcu
 delete mode 100644 filter/source/config/fragments/filters/Text_ui.xcu
 delete mode 100644 filter/source/config/fragments/filters/UOF_presentation_ui.xcu
 delete mode 100644 filter/source/config/fragments/filters/UOF_spreadsheet_ui.xcu
 delete mode 100644 filter/source/config/fragments/filters/UOF_text_ui.xcu
 delete mode 100644 filter/source/config/fragments/filters/calc8_template_ui.xcu
 delete mode 100644 filter/source/config/fragments/filters/calc8_ui.xcu
 delete mode 100644 filter/source/config/fragments/filters/calc_HTML_WebQuery_ui.xcu
 delete mode 100644 filter/source/config/fragments/filters/calc_MS_Excel_2007_Binary_ui.xcu
 delete mode 100644 filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_Template_ui.xcu
 delete mode 100644 filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_ui.xcu
 delete mode 100644 filter/source/config/fragments/filters/calc_OOXML_Template_ui.xcu
 delete mode 100644 filter/source/config/fragments/filters/calc_OOXML_ui.xcu
 delete mode 100644 filter/source/config/fragments/filters/calc_StarOffice_XML_Calc_Template_ui.xcu
 delete mode 100644 filter/source/config/fragments/filters/chart8_ui.xcu
 delete mode 100644 filter/source/config/fragments/filters/draw8_template_ui.xcu
 delete mode 100644 filter/source/config/fragments/filters/draw8_ui.xcu
 delete mode 100644 filter/source/config/fragments/filters/draw_StarOffice_XML_Draw_Template_ui.xcu
 delete mode 100644 filter/source/config/fragments/filters/draw_html_Export_ui.xcu
 delete mode 100644 filter/source/config/fragments/filters/impress8_draw_ui.xcu
 delete mode 100644 filter/source/config/fragments/filters/impress8_template_ui.xcu
 delete mode 100644 filter/source/config/fragments/filters/impress8_ui.xcu
 delete mode 100644 filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_Template_ui.xcu
 delete mode 100644 filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_ui.xcu
 delete mode 100644 filter/source/config/fragments/filters/impress_OOXML_Template_ui.xcu
 delete mode 100644 filter/source/config/fragments/filters/impress_OOXML_ui.xcu
 delete mode 100644 filter/source/config/fragments/filters/impress_StarOffice_XML_Draw_ui.xcu
 delete mode 100644 filter/source/config/fragments/filters/impress_StarOffice_XML_Impress_Template_ui.xcu
 delete mode 100644 filter/source/config/fragments/filters/impress_html_Export_ui.xcu
 delete mode 100644 filter/source/config/fragments/filters/math8_ui.xcu
 delete mode 100644 filter/source/config/fragments/filters/writer8_template_ui.xcu
 delete mode 100644 filter/source/config/fragments/filters/writer8_ui.xcu
 delete mode 100644 filter/source/config/fragments/filters/writer_StarOffice_XML_Writer_Template_ui.xcu
 delete mode 100644 filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_GlobalDocument_ui.xcu
 delete mode 100644 filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_ui.xcu
 delete mode 100644 filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_Web_Template_ui.xcu
 delete mode 100644 filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_ui.xcu
 delete mode 100644 filter/source/config/fragments/filters/writerglobal8_template_ui.xcu
 delete mode 100644 filter/source/config/fragments/filters/writerglobal8_ui.xcu
 delete mode 100644 filter/source/config/fragments/filters/writerglobal8_writer_ui.xcu
 delete mode 100644 filter/source/config/fragments/filters/writerweb8_writer_template_ui.xcu
 delete mode 100644 filter/source/config/fragments/filters/writerweb8_writer_ui.xcu

(limited to 'filter/source')

diff --git a/filter/source/config/fragments/filters/HTML.xcu b/filter/source/config/fragments/filters/HTML.xcu
index 1dbbbcb44a49..79647f33c184 100644
--- a/filter/source/config/fragments/filters/HTML.xcu
+++ b/filter/source/config/fragments/filters/HTML.xcu
@@ -24,4 +24,7 @@
         <prop oor:name="Type"><value>generic_HTML</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.text.WebDocument</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">HTML Document</value>
+        </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/HTML_MasterDoc_ui.xcu b/filter/source/config/fragments/filters/HTML_MasterDoc_ui.xcu
deleted file mode 100644
index a3ae5b2686b4..000000000000
--- a/filter/source/config/fragments/filters/HTML_MasterDoc_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="HTML_MasterDoc">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">HTML Document (Master Document)</value>
-                    </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/HTML__StarCalc_.xcu b/filter/source/config/fragments/filters/HTML__StarCalc_.xcu
index 70dc521dfb1e..9e731b3bb36b 100644
--- a/filter/source/config/fragments/filters/HTML__StarCalc_.xcu
+++ b/filter/source/config/fragments/filters/HTML__StarCalc_.xcu
@@ -24,4 +24,7 @@
         <prop oor:name="Type"><value>generic_HTML</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.sheet.SpreadsheetDocument</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">HTML Document (Calc)</value>
+        </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/HTML__StarCalc__ui.xcu b/filter/source/config/fragments/filters/HTML__StarCalc__ui.xcu
deleted file mode 100644
index db29def33acd..000000000000
--- a/filter/source/config/fragments/filters/HTML__StarCalc__ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="HTML (StarCalc)">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">HTML Document (Calc)</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/HTML__StarWriter_.xcu b/filter/source/config/fragments/filters/HTML__StarWriter_.xcu
index 84bddfd5a6a0..e60154b43a3d 100644
--- a/filter/source/config/fragments/filters/HTML__StarWriter_.xcu
+++ b/filter/source/config/fragments/filters/HTML__StarWriter_.xcu
@@ -24,4 +24,7 @@
         <prop oor:name="Type"><value>generic_HTML</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.text.TextDocument</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">HTML Document (Writer)</value>
+        </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/HTML__StarWriter__ui.xcu b/filter/source/config/fragments/filters/HTML__StarWriter__ui.xcu
deleted file mode 100644
index a03418fcbd76..000000000000
--- a/filter/source/config/fragments/filters/HTML__StarWriter__ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="HTML (StarWriter)">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">HTML Document (Writer)</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/HTML_ui.xcu b/filter/source/config/fragments/filters/HTML_ui.xcu
deleted file mode 100644
index d8dde114dffd..000000000000
--- a/filter/source/config/fragments/filters/HTML_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="HTML">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">HTML Document</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/MS_Excel_2003_XML.xcu b/filter/source/config/fragments/filters/MS_Excel_2003_XML.xcu
index f283b57a2933..729a73a93c7d 100644
--- a/filter/source/config/fragments/filters/MS_Excel_2003_XML.xcu
+++ b/filter/source/config/fragments/filters/MS_Excel_2003_XML.xcu
@@ -24,4 +24,7 @@
         <prop oor:name="Type"><value>calc_MS_Excel_2003_XML</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.sheet.SpreadsheetDocument</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">Microsoft Excel 2003 XML</value>
+        </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/MS_Excel_2003_XML_ui.xcu b/filter/source/config/fragments/filters/MS_Excel_2003_XML_ui.xcu
deleted file mode 100644
index 9fa9d9e3f83a..000000000000
--- a/filter/source/config/fragments/filters/MS_Excel_2003_XML_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="MS Excel 2003 XML">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">Microsoft Excel 2003 XML</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/MS_Excel_4_0_Vorlage_Template.xcu b/filter/source/config/fragments/filters/MS_Excel_4_0_Vorlage_Template.xcu
index 8bee0c3e392a..1e724cdcb5c1 100644
--- a/filter/source/config/fragments/filters/MS_Excel_4_0_Vorlage_Template.xcu
+++ b/filter/source/config/fragments/filters/MS_Excel_4_0_Vorlage_Template.xcu
@@ -24,4 +24,7 @@
     <prop oor:name="Type"><value>calc_MS_Excel_40_VorlageTemplate</value></prop>
     <prop oor:name="TemplateName"/>
     <prop oor:name="DocumentService"><value>com.sun.star.sheet.SpreadsheetDocument</value></prop>
-</node>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">Microsoft Excel 4.0 Template</value>
+        </prop>
+    </node>
diff --git a/filter/source/config/fragments/filters/MS_Excel_4_0_Vorlage_Template_ui.xcu b/filter/source/config/fragments/filters/MS_Excel_4_0_Vorlage_Template_ui.xcu
deleted file mode 100644
index de31dc6f4960..000000000000
--- a/filter/source/config/fragments/filters/MS_Excel_4_0_Vorlage_Template_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="MS Excel 4.0 Vorlage/Template">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">Microsoft Excel 4.0 Template</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/MS_Excel_5_0_95_Vorlage_Template.xcu b/filter/source/config/fragments/filters/MS_Excel_5_0_95_Vorlage_Template.xcu
index 4542d2742e59..4b8ec72a31cc 100644
--- a/filter/source/config/fragments/filters/MS_Excel_5_0_95_Vorlage_Template.xcu
+++ b/filter/source/config/fragments/filters/MS_Excel_5_0_95_Vorlage_Template.xcu
@@ -24,4 +24,7 @@
     <prop oor:name="Type"><value>calc_MS_Excel_5095_VorlageTemplate</value></prop>
     <prop oor:name="TemplateName"/>
     <prop oor:name="DocumentService"><value>com.sun.star.sheet.SpreadsheetDocument</value></prop>
-</node>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">Microsoft Excel 5.0 Template</value>
+        </prop>
+    </node>
diff --git a/filter/source/config/fragments/filters/MS_Excel_5_0_95_Vorlage_Template_ui.xcu b/filter/source/config/fragments/filters/MS_Excel_5_0_95_Vorlage_Template_ui.xcu
deleted file mode 100644
index 1ecd280b45fc..000000000000
--- a/filter/source/config/fragments/filters/MS_Excel_5_0_95_Vorlage_Template_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="MS Excel 5.0/95 Vorlage/Template">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">Microsoft Excel 5.0 Template</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/MS_Excel_95_Vorlage_Template.xcu b/filter/source/config/fragments/filters/MS_Excel_95_Vorlage_Template.xcu
index a5eab888962a..d4c39a3d247b 100644
--- a/filter/source/config/fragments/filters/MS_Excel_95_Vorlage_Template.xcu
+++ b/filter/source/config/fragments/filters/MS_Excel_95_Vorlage_Template.xcu
@@ -24,4 +24,7 @@
     <prop oor:name="Type"><value>calc_MS_Excel_95_VorlageTemplate</value></prop>
     <prop oor:name="TemplateName"/>
     <prop oor:name="DocumentService"><value>com.sun.star.sheet.SpreadsheetDocument</value></prop>
-</node>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">Microsoft Excel 95 Template</value>
+        </prop>
+    </node>
diff --git a/filter/source/config/fragments/filters/MS_Excel_95_Vorlage_Template_ui.xcu b/filter/source/config/fragments/filters/MS_Excel_95_Vorlage_Template_ui.xcu
deleted file mode 100644
index 89318bbc94bc..000000000000
--- a/filter/source/config/fragments/filters/MS_Excel_95_Vorlage_Template_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="MS Excel 95 Vorlage/Template">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">Microsoft Excel 95 Template</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/MS_Excel_97_Vorlage_Template.xcu b/filter/source/config/fragments/filters/MS_Excel_97_Vorlage_Template.xcu
index b3185407fbc5..d82bcaadb7cf 100644
--- a/filter/source/config/fragments/filters/MS_Excel_97_Vorlage_Template.xcu
+++ b/filter/source/config/fragments/filters/MS_Excel_97_Vorlage_Template.xcu
@@ -24,4 +24,7 @@
     <prop oor:name="Type"><value>calc_MS_Excel_97_VorlageTemplate</value></prop>
     <prop oor:name="TemplateName"/>
     <prop oor:name="DocumentService"><value>com.sun.star.sheet.SpreadsheetDocument</value></prop>
-</node>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">Microsoft Excel 97-2003 Template</value>
+        </prop>
+    </node>
diff --git a/filter/source/config/fragments/filters/MS_Excel_97_Vorlage_Template_ui.xcu b/filter/source/config/fragments/filters/MS_Excel_97_Vorlage_Template_ui.xcu
deleted file mode 100644
index 14c5a7574b11..000000000000
--- a/filter/source/config/fragments/filters/MS_Excel_97_Vorlage_Template_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="MS Excel 97 Vorlage/Template">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">Microsoft Excel 97-2003 Template</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/MS_PowerPoint_97_Vorlage.xcu b/filter/source/config/fragments/filters/MS_PowerPoint_97_Vorlage.xcu
index 6480891dc202..571fde6fcce1 100644
--- a/filter/source/config/fragments/filters/MS_PowerPoint_97_Vorlage.xcu
+++ b/filter/source/config/fragments/filters/MS_PowerPoint_97_Vorlage.xcu
@@ -24,4 +24,7 @@
         <prop oor:name="Type"><value>impress_MS_PowerPoint_97_Vorlage</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.presentation.PresentationDocument</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">Microsoft PowerPoint 97-2003 Template</value>
+        </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/MS_PowerPoint_97_Vorlage_ui.xcu b/filter/source/config/fragments/filters/MS_PowerPoint_97_Vorlage_ui.xcu
deleted file mode 100644
index e1c2ecaf4bf3..000000000000
--- a/filter/source/config/fragments/filters/MS_PowerPoint_97_Vorlage_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="MS PowerPoint 97 Vorlage">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">Microsoft PowerPoint 97-2003 Template</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/MS_Word_2003_XML.xcu b/filter/source/config/fragments/filters/MS_Word_2003_XML.xcu
index 56efe87dd509..a3730df8225a 100644
--- a/filter/source/config/fragments/filters/MS_Word_2003_XML.xcu
+++ b/filter/source/config/fragments/filters/MS_Word_2003_XML.xcu
@@ -24,4 +24,7 @@
         <prop oor:name="Type"><value>writer_MS_Word_2003_XML</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.text.TextDocument</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">Microsoft Word 2003 XML</value>
+        </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/MS_Word_2003_XML_ui.xcu b/filter/source/config/fragments/filters/MS_Word_2003_XML_ui.xcu
deleted file mode 100644
index 6899e9c807be..000000000000
--- a/filter/source/config/fragments/filters/MS_Word_2003_XML_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="MS Word 2003 XML">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">Microsoft Word 2003 XML</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/MS_Word_2007_XML_Template_ui.xcu b/filter/source/config/fragments/filters/MS_Word_2007_XML_Template_ui.xcu
deleted file mode 100644
index 5400bf4c9e5f..000000000000
--- a/filter/source/config/fragments/filters/MS_Word_2007_XML_Template_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="MS Word 2007 XML Template">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">Microsoft Word 2007-2013 XML Template</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/MS_Word_2007_XML_ui.xcu b/filter/source/config/fragments/filters/MS_Word_2007_XML_ui.xcu
deleted file mode 100644
index 923aecdb97a1..000000000000
--- a/filter/source/config/fragments/filters/MS_Word_2007_XML_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="MS Word 2007 XML">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">Microsoft Word 2007-2013 XML</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/MS_Word_95_Vorlage.xcu b/filter/source/config/fragments/filters/MS_Word_95_Vorlage.xcu
index b13ff148307d..3b2a105f847a 100644
--- a/filter/source/config/fragments/filters/MS_Word_95_Vorlage.xcu
+++ b/filter/source/config/fragments/filters/MS_Word_95_Vorlage.xcu
@@ -24,4 +24,7 @@
         <prop oor:name="Type"><value>writer_MS_Word_95_Vorlage</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.text.TextDocument</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">Microsoft Word 95 Template</value>
+        </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/MS_Word_95_Vorlage_ui.xcu b/filter/source/config/fragments/filters/MS_Word_95_Vorlage_ui.xcu
deleted file mode 100644
index ddbb91fdbd2f..000000000000
--- a/filter/source/config/fragments/filters/MS_Word_95_Vorlage_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="MS Word 95 Vorlage">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">Microsoft Word 95 Template</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/MS_Word_97_Vorlage.xcu b/filter/source/config/fragments/filters/MS_Word_97_Vorlage.xcu
index fda112549cbc..d75b3e2d5924 100644
--- a/filter/source/config/fragments/filters/MS_Word_97_Vorlage.xcu
+++ b/filter/source/config/fragments/filters/MS_Word_97_Vorlage.xcu
@@ -24,4 +24,7 @@
         <prop oor:name="Type"><value>writer_MS_Word_97_Vorlage</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.text.TextDocument</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">Microsoft Word 97-2003 Template</value>
+        </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/MS_Word_97_Vorlage_ui.xcu b/filter/source/config/fragments/filters/MS_Word_97_Vorlage_ui.xcu
deleted file mode 100644
index 92cc0b5507f5..000000000000
--- a/filter/source/config/fragments/filters/MS_Word_97_Vorlage_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="MS Word 97 Vorlage">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">Microsoft Word 97-2003 Template</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/OOXML_Text_Template_ui.xcu b/filter/source/config/fragments/filters/OOXML_Text_Template_ui.xcu
deleted file mode 100644
index d21ebb42d224..000000000000
--- a/filter/source/config/fragments/filters/OOXML_Text_Template_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="Office Open XML Text Template">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">Office Open XML Text Template</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/OOXML_Text_ui.xcu b/filter/source/config/fragments/filters/OOXML_Text_ui.xcu
deleted file mode 100644
index a23d35f8c912..000000000000
--- a/filter/source/config/fragments/filters/OOXML_Text_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="Office Open XML Text">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">Office Open XML Text</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/StarBaseReport.xcu b/filter/source/config/fragments/filters/StarBaseReport.xcu
index 7c15cb40253d..c46133db69c8 100644
--- a/filter/source/config/fragments/filters/StarBaseReport.xcu
+++ b/filter/source/config/fragments/filters/StarBaseReport.xcu
@@ -32,4 +32,7 @@
       <prop oor:name="DocumentService">
         <value>com.sun.star.report.ReportDefinition</value>
       </prop>
+      <prop oor:name="UIName">
+        <value xml:lang="en-US">ODF Database Report</value>
+      </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/StarBaseReportChart.xcu b/filter/source/config/fragments/filters/StarBaseReportChart.xcu
index 738819c79caf..867e4175e173 100644
--- a/filter/source/config/fragments/filters/StarBaseReportChart.xcu
+++ b/filter/source/config/fragments/filters/StarBaseReportChart.xcu
@@ -34,4 +34,7 @@
       <prop oor:name="DocumentService">
         <value>com.sun.star.chart2.ChartDocument</value>
       </prop>
+      <prop oor:name="UIName">
+        <value xml:lang="en-US">OpenOffice.org 1.0 Report Chart</value>
+      </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/StarBaseReportChart_ui.xcu b/filter/source/config/fragments/filters/StarBaseReportChart_ui.xcu
deleted file mode 100644
index 7f9efe952565..000000000000
--- a/filter/source/config/fragments/filters/StarBaseReportChart_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="StarOffice XML (Base) Report Chart">
-      <prop oor:name="UIName">
-        <value xml:lang="en-US">OpenOffice.org 1.0 Report Chart</value>
-      </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/StarBaseReport_ui.xcu b/filter/source/config/fragments/filters/StarBaseReport_ui.xcu
deleted file mode 100644
index d5f07fe80e09..000000000000
--- a/filter/source/config/fragments/filters/StarBaseReport_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="StarOffice XML (Base) Report">
-      <prop oor:name="UIName">
-        <value xml:lang="en-US">ODF Database Report</value>
-      </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Base_.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Base_.xcu
index 0a1fdcea0eaa..4c33a806fd9d 100644
--- a/filter/source/config/fragments/filters/StarOffice_XML__Base_.xcu
+++ b/filter/source/config/fragments/filters/StarOffice_XML__Base_.xcu
@@ -24,4 +24,7 @@
         <prop oor:name="Type"><value>StarBase</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.sdb.OfficeDatabaseDocument</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">ODF Database</value>
+                    </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Base__ui.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Base__ui.xcu
deleted file mode 100644
index f3972edb4012..000000000000
--- a/filter/source/config/fragments/filters/StarOffice_XML__Base__ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="StarOffice XML (Base)">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">ODF Database</value>
-                    </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Calc_.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Calc_.xcu
index dbc8bc354076..6f658cbdd30f 100644
--- a/filter/source/config/fragments/filters/StarOffice_XML__Calc_.xcu
+++ b/filter/source/config/fragments/filters/StarOffice_XML__Calc_.xcu
@@ -24,4 +24,7 @@
         <prop oor:name="Type"><value>calc_StarOffice_XML_Calc</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.sheet.SpreadsheetDocument</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">OpenOffice.org 1.0 Spreadsheet</value>
+        </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Calc__ui.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Calc__ui.xcu
deleted file mode 100644
index 722ea2a963de..000000000000
--- a/filter/source/config/fragments/filters/StarOffice_XML__Calc__ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="StarOffice XML (Calc)">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">OpenOffice.org 1.0 Spreadsheet</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Chart_.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Chart_.xcu
index f84efc05ae90..605671c87cff 100644
--- a/filter/source/config/fragments/filters/StarOffice_XML__Chart_.xcu
+++ b/filter/source/config/fragments/filters/StarOffice_XML__Chart_.xcu
@@ -24,4 +24,7 @@
         <prop oor:name="Type"><value>chart_StarOffice_XML_Chart</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.chart2.ChartDocument</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">OpenOffice.org 1.0 Chart</value>
+        </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Chart__ui.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Chart__ui.xcu
deleted file mode 100644
index ebc2d3557102..000000000000
--- a/filter/source/config/fragments/filters/StarOffice_XML__Chart__ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="StarOffice XML (Chart)">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">OpenOffice.org 1.0 Chart</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Draw_.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Draw_.xcu
index a4a6c378e1e4..9fdd62b9a667 100644
--- a/filter/source/config/fragments/filters/StarOffice_XML__Draw_.xcu
+++ b/filter/source/config/fragments/filters/StarOffice_XML__Draw_.xcu
@@ -24,4 +24,7 @@
         <prop oor:name="Type"><value>draw_StarOffice_XML_Draw</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.drawing.DrawingDocument</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">OpenOffice.org 1.0 Drawing</value>
+        </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Draw__ui.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Draw__ui.xcu
deleted file mode 100644
index 063a4153b8e9..000000000000
--- a/filter/source/config/fragments/filters/StarOffice_XML__Draw__ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="StarOffice XML (Draw)">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">OpenOffice.org 1.0 Drawing</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Impress_.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Impress_.xcu
index af611089df12..1a2c24d22772 100644
--- a/filter/source/config/fragments/filters/StarOffice_XML__Impress_.xcu
+++ b/filter/source/config/fragments/filters/StarOffice_XML__Impress_.xcu
@@ -24,4 +24,7 @@
         <prop oor:name="Type"><value>impress_StarOffice_XML_Impress</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.presentation.PresentationDocument</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">OpenOffice.org 1.0 Presentation</value>
+        </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Impress__ui.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Impress__ui.xcu
deleted file mode 100644
index 351d5addbb9b..000000000000
--- a/filter/source/config/fragments/filters/StarOffice_XML__Impress__ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="StarOffice XML (Impress)">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">OpenOffice.org 1.0 Presentation</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Math_.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Math_.xcu
index 2f60ca63ea24..569eb570b658 100644
--- a/filter/source/config/fragments/filters/StarOffice_XML__Math_.xcu
+++ b/filter/source/config/fragments/filters/StarOffice_XML__Math_.xcu
@@ -24,4 +24,7 @@
         <prop oor:name="Type"><value>math_StarOffice_XML_Math</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.formula.FormulaProperties</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">OpenOffice.org 1.0 Formula</value>
+        </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Math__ui.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Math__ui.xcu
deleted file mode 100644
index e93ac4d37c47..000000000000
--- a/filter/source/config/fragments/filters/StarOffice_XML__Math__ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="StarOffice XML (Math)">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">OpenOffice.org 1.0 Formula</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Writer_.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Writer_.xcu
index 698e6029f92a..ee3638bc0cc8 100644
--- a/filter/source/config/fragments/filters/StarOffice_XML__Writer_.xcu
+++ b/filter/source/config/fragments/filters/StarOffice_XML__Writer_.xcu
@@ -24,4 +24,7 @@
         <prop oor:name="Type"><value>writer_StarOffice_XML_Writer</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.text.TextDocument</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">OpenOffice.org 1.0 Text Document</value>
+        </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Writer__ui.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Writer__ui.xcu
deleted file mode 100644
index 40f1485c96d1..000000000000
--- a/filter/source/config/fragments/filters/StarOffice_XML__Writer__ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="StarOffice XML (Writer)">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">OpenOffice.org 1.0 Text Document</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/Text.xcu b/filter/source/config/fragments/filters/Text.xcu
index eacf35417f69..7ce06bcd138d 100644
--- a/filter/source/config/fragments/filters/Text.xcu
+++ b/filter/source/config/fragments/filters/Text.xcu
@@ -25,4 +25,7 @@
         <prop oor:name="Type"><value>generic_Text</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.text.TextDocument</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">Text</value>
+        </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/Text__StarWriter_Web_.xcu b/filter/source/config/fragments/filters/Text__StarWriter_Web_.xcu
index 44787f7e5905..e3d1658fb713 100644
--- a/filter/source/config/fragments/filters/Text__StarWriter_Web_.xcu
+++ b/filter/source/config/fragments/filters/Text__StarWriter_Web_.xcu
@@ -25,4 +25,7 @@
         <prop oor:name="Type"><value>generic_Text</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.text.WebDocument</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">Text (Writer/Web)</value>
+        </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/Text__StarWriter_Web__ui.xcu b/filter/source/config/fragments/filters/Text__StarWriter_Web__ui.xcu
deleted file mode 100644
index 43f68759fedf..000000000000
--- a/filter/source/config/fragments/filters/Text__StarWriter_Web__ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="Text (StarWriter/Web)">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">Text (Writer/Web)</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/Text___txt___csv__StarCalc_.xcu b/filter/source/config/fragments/filters/Text___txt___csv__StarCalc_.xcu
index 905f80a1dd46..eab74691c82b 100644
--- a/filter/source/config/fragments/filters/Text___txt___csv__StarCalc_.xcu
+++ b/filter/source/config/fragments/filters/Text___txt___csv__StarCalc_.xcu
@@ -25,4 +25,7 @@
         <prop oor:name="Type"><value>generic_Text</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.sheet.SpreadsheetDocument</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">Text CSV</value>
+        </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/Text___txt___csv__StarCalc__ui.xcu b/filter/source/config/fragments/filters/Text___txt___csv__StarCalc__ui.xcu
deleted file mode 100644
index f249ac2ee46f..000000000000
--- a/filter/source/config/fragments/filters/Text___txt___csv__StarCalc__ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="Text - txt - csv (StarCalc)">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">Text CSV</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/Text__encoded_.xcu b/filter/source/config/fragments/filters/Text__encoded_.xcu
index f43226012033..f4c6f0d306fe 100644
--- a/filter/source/config/fragments/filters/Text__encoded_.xcu
+++ b/filter/source/config/fragments/filters/Text__encoded_.xcu
@@ -25,4 +25,7 @@
         <prop oor:name="Type"><value>generic_Text</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.text.TextDocument</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">Text - Choose Encoding</value>
+        </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/Text__encoded___StarWriter_GlobalDocument_.xcu b/filter/source/config/fragments/filters/Text__encoded___StarWriter_GlobalDocument_.xcu
index 0ee9f0e4ac1d..2b6a8b0113e1 100644
--- a/filter/source/config/fragments/filters/Text__encoded___StarWriter_GlobalDocument_.xcu
+++ b/filter/source/config/fragments/filters/Text__encoded___StarWriter_GlobalDocument_.xcu
@@ -25,4 +25,7 @@
         <prop oor:name="Type"><value>generic_Text</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.text.GlobalDocument</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">Text - Choose Encoding (Master Document)</value>
+        </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/Text__encoded___StarWriter_GlobalDocument__ui.xcu b/filter/source/config/fragments/filters/Text__encoded___StarWriter_GlobalDocument__ui.xcu
deleted file mode 100644
index ea8bdb77522d..000000000000
--- a/filter/source/config/fragments/filters/Text__encoded___StarWriter_GlobalDocument__ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="Text (encoded) (StarWriter/GlobalDocument)">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">Text - Choose Encoding (Master Document)</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/Text__encoded___StarWriter_Web_.xcu b/filter/source/config/fragments/filters/Text__encoded___StarWriter_Web_.xcu
index 03c3ce3467a4..4e2d92d893d6 100644
--- a/filter/source/config/fragments/filters/Text__encoded___StarWriter_Web_.xcu
+++ b/filter/source/config/fragments/filters/Text__encoded___StarWriter_Web_.xcu
@@ -25,4 +25,7 @@
         <prop oor:name="Type"><value>generic_Text</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.text.WebDocument</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">Text - Choose Encoding (Writer/Web)</value>
+        </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/Text__encoded___StarWriter_Web__ui.xcu b/filter/source/config/fragments/filters/Text__encoded___StarWriter_Web__ui.xcu
deleted file mode 100644
index 5d6fa4b3b927..000000000000
--- a/filter/source/config/fragments/filters/Text__encoded___StarWriter_Web__ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="Text (encoded) (StarWriter/Web)">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">Text - Choose Encoding (Writer/Web)</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/Text__encoded__ui.xcu b/filter/source/config/fragments/filters/Text__encoded__ui.xcu
deleted file mode 100644
index 81353c9f3ee9..000000000000
--- a/filter/source/config/fragments/filters/Text__encoded__ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="Text (encoded)">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">Text - Choose Encoding</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/Text_ui.xcu b/filter/source/config/fragments/filters/Text_ui.xcu
deleted file mode 100644
index a457bb9f6ec5..000000000000
--- a/filter/source/config/fragments/filters/Text_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="Text">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">Text</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/UOF_presentation.xcu b/filter/source/config/fragments/filters/UOF_presentation.xcu
index 800e9e1dee61..1f8be437ba6d 100644
--- a/filter/source/config/fragments/filters/UOF_presentation.xcu
+++ b/filter/source/config/fragments/filters/UOF_presentation.xcu
@@ -24,7 +24,7 @@
         <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.XmlFilterAdaptor</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="UIName">
-            <value>Unified Office Format presentation</value>
+            <value xml:lang="en-US">Unified Office Format presentation</value>
         </prop>
         <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER</value></prop>
     </node>
diff --git a/filter/source/config/fragments/filters/UOF_presentation_ui.xcu b/filter/source/config/fragments/filters/UOF_presentation_ui.xcu
deleted file mode 100644
index e1f390274ddc..000000000000
--- a/filter/source/config/fragments/filters/UOF_presentation_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="UOF presentation" oor:op="replace">
-         <prop oor:name="UIName">
-            <value xml:lang="en-US">Unified Office Format presentation</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/UOF_spreadsheet.xcu b/filter/source/config/fragments/filters/UOF_spreadsheet.xcu
index 148131b5dc0c..91f564307b9c 100644
--- a/filter/source/config/fragments/filters/UOF_spreadsheet.xcu
+++ b/filter/source/config/fragments/filters/UOF_spreadsheet.xcu
@@ -24,7 +24,7 @@
         <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.XmlFilterAdaptor</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="UIName">
-            <value>Unified Office Format spreadsheet</value>
+            <value xml:lang="en-US">Unified Office Format spreadsheet</value>
         </prop>
         <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER</value></prop>
     </node>
diff --git a/filter/source/config/fragments/filters/UOF_spreadsheet_ui.xcu b/filter/source/config/fragments/filters/UOF_spreadsheet_ui.xcu
deleted file mode 100644
index c5b0434fbbb4..000000000000
--- a/filter/source/config/fragments/filters/UOF_spreadsheet_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="UOF spreadsheet" oor:op="replace">
-         <prop oor:name="UIName">
-            <value xml:lang="en-US">Unified Office Format spreadsheet</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/UOF_text.xcu b/filter/source/config/fragments/filters/UOF_text.xcu
index 0f7d6223712b..e4241f1753f3 100644
--- a/filter/source/config/fragments/filters/UOF_text.xcu
+++ b/filter/source/config/fragments/filters/UOF_text.xcu
@@ -24,7 +24,7 @@
         <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.XmlFilterAdaptor</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="UIName">
-            <value>Unified Office Format text</value>
+            <value xml:lang="en-US">Unified Office Format text</value>
         </prop>
         <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER</value></prop>
     </node>
diff --git a/filter/source/config/fragments/filters/UOF_text_ui.xcu b/filter/source/config/fragments/filters/UOF_text_ui.xcu
deleted file mode 100644
index 09b6842e0c02..000000000000
--- a/filter/source/config/fragments/filters/UOF_text_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="UOF text" oor:op="replace">
-         <prop oor:name="UIName">
-            <value xml:lang="en-US">Unified Office Format text</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/calc8.xcu b/filter/source/config/fragments/filters/calc8.xcu
index 01564611d480..ddf0aa4f7ecd 100644
--- a/filter/source/config/fragments/filters/calc8.xcu
+++ b/filter/source/config/fragments/filters/calc8.xcu
@@ -24,4 +24,7 @@
         <prop oor:name="Type"><value>calc8</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.sheet.SpreadsheetDocument</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">ODF Spreadsheet</value>
+                    </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/calc8_template.xcu b/filter/source/config/fragments/filters/calc8_template.xcu
index 0b08179257d9..4752a45f1b6f 100644
--- a/filter/source/config/fragments/filters/calc8_template.xcu
+++ b/filter/source/config/fragments/filters/calc8_template.xcu
@@ -24,4 +24,7 @@
         <prop oor:name="Type"><value>calc8_template</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.sheet.SpreadsheetDocument</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">ODF Spreadsheet Template</value>
+                    </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/calc8_template_ui.xcu b/filter/source/config/fragments/filters/calc8_template_ui.xcu
deleted file mode 100644
index af9c43094cb4..000000000000
--- a/filter/source/config/fragments/filters/calc8_template_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="calc8_template">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">ODF Spreadsheet Template</value>
-                    </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/calc8_ui.xcu b/filter/source/config/fragments/filters/calc8_ui.xcu
deleted file mode 100644
index 8807db281111..000000000000
--- a/filter/source/config/fragments/filters/calc8_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="calc8">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">ODF Spreadsheet</value>
-                    </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/calc_HTML_WebQuery.xcu b/filter/source/config/fragments/filters/calc_HTML_WebQuery.xcu
index f40a7b2391b6..c91d92880302 100644
--- a/filter/source/config/fragments/filters/calc_HTML_WebQuery.xcu
+++ b/filter/source/config/fragments/filters/calc_HTML_WebQuery.xcu
@@ -24,4 +24,7 @@
         <prop oor:name="Type"><value>generic_HTML</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.sheet.SpreadsheetDocument</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">Web Page Query (Calc)</value>
+        </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/calc_HTML_WebQuery_ui.xcu b/filter/source/config/fragments/filters/calc_HTML_WebQuery_ui.xcu
deleted file mode 100644
index ce0276cc0be5..000000000000
--- a/filter/source/config/fragments/filters/calc_HTML_WebQuery_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="calc_HTML_WebQuery">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">Web Page Query (Calc)</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/calc_MS_Excel_2007_Binary.xcu b/filter/source/config/fragments/filters/calc_MS_Excel_2007_Binary.xcu
index f19ac84f3eed..24743cf866f1 100644
--- a/filter/source/config/fragments/filters/calc_MS_Excel_2007_Binary.xcu
+++ b/filter/source/config/fragments/filters/calc_MS_Excel_2007_Binary.xcu
@@ -24,4 +24,7 @@
     <prop oor:name="Type"><value>MS Excel 2007 Binary</value></prop>
     <prop oor:name="TemplateName"/>
     <prop oor:name="DocumentService"><value>com.sun.star.sheet.SpreadsheetDocument</value></prop>
-</node>
+    <prop oor:name="UIName">
+        <value xml:lang="en-US">Microsoft Excel 2007 Binary</value>
+    </prop>
+    </node>
diff --git a/filter/source/config/fragments/filters/calc_MS_Excel_2007_Binary_ui.xcu b/filter/source/config/fragments/filters/calc_MS_Excel_2007_Binary_ui.xcu
deleted file mode 100644
index fecefbbd06fb..000000000000
--- a/filter/source/config/fragments/filters/calc_MS_Excel_2007_Binary_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-<node oor:name="Calc MS Excel 2007 Binary">
-    <prop oor:name="UIName">
-        <value xml:lang="en-US">Microsoft Excel 2007 Binary</value>
-    </prop>
-</node>
diff --git a/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML.xcu b/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML.xcu
index 555ccb1bb6fb..13febd19bef3 100644
--- a/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML.xcu
+++ b/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML.xcu
@@ -24,4 +24,7 @@
     <prop oor:name="Type"><value>MS Excel 2007 XML</value></prop>
     <prop oor:name="TemplateName"/>
     <prop oor:name="DocumentService"><value>com.sun.star.sheet.SpreadsheetDocument</value></prop>
-</node>
+    <prop oor:name="UIName">
+        <value xml:lang="en-US">Microsoft Excel 2007-2013 XML</value>
+    </prop>
+    </node>
diff --git a/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_Template.xcu b/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_Template.xcu
index 2748ae3ba33f..91214c8764db 100644
--- a/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_Template.xcu
+++ b/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_Template.xcu
@@ -24,4 +24,7 @@
     <prop oor:name="Type"><value>MS Excel 2007 XML Template</value></prop>
     <prop oor:name="TemplateName"/>
     <prop oor:name="DocumentService"><value>com.sun.star.sheet.SpreadsheetDocument</value></prop>
-</node>
+    <prop oor:name="UIName">
+        <value xml:lang="en-US">Microsoft Excel 2007-2013 XML Template</value>
+    </prop>
+    </node>
diff --git a/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_Template_ui.xcu b/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_Template_ui.xcu
deleted file mode 100644
index 5250662fb0bd..000000000000
--- a/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_Template_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-<node oor:name="Calc MS Excel 2007 XML Template">
-    <prop oor:name="UIName">
-        <value xml:lang="en-US">Microsoft Excel 2007-2013 XML Template</value>
-    </prop>
-</node>
diff --git a/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_ui.xcu b/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_ui.xcu
deleted file mode 100644
index 070952ace1b6..000000000000
--- a/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-<node oor:name="Calc MS Excel 2007 XML">
-    <prop oor:name="UIName">
-        <value xml:lang="en-US">Microsoft Excel 2007-2013 XML</value>
-    </prop>
-</node>
diff --git a/filter/source/config/fragments/filters/calc_OOXML.xcu b/filter/source/config/fragments/filters/calc_OOXML.xcu
index ce4bc40e21fe..2bc0981297d9 100644
--- a/filter/source/config/fragments/filters/calc_OOXML.xcu
+++ b/filter/source/config/fragments/filters/calc_OOXML.xcu
@@ -24,4 +24,7 @@
     <prop oor:name="Type"><value>Office Open XML Spreadsheet</value></prop>
     <prop oor:name="TemplateName"/>
     <prop oor:name="DocumentService"><value>com.sun.star.sheet.SpreadsheetDocument</value></prop>
-</node>
+    <prop oor:name="UIName">
+        <value xml:lang="en-US">Office Open XML Spreadsheet</value>
+    </prop>
+    </node>
diff --git a/filter/source/config/fragments/filters/calc_OOXML_Template.xcu b/filter/source/config/fragments/filters/calc_OOXML_Template.xcu
index 2b701235c894..848e7ee38fe8 100644
--- a/filter/source/config/fragments/filters/calc_OOXML_Template.xcu
+++ b/filter/source/config/fragments/filters/calc_OOXML_Template.xcu
@@ -24,4 +24,7 @@
     <prop oor:name="Type"><value>Office Open XML Spreadsheet Template</value></prop>
     <prop oor:name="TemplateName"/>
     <prop oor:name="DocumentService"><value>com.sun.star.sheet.SpreadsheetDocument</value></prop>
-</node>
+    <prop oor:name="UIName">
+        <value xml:lang="en-US">Office Open XML Spreadsheet Template</value>
+    </prop>
+    </node>
diff --git a/filter/source/config/fragments/filters/calc_OOXML_Template_ui.xcu b/filter/source/config/fragments/filters/calc_OOXML_Template_ui.xcu
deleted file mode 100644
index e88159903273..000000000000
--- a/filter/source/config/fragments/filters/calc_OOXML_Template_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-<node oor:name="Calc Office Open XML Template">
-    <prop oor:name="UIName">
-        <value xml:lang="en-US">Office Open XML Spreadsheet Template</value>
-    </prop>
-</node>
diff --git a/filter/source/config/fragments/filters/calc_OOXML_ui.xcu b/filter/source/config/fragments/filters/calc_OOXML_ui.xcu
deleted file mode 100644
index fc8b97134ab6..000000000000
--- a/filter/source/config/fragments/filters/calc_OOXML_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-<node oor:name="Calc Office Open XML">
-    <prop oor:name="UIName">
-        <value xml:lang="en-US">Office Open XML Spreadsheet</value>
-    </prop>
-</node>
diff --git a/filter/source/config/fragments/filters/calc_StarOffice_XML_Calc_Template.xcu b/filter/source/config/fragments/filters/calc_StarOffice_XML_Calc_Template.xcu
index e7c222f1d056..3c05efa3980b 100644
--- a/filter/source/config/fragments/filters/calc_StarOffice_XML_Calc_Template.xcu
+++ b/filter/source/config/fragments/filters/calc_StarOffice_XML_Calc_Template.xcu
@@ -24,4 +24,7 @@
         <prop oor:name="Type"><value>calc_StarOffice_XML_Calc_Template</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.sheet.SpreadsheetDocument</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">OpenOffice.org 1.0 Spreadsheet Template</value>
+        </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/calc_StarOffice_XML_Calc_Template_ui.xcu b/filter/source/config/fragments/filters/calc_StarOffice_XML_Calc_Template_ui.xcu
deleted file mode 100644
index 2a64e72befab..000000000000
--- a/filter/source/config/fragments/filters/calc_StarOffice_XML_Calc_Template_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="calc_StarOffice_XML_Calc_Template">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">OpenOffice.org 1.0 Spreadsheet Template</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/chart8.xcu b/filter/source/config/fragments/filters/chart8.xcu
index 36c4e4ae62ef..3c33792476fe 100644
--- a/filter/source/config/fragments/filters/chart8.xcu
+++ b/filter/source/config/fragments/filters/chart8.xcu
@@ -24,4 +24,7 @@
         <prop oor:name="Type"><value>chart8</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.chart2.ChartDocument</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">ODF Chart</value>
+                    </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/chart8_ui.xcu b/filter/source/config/fragments/filters/chart8_ui.xcu
deleted file mode 100644
index 065b1896f13c..000000000000
--- a/filter/source/config/fragments/filters/chart8_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="chart8">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">ODF Chart</value>
-                    </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/draw8.xcu b/filter/source/config/fragments/filters/draw8.xcu
index 70167a74db76..7bdd98687f86 100644
--- a/filter/source/config/fragments/filters/draw8.xcu
+++ b/filter/source/config/fragments/filters/draw8.xcu
@@ -24,4 +24,7 @@
         <prop oor:name="Type"><value>draw8</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.drawing.DrawingDocument</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">ODF Drawing</value>
+                    </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/draw8_template.xcu b/filter/source/config/fragments/filters/draw8_template.xcu
index 4103a27f661d..ac4f262d5d60 100644
--- a/filter/source/config/fragments/filters/draw8_template.xcu
+++ b/filter/source/config/fragments/filters/draw8_template.xcu
@@ -24,4 +24,7 @@
         <prop oor:name="Type"><value>draw8_template</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.drawing.DrawingDocument</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">ODF Drawing Template</value>
+                    </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/draw8_template_ui.xcu b/filter/source/config/fragments/filters/draw8_template_ui.xcu
deleted file mode 100644
index e2aec0f8e1cc..000000000000
--- a/filter/source/config/fragments/filters/draw8_template_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="draw8_template">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">ODF Drawing Template</value>
-                    </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/draw8_ui.xcu b/filter/source/config/fragments/filters/draw8_ui.xcu
deleted file mode 100644
index 992c5508332c..000000000000
--- a/filter/source/config/fragments/filters/draw8_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="draw8">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">ODF Drawing</value>
-                    </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/draw_StarOffice_XML_Draw_Template.xcu b/filter/source/config/fragments/filters/draw_StarOffice_XML_Draw_Template.xcu
index 5037f8b85526..78302771392d 100644
--- a/filter/source/config/fragments/filters/draw_StarOffice_XML_Draw_Template.xcu
+++ b/filter/source/config/fragments/filters/draw_StarOffice_XML_Draw_Template.xcu
@@ -24,4 +24,7 @@
         <prop oor:name="Type"><value>draw_StarOffice_XML_Draw_Template</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.drawing.DrawingDocument</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">OpenOffice.org 1.0 Drawing Template</value>
+        </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/draw_StarOffice_XML_Draw_Template_ui.xcu b/filter/source/config/fragments/filters/draw_StarOffice_XML_Draw_Template_ui.xcu
deleted file mode 100644
index 644e10667142..000000000000
--- a/filter/source/config/fragments/filters/draw_StarOffice_XML_Draw_Template_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="draw_StarOffice_XML_Draw_Template">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">OpenOffice.org 1.0 Drawing Template</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/draw_html_Export.xcu b/filter/source/config/fragments/filters/draw_html_Export.xcu
index b6460b5ce142..179c7bb7edc0 100644
--- a/filter/source/config/fragments/filters/draw_html_Export.xcu
+++ b/filter/source/config/fragments/filters/draw_html_Export.xcu
@@ -24,4 +24,7 @@
         <prop oor:name="Type"><value>graphic_HTML</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.drawing.DrawingDocument</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">HTML Document (Draw)</value>
+        </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/draw_html_Export_ui.xcu b/filter/source/config/fragments/filters/draw_html_Export_ui.xcu
deleted file mode 100644
index b796ccf47c28..000000000000
--- a/filter/source/config/fragments/filters/draw_html_Export_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="draw_html_Export">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">HTML Document (Draw)</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/impress8.xcu b/filter/source/config/fragments/filters/impress8.xcu
index 9e564c833d63..f4b8a44a4fcd 100644
--- a/filter/source/config/fragments/filters/impress8.xcu
+++ b/filter/source/config/fragments/filters/impress8.xcu
@@ -24,4 +24,7 @@
         <prop oor:name="Type"><value>impress8</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.presentation.PresentationDocument</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">ODF Presentation</value>
+                    </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/impress8_draw.xcu b/filter/source/config/fragments/filters/impress8_draw.xcu
index 47e0be952317..1f3e53c97a06 100644
--- a/filter/source/config/fragments/filters/impress8_draw.xcu
+++ b/filter/source/config/fragments/filters/impress8_draw.xcu
@@ -24,4 +24,7 @@
         <prop oor:name="Type"><value>draw8</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.presentation.PresentationDocument</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">ODF Drawing (Impress)</value>
+                    </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/impress8_draw_ui.xcu b/filter/source/config/fragments/filters/impress8_draw_ui.xcu
deleted file mode 100644
index a6743d0f3519..000000000000
--- a/filter/source/config/fragments/filters/impress8_draw_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="impress8_draw">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">ODF Drawing (Impress)</value>
-                    </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/impress8_template.xcu b/filter/source/config/fragments/filters/impress8_template.xcu
index fb3cf0c4f960..e2f4393d9b22 100644
--- a/filter/source/config/fragments/filters/impress8_template.xcu
+++ b/filter/source/config/fragments/filters/impress8_template.xcu
@@ -24,4 +24,7 @@
         <prop oor:name="Type"><value>impress8_template</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.presentation.PresentationDocument</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">ODF Presentation Template</value>
+                    </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/impress8_template_ui.xcu b/filter/source/config/fragments/filters/impress8_template_ui.xcu
deleted file mode 100644
index 67d2145e1d5a..000000000000
--- a/filter/source/config/fragments/filters/impress8_template_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="impress8_template">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">ODF Presentation Template</value>
-                    </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/impress8_ui.xcu b/filter/source/config/fragments/filters/impress8_ui.xcu
deleted file mode 100644
index 340b22c28a2e..000000000000
--- a/filter/source/config/fragments/filters/impress8_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="impress8">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">ODF Presentation</value>
-                    </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML.xcu b/filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML.xcu
index 14c3ca82a0f3..9571dbdb869f 100644
--- a/filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML.xcu
+++ b/filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML.xcu
@@ -24,4 +24,7 @@
     <prop oor:name="Type"><value>MS PowerPoint 2007 XML</value></prop>
     <prop oor:name="TemplateName"/>
     <prop oor:name="DocumentService"><value>com.sun.star.presentation.PresentationDocument</value></prop>
-</node>
+    <prop oor:name="UIName">
+        <value xml:lang="en-US">Microsoft PowerPoint 2007-2013 XML</value>
+    </prop>
+    </node>
diff --git a/filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_Template_ui.xcu b/filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_Template_ui.xcu
deleted file mode 100644
index 2c354f300387..000000000000
--- a/filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_Template_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-<node oor:name="Impress MS PowerPoint 2007 XML Template">
-    <prop oor:name="UIName">
-        <value xml:lang="en-US">Microsoft PowerPoint 2007-2013 XML Template</value>
-    </prop>
-</node>
diff --git a/filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_ui.xcu b/filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_ui.xcu
deleted file mode 100644
index af94961370b9..000000000000
--- a/filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-<node oor:name="Impress MS PowerPoint 2007 XML">
-    <prop oor:name="UIName">
-        <value xml:lang="en-US">Microsoft PowerPoint 2007-2013 XML</value>
-    </prop>
-</node>
diff --git a/filter/source/config/fragments/filters/impress_OOXML_Template_ui.xcu b/filter/source/config/fragments/filters/impress_OOXML_Template_ui.xcu
deleted file mode 100644
index 077c60ce1383..000000000000
--- a/filter/source/config/fragments/filters/impress_OOXML_Template_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-<node oor:name="Impress Office Open XML Template">
-    <prop oor:name="UIName">
-        <value xml:lang="en-US">Office Open XML Presentation Template</value>
-    </prop>
-</node>
diff --git a/filter/source/config/fragments/filters/impress_OOXML_ui.xcu b/filter/source/config/fragments/filters/impress_OOXML_ui.xcu
deleted file mode 100644
index 2c462ee6d49a..000000000000
--- a/filter/source/config/fragments/filters/impress_OOXML_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-<node oor:name="Impress Office Open XML">
-    <prop oor:name="UIName">
-        <value xml:lang="en-US">Office Open XML Presentation</value>
-    </prop>
-</node>
diff --git a/filter/source/config/fragments/filters/impress_StarOffice_XML_Draw.xcu b/filter/source/config/fragments/filters/impress_StarOffice_XML_Draw.xcu
index 5ae7d618f0cd..65ac76df6f52 100644
--- a/filter/source/config/fragments/filters/impress_StarOffice_XML_Draw.xcu
+++ b/filter/source/config/fragments/filters/impress_StarOffice_XML_Draw.xcu
@@ -24,4 +24,7 @@
         <prop oor:name="Type"><value>draw_StarOffice_XML_Draw</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.presentation.PresentationDocument</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">OpenOffice.org 1.0 Drawing (Impress)</value>
+        </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/impress_StarOffice_XML_Draw_ui.xcu b/filter/source/config/fragments/filters/impress_StarOffice_XML_Draw_ui.xcu
deleted file mode 100644
index 9f2a41ada9de..000000000000
--- a/filter/source/config/fragments/filters/impress_StarOffice_XML_Draw_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="impress_StarOffice_XML_Draw">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">OpenOffice.org 1.0 Drawing (Impress)</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/impress_StarOffice_XML_Impress_Template.xcu b/filter/source/config/fragments/filters/impress_StarOffice_XML_Impress_Template.xcu
index e558c4b112c4..02c142e66a15 100644
--- a/filter/source/config/fragments/filters/impress_StarOffice_XML_Impress_Template.xcu
+++ b/filter/source/config/fragments/filters/impress_StarOffice_XML_Impress_Template.xcu
@@ -24,4 +24,7 @@
         <prop oor:name="Type"><value>impress_StarOffice_XML_Impress_Template</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.presentation.PresentationDocument</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">OpenOffice.org 1.0 Presentation Template</value>
+        </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/impress_StarOffice_XML_Impress_Template_ui.xcu b/filter/source/config/fragments/filters/impress_StarOffice_XML_Impress_Template_ui.xcu
deleted file mode 100644
index 54e73b648d5d..000000000000
--- a/filter/source/config/fragments/filters/impress_StarOffice_XML_Impress_Template_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="impress_StarOffice_XML_Impress_Template">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">OpenOffice.org 1.0 Presentation Template</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/impress_html_Export.xcu b/filter/source/config/fragments/filters/impress_html_Export.xcu
index 30e35530c5e1..65a5c5dadf78 100644
--- a/filter/source/config/fragments/filters/impress_html_Export.xcu
+++ b/filter/source/config/fragments/filters/impress_html_Export.xcu
@@ -24,4 +24,7 @@
         <prop oor:name="Type"><value>graphic_HTML</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.presentation.PresentationDocument</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">HTML Document (Impress)</value>
+        </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/impress_html_Export_ui.xcu b/filter/source/config/fragments/filters/impress_html_Export_ui.xcu
deleted file mode 100644
index 3ea2d0a72ecb..000000000000
--- a/filter/source/config/fragments/filters/impress_html_Export_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="impress_html_Export">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">HTML Document (Impress)</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/math8.xcu b/filter/source/config/fragments/filters/math8.xcu
index cd588d2a8c1a..daefe874a4b3 100644
--- a/filter/source/config/fragments/filters/math8.xcu
+++ b/filter/source/config/fragments/filters/math8.xcu
@@ -24,4 +24,7 @@
         <prop oor:name="Type"><value>math8</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.formula.FormulaProperties</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">ODF Formula</value>
+                    </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/math8_ui.xcu b/filter/source/config/fragments/filters/math8_ui.xcu
deleted file mode 100644
index 80874e3b0133..000000000000
--- a/filter/source/config/fragments/filters/math8_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="math8">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">ODF Formula</value>
-                    </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/writer8.xcu b/filter/source/config/fragments/filters/writer8.xcu
index fd938e72ba13..410b3a77e717 100644
--- a/filter/source/config/fragments/filters/writer8.xcu
+++ b/filter/source/config/fragments/filters/writer8.xcu
@@ -24,4 +24,7 @@
         <prop oor:name="Type"><value>writer8</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.text.TextDocument</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">ODF Text Document</value>
+                    </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/writer8_template.xcu b/filter/source/config/fragments/filters/writer8_template.xcu
index 85940e5a7f97..286b907a7b97 100644
--- a/filter/source/config/fragments/filters/writer8_template.xcu
+++ b/filter/source/config/fragments/filters/writer8_template.xcu
@@ -24,4 +24,7 @@
         <prop oor:name="Type"><value>writer8_template</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.text.TextDocument</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">ODF Text Document Template</value>
+                    </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/writer8_template_ui.xcu b/filter/source/config/fragments/filters/writer8_template_ui.xcu
deleted file mode 100644
index 98e8037c1a23..000000000000
--- a/filter/source/config/fragments/filters/writer8_template_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="writer8_template">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">ODF Text Document Template</value>
-                    </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/writer8_ui.xcu b/filter/source/config/fragments/filters/writer8_ui.xcu
deleted file mode 100644
index 086a7961c08b..000000000000
--- a/filter/source/config/fragments/filters/writer8_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="writer8">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">ODF Text Document</value>
-                    </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/writer_StarOffice_XML_Writer_Template.xcu b/filter/source/config/fragments/filters/writer_StarOffice_XML_Writer_Template.xcu
index d7b69010adc3..fc0066a4ca61 100644
--- a/filter/source/config/fragments/filters/writer_StarOffice_XML_Writer_Template.xcu
+++ b/filter/source/config/fragments/filters/writer_StarOffice_XML_Writer_Template.xcu
@@ -24,4 +24,7 @@
         <prop oor:name="Type"><value>writer_StarOffice_XML_Writer_Template</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.text.TextDocument</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">OpenOffice.org 1.0 Text Document Template</value>
+        </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/writer_StarOffice_XML_Writer_Template_ui.xcu b/filter/source/config/fragments/filters/writer_StarOffice_XML_Writer_Template_ui.xcu
deleted file mode 100644
index 6420df815134..000000000000
--- a/filter/source/config/fragments/filters/writer_StarOffice_XML_Writer_Template_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="writer_StarOffice_XML_Writer_Template">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">OpenOffice.org 1.0 Text Document Template</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer.xcu b/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer.xcu
index 84187695077a..a01a61c5cbcb 100644
--- a/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer.xcu
+++ b/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer.xcu
@@ -24,4 +24,7 @@
         <prop oor:name="Type"><value>writer_StarOffice_XML_Writer</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.text.GlobalDocument</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">OpenOffice.org 1.0 Text Document</value>
+        </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_GlobalDocument.xcu b/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_GlobalDocument.xcu
index 2cabc30509ab..015aefe1711b 100644
--- a/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_GlobalDocument.xcu
+++ b/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_GlobalDocument.xcu
@@ -24,4 +24,7 @@
         <prop oor:name="Type"><value>writer_globaldocument_StarOffice_XML_Writer_GlobalDocument</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.text.GlobalDocument</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">OpenOffice.org 1.0 Master Document</value>
+        </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_GlobalDocument_ui.xcu b/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_GlobalDocument_ui.xcu
deleted file mode 100644
index 592f27b86d98..000000000000
--- a/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_GlobalDocument_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="writer_globaldocument_StarOffice_XML_Writer_GlobalDocument">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">OpenOffice.org 1.0 Master Document</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_ui.xcu b/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_ui.xcu
deleted file mode 100644
index 904c259556c7..000000000000
--- a/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="writer_globaldocument_StarOffice_XML_Writer">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">OpenOffice.org 1.0 Text Document</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer.xcu b/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer.xcu
index 803ff6201a4f..5cfbfc8919b4 100644
--- a/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer.xcu
+++ b/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer.xcu
@@ -24,4 +24,7 @@
         <prop oor:name="Type"><value>writer_StarOffice_XML_Writer</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.text.WebDocument</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">OpenOffice.org 1.0 Text Document (Writer/Web)</value>
+        </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_Web_Template.xcu b/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_Web_Template.xcu
index e3f38872f65a..70b6a8f59f76 100644
--- a/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_Web_Template.xcu
+++ b/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_Web_Template.xcu
@@ -24,4 +24,7 @@
         <prop oor:name="Type"><value>writer_web_StarOffice_XML_Writer_Web_Template</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.text.WebDocument</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">OpenOffice.org 1.0 HTML Template</value>
+        </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_Web_Template_ui.xcu b/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_Web_Template_ui.xcu
deleted file mode 100644
index 1965b431c478..000000000000
--- a/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_Web_Template_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="writer_web_StarOffice_XML_Writer_Web_Template">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">OpenOffice.org 1.0 HTML Template</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_ui.xcu b/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_ui.xcu
deleted file mode 100644
index 31d58339a098..000000000000
--- a/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="writer_web_StarOffice_XML_Writer">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">OpenOffice.org 1.0 Text Document (Writer/Web)</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/writerglobal8.xcu b/filter/source/config/fragments/filters/writerglobal8.xcu
index b6c89786204a..ea2594d07c5b 100644
--- a/filter/source/config/fragments/filters/writerglobal8.xcu
+++ b/filter/source/config/fragments/filters/writerglobal8.xcu
@@ -24,4 +24,7 @@
         <prop oor:name="Type"><value>writerglobal8</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.text.GlobalDocument</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">ODF Master Document</value>
+                    </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/writerglobal8_template.xcu b/filter/source/config/fragments/filters/writerglobal8_template.xcu
index 9cb8a8dcbae0..699006015ab5 100644
--- a/filter/source/config/fragments/filters/writerglobal8_template.xcu
+++ b/filter/source/config/fragments/filters/writerglobal8_template.xcu
@@ -14,4 +14,7 @@
         <prop oor:name="Type"><value>writerglobal8_template</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.text.GlobalDocument</value></prop>
+  <prop oor:name="UIName">
+    <value xml:lang="en-US">ODF Master Document Template</value>
+  </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/writerglobal8_template_ui.xcu b/filter/source/config/fragments/filters/writerglobal8_template_ui.xcu
deleted file mode 100644
index 305ae8d860f0..000000000000
--- a/filter/source/config/fragments/filters/writerglobal8_template_ui.xcu
+++ /dev/null
@@ -1,12 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
--->
-<node oor:name="writerglobal8_template">
-  <prop oor:name="UIName">
-    <value xml:lang="en-US">ODF Master Document Template</value>
-  </prop>
-</node>
diff --git a/filter/source/config/fragments/filters/writerglobal8_ui.xcu b/filter/source/config/fragments/filters/writerglobal8_ui.xcu
deleted file mode 100644
index 09146a6e35e1..000000000000
--- a/filter/source/config/fragments/filters/writerglobal8_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="writerglobal8">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">ODF Master Document</value>
-                    </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/writerglobal8_writer.xcu b/filter/source/config/fragments/filters/writerglobal8_writer.xcu
index 43074e9697e2..24d06b2122c3 100644
--- a/filter/source/config/fragments/filters/writerglobal8_writer.xcu
+++ b/filter/source/config/fragments/filters/writerglobal8_writer.xcu
@@ -24,4 +24,7 @@
         <prop oor:name="Type"><value>writer8</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.text.GlobalDocument</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">ODF Text Document</value>
+                    </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/writerglobal8_writer_ui.xcu b/filter/source/config/fragments/filters/writerglobal8_writer_ui.xcu
deleted file mode 100644
index c672033bdedc..000000000000
--- a/filter/source/config/fragments/filters/writerglobal8_writer_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="writerglobal8_writer">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">ODF Text Document</value>
-                    </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/writerweb8_writer.xcu b/filter/source/config/fragments/filters/writerweb8_writer.xcu
index 67faa856a23c..7e18ba6d9769 100644
--- a/filter/source/config/fragments/filters/writerweb8_writer.xcu
+++ b/filter/source/config/fragments/filters/writerweb8_writer.xcu
@@ -24,4 +24,7 @@
         <prop oor:name="Type"><value>writer8</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.text.WebDocument</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">Text (Writer/Web)</value>
+        </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/writerweb8_writer_template.xcu b/filter/source/config/fragments/filters/writerweb8_writer_template.xcu
index 451ce9406271..b6e9bbd3d88a 100644
--- a/filter/source/config/fragments/filters/writerweb8_writer_template.xcu
+++ b/filter/source/config/fragments/filters/writerweb8_writer_template.xcu
@@ -24,4 +24,7 @@
         <prop oor:name="Type"><value>writerweb8_writer_template</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.text.WebDocument</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">HTML Document Template</value>
+                    </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/writerweb8_writer_template_ui.xcu b/filter/source/config/fragments/filters/writerweb8_writer_template_ui.xcu
deleted file mode 100644
index cd256f8b2a1a..000000000000
--- a/filter/source/config/fragments/filters/writerweb8_writer_template_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="writerweb8_writer_template">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">HTML Document Template</value>
-                    </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/writerweb8_writer_ui.xcu b/filter/source/config/fragments/filters/writerweb8_writer_ui.xcu
deleted file mode 100644
index 2dda07cd6ffb..000000000000
--- a/filter/source/config/fragments/filters/writerweb8_writer_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="writerweb8_writer">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">Text (Writer/Web)</value>
-        </prop>
-    </node>
-- 
cgit