diff --git a/sw/CppunitTest_sw_subsequent_odftok.mk b/sw/CppunitTest_sw_subsequent_odfimport.mk
similarity index 81%
rename from sw/CppunitTest_sw_subsequent_odftok.mk
rename to sw/CppunitTest_sw_subsequent_odfimport.mk
index d1e3ad7b518b..006610e73964 100644
--- a/sw/CppunitTest_sw_subsequent_odftok.mk
+++ b/sw/CppunitTest_sw_subsequent_odfimport.mk
@@ -28,13 +28,13 @@
 # instead of those above.
 #*************************************************************************
 
-$(eval $(call gb_CppunitTest_CppunitTest,sw_subsequent_odftok))
+$(eval $(call gb_CppunitTest_CppunitTest,sw_subsequent_odfimport))
 
-$(eval $(call gb_CppunitTest_add_exception_objects,sw_subsequent_odftok, \
-    sw/qa/extras/odftok/odftok \
+$(eval $(call gb_CppunitTest_add_exception_objects,sw_subsequent_odfimport, \
+    sw/qa/extras/odfimport/odfimport \
 ))
 
-$(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_odftok, \
+$(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_odfimport, \
     cppu \
     cppuhelper \
     sal \
@@ -46,24 +46,24 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_odftok, \
     $(gb_STDLIBS) \
 ))
 
-$(eval $(call gb_CppunitTest_use_externals,sw_subsequent_odftok,\
+$(eval $(call gb_CppunitTest_use_externals,sw_subsequent_odfimport,\
     libxml2 \
 ))
 
-$(eval $(call gb_CppunitTest_set_include,sw_subsequent_odftok,\
+$(eval $(call gb_CppunitTest_set_include,sw_subsequent_odfimport,\
     -I$(SRCDIR)/sw/inc \
     -I$(SRCDIR)/sw/source/core/inc \
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,sw_subsequent_odftok,\
+$(eval $(call gb_CppunitTest_use_api,sw_subsequent_odfimport,\
     offapi \
     udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_use_ure,sw_subsequent_odftok))
+$(eval $(call gb_CppunitTest_use_ure,sw_subsequent_odfimport))
 
-$(eval $(call gb_CppunitTest_use_components,sw_subsequent_odftok,\
+$(eval $(call gb_CppunitTest_use_components,sw_subsequent_odfimport,\
     comphelper/util/comphelp \
     configmgr/source/configmgr \
     fileaccess/source/fileacc \
@@ -86,11 +86,11 @@ $(eval $(call gb_CppunitTest_use_components,sw_subsequent_odftok,\
     xmlhelp/util/ucpchelp1 \
 ))
 
-$(eval $(call gb_CppunitTest_use_configuration,sw_subsequent_odftok))
+$(eval $(call gb_CppunitTest_use_configuration,sw_subsequent_odfimport))
 
-$(eval $(call gb_CppunitTest_use_filter_configuration,sw_subsequent_odftok))
+$(eval $(call gb_CppunitTest_use_filter_configuration,sw_subsequent_odfimport))
 
-$(eval $(call gb_CppunitTest_use_extra_configuration,sw_subsequent_odftok,\
+$(eval $(call gb_CppunitTest_use_extra_configuration,sw_subsequent_odfimport,\
 	$(OUTDIR)/unittest/registry \
 ))
 
diff --git a/sw/CppunitTest_sw_subsequent_ooxmltok.mk b/sw/CppunitTest_sw_subsequent_ooxmlimport.mk
similarity index 81%
rename from sw/CppunitTest_sw_subsequent_ooxmltok.mk
rename to sw/CppunitTest_sw_subsequent_ooxmlimport.mk
index a1683c10bceb..8e5e3ef8c530 100644
--- a/sw/CppunitTest_sw_subsequent_ooxmltok.mk
+++ b/sw/CppunitTest_sw_subsequent_ooxmlimport.mk
@@ -28,13 +28,13 @@
 # instead of those above.
 #*************************************************************************
 
-$(eval $(call gb_CppunitTest_CppunitTest,sw_subsequent_ooxmltok))
+$(eval $(call gb_CppunitTest_CppunitTest,sw_subsequent_ooxmlimport))
 
-$(eval $(call gb_CppunitTest_add_exception_objects,sw_subsequent_ooxmltok, \
-    sw/qa/extras/ooxmltok/ooxmltok \
+$(eval $(call gb_CppunitTest_add_exception_objects,sw_subsequent_ooxmlimport, \
+    sw/qa/extras/ooxmlimport/ooxmlimport \
 ))
 
-$(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ooxmltok, \
+$(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ooxmlimport, \
     cppu \
     cppuhelper \
     sal \
@@ -45,24 +45,24 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ooxmltok, \
     $(gb_STDLIBS) \
 ))
 
-$(eval $(call gb_CppunitTest_use_externals,sw_subsequent_ooxmltok,\
+$(eval $(call gb_CppunitTest_use_externals,sw_subsequent_ooxmlimport,\
     libxml2 \
 ))
 
-$(eval $(call gb_CppunitTest_set_include,sw_subsequent_ooxmltok,\
+$(eval $(call gb_CppunitTest_set_include,sw_subsequent_ooxmlimport,\
     -I$(SRCDIR)/sw/inc \
     -I$(SRCDIR)/sw/source/core/inc \
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,sw_subsequent_ooxmltok,\
+$(eval $(call gb_CppunitTest_use_api,sw_subsequent_ooxmlimport,\
     offapi \
     udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_use_ure,sw_subsequent_ooxmltok))
+$(eval $(call gb_CppunitTest_use_ure,sw_subsequent_ooxmlimport))
 
-$(eval $(call gb_CppunitTest_use_components,sw_subsequent_ooxmltok,\
+$(eval $(call gb_CppunitTest_use_components,sw_subsequent_ooxmlimport,\
     comphelper/util/comphelp \
     configmgr/source/configmgr \
     fileaccess/source/fileacc \
@@ -88,11 +88,11 @@ $(eval $(call gb_CppunitTest_use_components,sw_subsequent_ooxmltok,\
     writerfilter/util/writerfilter \
 ))
 
-$(eval $(call gb_CppunitTest_use_configuration,sw_subsequent_ooxmltok))
+$(eval $(call gb_CppunitTest_use_configuration,sw_subsequent_ooxmlimport))
 
-$(eval $(call gb_CppunitTest_use_filter_configuration,sw_subsequent_ooxmltok))
+$(eval $(call gb_CppunitTest_use_filter_configuration,sw_subsequent_ooxmlimport))
 
-$(eval $(call gb_CppunitTest_use_extra_configuration,sw_subsequent_ooxmltok,\
+$(eval $(call gb_CppunitTest_use_extra_configuration,sw_subsequent_ooxmlimport,\
 	$(OUTDIR)/unittest/registry \
 ))
 
diff --git a/sw/CppunitTest_sw_subsequent_rtftok.mk b/sw/CppunitTest_sw_subsequent_rtfimport.mk
similarity index 81%
rename from sw/CppunitTest_sw_subsequent_rtftok.mk
rename to sw/CppunitTest_sw_subsequent_rtfimport.mk
index 15a685178e48..33b23036f0d7 100644
--- a/sw/CppunitTest_sw_subsequent_rtftok.mk
+++ b/sw/CppunitTest_sw_subsequent_rtfimport.mk
@@ -28,13 +28,13 @@
 # instead of those above.
 #*************************************************************************
 
-$(eval $(call gb_CppunitTest_CppunitTest,sw_subsequent_rtftok))
+$(eval $(call gb_CppunitTest_CppunitTest,sw_subsequent_rtfimport))
 
-$(eval $(call gb_CppunitTest_add_exception_objects,sw_subsequent_rtftok, \
-    sw/qa/extras/rtftok/rtftok \
+$(eval $(call gb_CppunitTest_add_exception_objects,sw_subsequent_rtfimport, \
+    sw/qa/extras/rtfimport/rtfimport \
 ))
 
-$(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_rtftok, \
+$(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_rtfimport, \
     cppu \
     cppuhelper \
     sal \
@@ -46,24 +46,24 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_rtftok, \
     $(gb_STDLIBS) \
 ))
 
-$(eval $(call gb_CppunitTest_use_externals,sw_subsequent_rtftok,\
+$(eval $(call gb_CppunitTest_use_externals,sw_subsequent_rtfimport,\
     libxml2 \
 ))
 
-$(eval $(call gb_CppunitTest_set_include,sw_subsequent_rtftok,\
+$(eval $(call gb_CppunitTest_set_include,sw_subsequent_rtfimport,\
     -I$(SRCDIR)/sw/inc \
     -I$(SRCDIR)/sw/source/core/inc \
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,sw_subsequent_rtftok,\
+$(eval $(call gb_CppunitTest_use_api,sw_subsequent_rtfimport,\
     offapi \
     udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_use_ure,sw_subsequent_rtftok))
+$(eval $(call gb_CppunitTest_use_ure,sw_subsequent_rtfimport))
 
-$(eval $(call gb_CppunitTest_use_components,sw_subsequent_rtftok,\
+$(eval $(call gb_CppunitTest_use_components,sw_subsequent_rtfimport,\
 	comphelper/util/comphelp \
     configmgr/source/configmgr \
     fileaccess/source/fileacc \
@@ -84,11 +84,11 @@ $(eval $(call gb_CppunitTest_use_components,sw_subsequent_rtftok,\
 	writerfilter/util/writerfilter \
 ))
 
-$(eval $(call gb_CppunitTest_use_configuration,sw_subsequent_rtftok))
+$(eval $(call gb_CppunitTest_use_configuration,sw_subsequent_rtfimport))
 
-$(eval $(call gb_CppunitTest_use_filter_configuration,sw_subsequent_rtftok))
+$(eval $(call gb_CppunitTest_use_filter_configuration,sw_subsequent_rtfimport))
 
-$(eval $(call gb_CppunitTest_use_extra_configuration,sw_subsequent_rtftok,\
+$(eval $(call gb_CppunitTest_use_extra_configuration,sw_subsequent_rtfimport,\
 	$(OUTDIR)/unittest/registry \
 ))
 
diff --git a/sw/CppunitTest_sw_subsequent_ww8tok.mk b/sw/CppunitTest_sw_subsequent_ww8import.mk
similarity index 82%
rename from sw/CppunitTest_sw_subsequent_ww8tok.mk
rename to sw/CppunitTest_sw_subsequent_ww8import.mk
index d95bfa60a51b..cb947e4d9833 100644
--- a/sw/CppunitTest_sw_subsequent_ww8tok.mk
+++ b/sw/CppunitTest_sw_subsequent_ww8import.mk
@@ -28,13 +28,13 @@
 # instead of those above.
 #*************************************************************************
 
-$(eval $(call gb_CppunitTest_CppunitTest,sw_subsequent_ww8tok))
+$(eval $(call gb_CppunitTest_CppunitTest,sw_subsequent_ww8import))
 
-$(eval $(call gb_CppunitTest_add_exception_objects,sw_subsequent_ww8tok, \
-    sw/qa/extras/ww8tok/ww8tok \
+$(eval $(call gb_CppunitTest_add_exception_objects,sw_subsequent_ww8import, \
+    sw/qa/extras/ww8import/ww8import \
 ))
 
-$(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ww8tok, \
+$(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ww8import, \
     cppu \
     cppuhelper \
     sal \
@@ -44,24 +44,24 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ww8tok, \
     $(gb_STDLIBS) \
 ))
 
-$(eval $(call gb_CppunitTest_use_externals,sw_subsequent_ww8tok,\
+$(eval $(call gb_CppunitTest_use_externals,sw_subsequent_ww8import,\
     libxml2 \
 ))
 
-$(eval $(call gb_CppunitTest_set_include,sw_subsequent_ww8tok,\
+$(eval $(call gb_CppunitTest_set_include,sw_subsequent_ww8import,\
     -I$(SRCDIR)/sw/inc \
     -I$(SRCDIR)/sw/source/core/inc \
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,sw_subsequent_ww8tok,\
+$(eval $(call gb_CppunitTest_use_api,sw_subsequent_ww8import,\
     offapi \
     udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_use_ure,sw_subsequent_ww8tok))
+$(eval $(call gb_CppunitTest_use_ure,sw_subsequent_ww8import))
 
-$(eval $(call gb_CppunitTest_use_components,sw_subsequent_ww8tok,\
+$(eval $(call gb_CppunitTest_use_components,sw_subsequent_ww8import,\
     comphelper/util/comphelp \
     configmgr/source/configmgr \
     dbaccess/util/dba \
@@ -85,11 +85,11 @@ $(eval $(call gb_CppunitTest_use_components,sw_subsequent_ww8tok,\
         xmlhelp/util/ucpchelp1) \
 ))
 
-$(eval $(call gb_CppunitTest_use_configuration,sw_subsequent_ww8tok))
+$(eval $(call gb_CppunitTest_use_configuration,sw_subsequent_ww8import))
 
-$(eval $(call gb_CppunitTest_use_filter_configuration,sw_subsequent_ww8tok))
+$(eval $(call gb_CppunitTest_use_filter_configuration,sw_subsequent_ww8import))
 
-$(eval $(call gb_CppunitTest_use_extra_configuration,sw_subsequent_ww8tok,\
+$(eval $(call gb_CppunitTest_use_extra_configuration,sw_subsequent_ww8import,\
 	$(OUTDIR)/unittest/registry \
 ))
 
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 06cda0a4de3d..0f9d9c523722 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -55,12 +55,12 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\
     CppunitTest_sw_filters_test \
     CppunitTest_sw_macros_test \
     CppunitTest_sw_subsequent_ooxmlexport \
-    CppunitTest_sw_subsequent_ooxmltok \
+    CppunitTest_sw_subsequent_ooxmlimport \
     CppunitTest_sw_subsequent_ww8export \
-    CppunitTest_sw_subsequent_ww8tok \
+    CppunitTest_sw_subsequent_ww8import \
     CppunitTest_sw_subsequent_rtfexport \
-    CppunitTest_sw_subsequent_rtftok \
-    CppunitTest_sw_subsequent_odftok \
+    CppunitTest_sw_subsequent_rtfimport \
+    CppunitTest_sw_subsequent_odfimport \
 ))
 
 $(eval $(call gb_Module_add_subsequentcheck_targets,sw,\
diff --git a/sw/qa/extras/odftok/data/hello.odt b/sw/qa/extras/odfimport/data/hello.odt
similarity index 100%
rename from sw/qa/extras/odftok/data/hello.odt
rename to sw/qa/extras/odfimport/data/hello.odt
diff --git a/sw/qa/extras/odftok/odftok.cxx b/sw/qa/extras/odfimport/odfimport.cxx
similarity index 98%
rename from sw/qa/extras/odftok/odftok.cxx
rename to sw/qa/extras/odfimport/odfimport.cxx
index bb62a18c8808..d4738932d8e2 100644
--- a/sw/qa/extras/odftok/odftok.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -49,7 +49,7 @@ private:
 
 void Test::load(const OUString& rFilename)
 {
-    mxComponent = loadFromDesktop(getURLFromSrc("/sw/qa/extras/odftok/data/") + rFilename);
+    mxComponent = loadFromDesktop(getURLFromSrc("/sw/qa/extras/odfimport/data/") + rFilename);
 }
 
 void Test::testHello()
diff --git a/sw/qa/extras/ooxmltok/data/fdo49940.docx b/sw/qa/extras/ooxmlimport/data/fdo49940.docx
similarity index 100%
rename from sw/qa/extras/ooxmltok/data/fdo49940.docx
rename to sw/qa/extras/ooxmlimport/data/fdo49940.docx
diff --git a/sw/qa/extras/ooxmltok/data/n652364.docx b/sw/qa/extras/ooxmlimport/data/n652364.docx
similarity index 100%
rename from sw/qa/extras/ooxmltok/data/n652364.docx
rename to sw/qa/extras/ooxmlimport/data/n652364.docx
diff --git a/sw/qa/extras/ooxmltok/data/n693238.docx b/sw/qa/extras/ooxmlimport/data/n693238.docx
similarity index 100%
rename from sw/qa/extras/ooxmltok/data/n693238.docx
rename to sw/qa/extras/ooxmlimport/data/n693238.docx
diff --git a/sw/qa/extras/ooxmltok/data/n705956-1.docx b/sw/qa/extras/ooxmlimport/data/n705956-1.docx
similarity index 100%
rename from sw/qa/extras/ooxmltok/data/n705956-1.docx
rename to sw/qa/extras/ooxmlimport/data/n705956-1.docx
diff --git a/sw/qa/extras/ooxmltok/data/n705956-2.docx b/sw/qa/extras/ooxmlimport/data/n705956-2.docx
similarity index 100%
rename from sw/qa/extras/ooxmltok/data/n705956-2.docx
rename to sw/qa/extras/ooxmlimport/data/n705956-2.docx
diff --git a/sw/qa/extras/ooxmltok/data/n747461.docx b/sw/qa/extras/ooxmlimport/data/n747461.docx
similarity index 100%
rename from sw/qa/extras/ooxmltok/data/n747461.docx
rename to sw/qa/extras/ooxmlimport/data/n747461.docx
diff --git a/sw/qa/extras/ooxmltok/data/n750255.docx b/sw/qa/extras/ooxmlimport/data/n750255.docx
similarity index 100%
rename from sw/qa/extras/ooxmltok/data/n750255.docx
rename to sw/qa/extras/ooxmlimport/data/n750255.docx
diff --git a/sw/qa/extras/ooxmltok/data/n750935.docx b/sw/qa/extras/ooxmlimport/data/n750935.docx
similarity index 100%
rename from sw/qa/extras/ooxmltok/data/n750935.docx
rename to sw/qa/extras/ooxmlimport/data/n750935.docx
diff --git a/sw/qa/extras/ooxmltok/data/n751017.docx b/sw/qa/extras/ooxmlimport/data/n751017.docx
similarity index 100%
rename from sw/qa/extras/ooxmltok/data/n751017.docx
rename to sw/qa/extras/ooxmlimport/data/n751017.docx
diff --git a/sw/qa/extras/ooxmltok/data/n751054.docx b/sw/qa/extras/ooxmlimport/data/n751054.docx
similarity index 100%
rename from sw/qa/extras/ooxmltok/data/n751054.docx
rename to sw/qa/extras/ooxmlimport/data/n751054.docx
diff --git a/sw/qa/extras/ooxmltok/data/n751077.docx b/sw/qa/extras/ooxmlimport/data/n751077.docx
similarity index 100%
rename from sw/qa/extras/ooxmltok/data/n751077.docx
rename to sw/qa/extras/ooxmlimport/data/n751077.docx
diff --git a/sw/qa/extras/ooxmltok/data/n751117.docx b/sw/qa/extras/ooxmlimport/data/n751117.docx
similarity index 100%
rename from sw/qa/extras/ooxmltok/data/n751117.docx
rename to sw/qa/extras/ooxmlimport/data/n751117.docx
diff --git a/sw/qa/extras/ooxmltok/data/n757890.docx b/sw/qa/extras/ooxmlimport/data/n757890.docx
similarity index 100%
rename from sw/qa/extras/ooxmltok/data/n757890.docx
rename to sw/qa/extras/ooxmlimport/data/n757890.docx
diff --git a/sw/qa/extras/ooxmltok/data/n758883.docx b/sw/qa/extras/ooxmlimport/data/n758883.docx
similarity index 100%
rename from sw/qa/extras/ooxmltok/data/n758883.docx
rename to sw/qa/extras/ooxmlimport/data/n758883.docx
diff --git a/sw/qa/extras/ooxmltok/data/n760764.docx b/sw/qa/extras/ooxmlimport/data/n760764.docx
similarity index 100%
rename from sw/qa/extras/ooxmltok/data/n760764.docx
rename to sw/qa/extras/ooxmlimport/data/n760764.docx
diff --git a/sw/qa/extras/ooxmltok/data/n764005.docx b/sw/qa/extras/ooxmlimport/data/n764005.docx
similarity index 100%
rename from sw/qa/extras/ooxmltok/data/n764005.docx
rename to sw/qa/extras/ooxmlimport/data/n764005.docx
diff --git a/sw/qa/extras/ooxmltok/data/n764745-alignment.docx b/sw/qa/extras/ooxmlimport/data/n764745-alignment.docx
similarity index 100%
rename from sw/qa/extras/ooxmltok/data/n764745-alignment.docx
rename to sw/qa/extras/ooxmlimport/data/n764745-alignment.docx
diff --git a/sw/qa/extras/ooxmltok/data/n766477.docx b/sw/qa/extras/ooxmlimport/data/n766477.docx
similarity index 100%
rename from sw/qa/extras/ooxmltok/data/n766477.docx
rename to sw/qa/extras/ooxmlimport/data/n766477.docx
diff --git a/sw/qa/extras/ooxmltok/data/n766481.docx b/sw/qa/extras/ooxmlimport/data/n766481.docx
similarity index 100%
rename from sw/qa/extras/ooxmltok/data/n766481.docx
rename to sw/qa/extras/ooxmlimport/data/n766481.docx
diff --git a/sw/qa/extras/ooxmltok/data/n766487.docx b/sw/qa/extras/ooxmlimport/data/n766487.docx
similarity index 100%
rename from sw/qa/extras/ooxmltok/data/n766487.docx
rename to sw/qa/extras/ooxmlimport/data/n766487.docx
diff --git a/sw/qa/extras/ooxmltok/data/numbering1.docx b/sw/qa/extras/ooxmlimport/data/numbering1.docx
similarity index 100%
rename from sw/qa/extras/ooxmltok/data/numbering1.docx
rename to sw/qa/extras/ooxmlimport/data/numbering1.docx
diff --git a/sw/qa/extras/ooxmltok/data/smartart.docx b/sw/qa/extras/ooxmlimport/data/smartart.docx
similarity index 100%
rename from sw/qa/extras/ooxmltok/data/smartart.docx
rename to sw/qa/extras/ooxmlimport/data/smartart.docx
diff --git a/sw/qa/extras/ooxmltok/ooxmltok.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
similarity index 99%
rename from sw/qa/extras/ooxmltok/ooxmltok.cxx
rename to sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 28f8dfb483a6..fab93b127c43 100644
--- a/sw/qa/extras/ooxmltok/ooxmltok.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -112,7 +112,7 @@ private:
 
 void Test::load(const OUString& rFilename)
 {
-    mxComponent = loadFromDesktop(getURLFromSrc("/sw/qa/extras/ooxmltok/data/") + rFilename);
+    mxComponent = loadFromDesktop(getURLFromSrc("/sw/qa/extras/ooxmlimport/data/") + rFilename);
 }
 
 void Test::testN751054()
diff --git a/sw/qa/extras/rtftok/data/fdo38786.rtf b/sw/qa/extras/rtfimport/data/fdo38786.rtf
similarity index 100%
rename from sw/qa/extras/rtftok/data/fdo38786.rtf
rename to sw/qa/extras/rtfimport/data/fdo38786.rtf
diff --git a/sw/qa/extras/rtftok/data/fdo39053.rtf b/sw/qa/extras/rtfimport/data/fdo39053.rtf
similarity index 100%
rename from sw/qa/extras/rtftok/data/fdo39053.rtf
rename to sw/qa/extras/rtfimport/data/fdo39053.rtf
diff --git a/sw/qa/extras/rtftok/data/fdo42465.rtf b/sw/qa/extras/rtfimport/data/fdo42465.rtf
similarity index 100%
rename from sw/qa/extras/rtftok/data/fdo42465.rtf
rename to sw/qa/extras/rtfimport/data/fdo42465.rtf
diff --git a/sw/qa/extras/rtftok/data/fdo43965.rtf b/sw/qa/extras/rtfimport/data/fdo43965.rtf
similarity index 100%
rename from sw/qa/extras/rtftok/data/fdo43965.rtf
rename to sw/qa/extras/rtfimport/data/fdo43965.rtf
diff --git a/sw/qa/extras/rtftok/data/fdo44176.rtf b/sw/qa/extras/rtfimport/data/fdo44176.rtf
similarity index 100%
rename from sw/qa/extras/rtftok/data/fdo44176.rtf
rename to sw/qa/extras/rtfimport/data/fdo44176.rtf
diff --git a/sw/qa/extras/rtftok/data/fdo44211.rtf b/sw/qa/extras/rtfimport/data/fdo44211.rtf
similarity index 100%
rename from sw/qa/extras/rtftok/data/fdo44211.rtf
rename to sw/qa/extras/rtfimport/data/fdo44211.rtf
diff --git a/sw/qa/extras/rtftok/data/fdo45182.rtf b/sw/qa/extras/rtfimport/data/fdo45182.rtf
similarity index 100%
rename from sw/qa/extras/rtftok/data/fdo45182.rtf
rename to sw/qa/extras/rtfimport/data/fdo45182.rtf
diff --git a/sw/qa/extras/rtftok/data/fdo45187.rtf b/sw/qa/extras/rtfimport/data/fdo45187.rtf
similarity index 100%
rename from sw/qa/extras/rtftok/data/fdo45187.rtf
rename to sw/qa/extras/rtfimport/data/fdo45187.rtf
diff --git a/sw/qa/extras/rtftok/data/fdo45190.rtf b/sw/qa/extras/rtfimport/data/fdo45190.rtf
similarity index 100%
rename from sw/qa/extras/rtftok/data/fdo45190.rtf
rename to sw/qa/extras/rtfimport/data/fdo45190.rtf
diff --git a/sw/qa/extras/rtftok/data/fdo45394.rtf b/sw/qa/extras/rtfimport/data/fdo45394.rtf
similarity index 100%
rename from sw/qa/extras/rtftok/data/fdo45394.rtf
rename to sw/qa/extras/rtfimport/data/fdo45394.rtf
diff --git a/sw/qa/extras/rtftok/data/fdo45543.rtf b/sw/qa/extras/rtfimport/data/fdo45543.rtf
similarity index 100%
rename from sw/qa/extras/rtftok/data/fdo45543.rtf
rename to sw/qa/extras/rtfimport/data/fdo45543.rtf
diff --git a/sw/qa/extras/rtftok/data/fdo45553.rtf b/sw/qa/extras/rtfimport/data/fdo45553.rtf
similarity index 100%
rename from sw/qa/extras/rtftok/data/fdo45553.rtf
rename to sw/qa/extras/rtfimport/data/fdo45553.rtf
diff --git a/sw/qa/extras/rtftok/data/fdo45563.rtf b/sw/qa/extras/rtfimport/data/fdo45563.rtf
similarity index 100%
rename from sw/qa/extras/rtftok/data/fdo45563.rtf
rename to sw/qa/extras/rtfimport/data/fdo45563.rtf
diff --git a/sw/qa/extras/rtftok/data/fdo46662.rtf b/sw/qa/extras/rtfimport/data/fdo46662.rtf
similarity index 100%
rename from sw/qa/extras/rtftok/data/fdo46662.rtf
rename to sw/qa/extras/rtfimport/data/fdo46662.rtf
diff --git a/sw/qa/extras/rtftok/data/fdo46955.rtf b/sw/qa/extras/rtfimport/data/fdo46955.rtf
similarity index 100%
rename from sw/qa/extras/rtftok/data/fdo46955.rtf
rename to sw/qa/extras/rtfimport/data/fdo46955.rtf
diff --git a/sw/qa/extras/rtftok/data/fdo46966.rtf b/sw/qa/extras/rtfimport/data/fdo46966.rtf
similarity index 100%
rename from sw/qa/extras/rtftok/data/fdo46966.rtf
rename to sw/qa/extras/rtfimport/data/fdo46966.rtf
diff --git a/sw/qa/extras/rtftok/data/fdo47036.rtf b/sw/qa/extras/rtfimport/data/fdo47036.rtf
similarity index 100%
rename from sw/qa/extras/rtftok/data/fdo47036.rtf
rename to sw/qa/extras/rtfimport/data/fdo47036.rtf
diff --git a/sw/qa/extras/rtftok/data/fdo47107.rtf b/sw/qa/extras/rtfimport/data/fdo47107.rtf
similarity index 100%
rename from sw/qa/extras/rtftok/data/fdo47107.rtf
rename to sw/qa/extras/rtfimport/data/fdo47107.rtf
diff --git a/sw/qa/extras/rtftok/data/fdo47326.rtf b/sw/qa/extras/rtfimport/data/fdo47326.rtf
similarity index 100%
rename from sw/qa/extras/rtftok/data/fdo47326.rtf
rename to sw/qa/extras/rtfimport/data/fdo47326.rtf
diff --git a/sw/qa/extras/rtftok/data/fdo47764.rtf b/sw/qa/extras/rtfimport/data/fdo47764.rtf
similarity index 100%
rename from sw/qa/extras/rtftok/data/fdo47764.rtf
rename to sw/qa/extras/rtfimport/data/fdo47764.rtf
diff --git a/sw/qa/extras/rtftok/data/fdo48023.rtf b/sw/qa/extras/rtfimport/data/fdo48023.rtf
similarity index 100%
rename from sw/qa/extras/rtftok/data/fdo48023.rtf
rename to sw/qa/extras/rtfimport/data/fdo48023.rtf
diff --git a/sw/qa/extras/rtftok/data/fdo48037.rtf b/sw/qa/extras/rtfimport/data/fdo48037.rtf
similarity index 100%
rename from sw/qa/extras/rtftok/data/fdo48037.rtf
rename to sw/qa/extras/rtfimport/data/fdo48037.rtf
diff --git a/sw/qa/extras/rtftok/data/fdo48104.rtf b/sw/qa/extras/rtfimport/data/fdo48104.rtf
similarity index 100%
rename from sw/qa/extras/rtftok/data/fdo48104.rtf
rename to sw/qa/extras/rtfimport/data/fdo48104.rtf
diff --git a/sw/qa/extras/rtftok/data/fdo48193.rtf b/sw/qa/extras/rtfimport/data/fdo48193.rtf
similarity index 100%
rename from sw/qa/extras/rtftok/data/fdo48193.rtf
rename to sw/qa/extras/rtfimport/data/fdo48193.rtf
diff --git a/sw/qa/extras/rtftok/data/fdo48356.rtf b/sw/qa/extras/rtfimport/data/fdo48356.rtf
similarity index 100%
rename from sw/qa/extras/rtftok/data/fdo48356.rtf
rename to sw/qa/extras/rtfimport/data/fdo48356.rtf
diff --git a/sw/qa/extras/rtftok/data/fdo48876.rtf b/sw/qa/extras/rtfimport/data/fdo48876.rtf
similarity index 100%
rename from sw/qa/extras/rtftok/data/fdo48876.rtf
rename to sw/qa/extras/rtfimport/data/fdo48876.rtf
diff --git a/sw/qa/extras/rtftok/data/fdo49271.rtf b/sw/qa/extras/rtfimport/data/fdo49271.rtf
similarity index 100%
rename from sw/qa/extras/rtftok/data/fdo49271.rtf
rename to sw/qa/extras/rtfimport/data/fdo49271.rtf
diff --git a/sw/qa/extras/rtftok/data/fdo49501.rtf b/sw/qa/extras/rtfimport/data/fdo49501.rtf
similarity index 100%
rename from sw/qa/extras/rtftok/data/fdo49501.rtf
rename to sw/qa/extras/rtfimport/data/fdo49501.rtf
diff --git a/sw/qa/extras/rtftok/data/fdo49659.rtf b/sw/qa/extras/rtfimport/data/fdo49659.rtf
similarity index 100%
rename from sw/qa/extras/rtftok/data/fdo49659.rtf
rename to sw/qa/extras/rtfimport/data/fdo49659.rtf
diff --git a/sw/qa/extras/rtftok/data/fdo49692.rtf b/sw/qa/extras/rtfimport/data/fdo49692.rtf
similarity index 100%
rename from sw/qa/extras/rtftok/data/fdo49692.rtf
rename to sw/qa/extras/rtfimport/data/fdo49692.rtf
diff --git a/sw/qa/extras/rtftok/data/fdo50539.rtf b/sw/qa/extras/rtfimport/data/fdo50539.rtf
similarity index 100%
rename from sw/qa/extras/rtftok/data/fdo50539.rtf
rename to sw/qa/extras/rtfimport/data/fdo50539.rtf
diff --git a/sw/qa/extras/rtftok/data/fdo50665.rtf b/sw/qa/extras/rtfimport/data/fdo50665.rtf
similarity index 100%
rename from sw/qa/extras/rtftok/data/fdo50665.rtf
rename to sw/qa/extras/rtfimport/data/fdo50665.rtf
diff --git a/sw/qa/extras/rtftok/data/n192129.rtf b/sw/qa/extras/rtfimport/data/n192129.rtf
similarity index 100%
rename from sw/qa/extras/rtftok/data/n192129.rtf
rename to sw/qa/extras/rtfimport/data/n192129.rtf
diff --git a/sw/qa/extras/rtftok/data/n695479.rtf b/sw/qa/extras/rtfimport/data/n695479.rtf
similarity index 100%
rename from sw/qa/extras/rtftok/data/n695479.rtf
rename to sw/qa/extras/rtfimport/data/n695479.rtf
diff --git a/sw/qa/extras/rtftok/data/n750757.rtf b/sw/qa/extras/rtfimport/data/n750757.rtf
similarity index 100%
rename from sw/qa/extras/rtftok/data/n750757.rtf
rename to sw/qa/extras/rtfimport/data/n750757.rtf
diff --git a/sw/qa/extras/rtftok/data/n751020.rtf b/sw/qa/extras/rtfimport/data/n751020.rtf
similarity index 100%
rename from sw/qa/extras/rtftok/data/n751020.rtf
rename to sw/qa/extras/rtfimport/data/n751020.rtf
diff --git a/sw/qa/extras/rtftok/data/n757651.rtf b/sw/qa/extras/rtfimport/data/n757651.rtf
similarity index 100%
rename from sw/qa/extras/rtftok/data/n757651.rtf
rename to sw/qa/extras/rtfimport/data/n757651.rtf
diff --git a/sw/qa/extras/rtftok/rtftok.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx
similarity index 99%
rename from sw/qa/extras/rtftok/rtftok.cxx
rename to sw/qa/extras/rtfimport/rtfimport.cxx
index fef82e2f19fa..cb5a584503e0 100644
--- a/sw/qa/extras/rtftok/rtftok.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -149,7 +149,7 @@ private:
 
 void Test::load(const OUString& rFilename)
 {
-    mxComponent = loadFromDesktop(getURLFromSrc("/sw/qa/extras/rtftok/data/") + rFilename);
+    mxComponent = loadFromDesktop(getURLFromSrc("/sw/qa/extras/rtfimport/data/") + rFilename);
 }
 
 int Test::getPages()
diff --git a/sw/qa/extras/ww8tok/data/n652364.doc b/sw/qa/extras/ww8import/data/n652364.doc
similarity index 100%
rename from sw/qa/extras/ww8tok/data/n652364.doc
rename to sw/qa/extras/ww8import/data/n652364.doc
diff --git a/sw/qa/extras/ww8tok/data/n750255.doc b/sw/qa/extras/ww8import/data/n750255.doc
similarity index 100%
rename from sw/qa/extras/ww8tok/data/n750255.doc
rename to sw/qa/extras/ww8import/data/n750255.doc
diff --git a/sw/qa/extras/ww8tok/data/n757118.doc b/sw/qa/extras/ww8import/data/n757118.doc
similarity index 100%
rename from sw/qa/extras/ww8tok/data/n757118.doc
rename to sw/qa/extras/ww8import/data/n757118.doc
diff --git a/sw/qa/extras/ww8tok/data/n757905.doc b/sw/qa/extras/ww8import/data/n757905.doc
similarity index 100%
rename from sw/qa/extras/ww8tok/data/n757905.doc
rename to sw/qa/extras/ww8import/data/n757905.doc
diff --git a/sw/qa/extras/ww8tok/data/n757910.doc b/sw/qa/extras/ww8import/data/n757910.doc
similarity index 100%
rename from sw/qa/extras/ww8tok/data/n757910.doc
rename to sw/qa/extras/ww8import/data/n757910.doc
diff --git a/sw/qa/extras/ww8tok/data/n760294.doc b/sw/qa/extras/ww8import/data/n760294.doc
similarity index 100%
rename from sw/qa/extras/ww8tok/data/n760294.doc
rename to sw/qa/extras/ww8import/data/n760294.doc
diff --git a/sw/qa/extras/ww8tok/ww8tok.cxx b/sw/qa/extras/ww8import/ww8import.cxx
similarity index 99%
rename from sw/qa/extras/ww8tok/ww8tok.cxx
rename to sw/qa/extras/ww8import/ww8import.cxx
index 53f90301e157..a3bdb978dba6 100644
--- a/sw/qa/extras/ww8tok/ww8tok.cxx
+++ b/sw/qa/extras/ww8import/ww8import.cxx
@@ -68,7 +68,7 @@ private:
 
 void Test::load(const OUString& rFilename)
 {
-    mxComponent = loadFromDesktop(getURLFromSrc("/sw/qa/extras/ww8tok/data/") + rFilename);
+    mxComponent = loadFromDesktop(getURLFromSrc("/sw/qa/extras/ww8import/data/") + rFilename);
 }
 
 void Test::testN757910()