From 0dbf1378ba1006a71293549cded9a5e998f4435c Mon Sep 17 00:00:00 2001
From: Anja Leichsenring <aleichsenring@ab-softlab.de>
Date: Wed, 17 Nov 2021 10:25:00 +0100
Subject: [PATCH] [TASK] Extract ext:test_irre_foreignfield from
 ext:irre_tutorial
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

For easier testing, ext:irre_tutorial "foreignfield" setup
is extracted to a dedicated extension.
Tests concerning these tables can now load the smaller
test extension, which reduces system load and simplifies
maintenance.

Resolves: #95952
Releases: master, 11.5
Change-Id: I6fc581ac20821a4dcaff724cef4b3768e7f33dec
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/72208
Tested-by: core-ci <typo3@b13.com>
Tested-by: Stefan Bürk <stefan@buerk.tech>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Stefan Bürk <stefan@buerk.tech>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
---
 .../Category/OneToOne/Modify/ActionTest.php   |   1 -
 .../DataSet/LiveDefaultElements.csv           |  16 +-
 .../DataHandler/DefaultValuesTest.php         |   1 +
 .../DataHandler/GetUniqueTranslationTest.php  |   1 +
 .../DataHandling/DataHandler/HookTest.php     |   5 +-
 .../DataHandling/FlexformIrre/ActionTest.php  |   2 +-
 .../DataSet/LiveDefaultElements.csv           |   2 +-
 .../ForeignField/AbstractActionTestCase.php   |  22 +--
 .../ForeignField/DataSet/ImportDefault.csv    |  68 ++++----
 .../DataSet/changeParentContentSorting.csv    |  68 ++++----
 .../ForeignField/Modify/DataSet/copyPage.csv  | 126 +++++++-------
 .../copyPageWHotelBeforeParentContent.csv     | 126 +++++++-------
 .../Modify/DataSet/copyParentContent.csv      |  80 ++++-----
 .../copyParentContentToDifferentPage.csv      |  80 ++++-----
 ...opyParentContentToLanguageWAllChildren.csv |  80 ++++-----
 ...NCopyParentContentNHotelNOfferChildren.csv |  84 ++++-----
 ...alizeParentContentNHotelNOfferChildren.csv |  88 +++++-----
 ...entContentNHotelNOfferChildrenWOSortBy.csv |  88 +++++-----
 .../Modify/DataSet/createParentContent.csv    |  68 ++++----
 ...reateParentContentNHotelNOfferChildren.csv |  76 ++++-----
 .../Modify/DataSet/deletePage.csv             |  32 ++--
 .../Modify/DataSet/deleteParentContent.csv    |  62 +++----
 ...lineLocalizeSynchronizeLocalizeMissing.csv | 150 ++++++++--------
 .../localizeNCopyPageWSynchronization.csv     | 138 +++++++--------
 ...lotHotelChildNCopyPageWSynchronization.csv | 142 ++++++++--------
 .../localizePageNAddHotelChildWExclude.csv    |  78 ++++-----
 ...lizePageNAddHotelChildWSynchronization.csv |  80 ++++-----
 ...NAddMonoglotHotelChildWSynchronization.csv |  76 ++++-----
 .../DataSet/localizePageTwiceWExclude.csv     |  76 ++++-----
 .../Modify/DataSet/localizePageWExclude.csv   |  72 ++++----
 .../DataSet/localizePageWSynchronization.csv  |  74 ++++----
 ...SynchronizationAndCustomLocalizedHotel.csv |  76 ++++-----
 ...tentChainLanguageSynchronizationSource.csv | 124 +++++++-------
 ...NestedChildrenWLanguageSynchronization.csv | 118 ++++++-------
 .../localizeParentContentSynchronization.csv  |  88 +++++-----
 .../localizeParentContentWAllChildren.csv     |  86 +++++-----
 .../Modify/DataSet/modifyOnlyHotelChild.csv   |  68 ++++----
 .../Modify/DataSet/modifyPage.csv             |  68 ++++----
 .../Modify/DataSet/modifyParentContent.csv    |  68 ++++----
 .../DataSet/modifyParentNAddHotelChild.csv    |  72 ++++----
 ...odifyParentNChangeHotelChildrenSorting.csv |  68 ++++----
 .../DataSet/modifyParentNDeleteHotelChild.csv |  62 +++----
 .../DataSet/modifyParentNHotelChild.csv       |  68 ++++----
 .../moveParentContentToDifferentPage.csv      |  68 ++++----
 ...ntContentToDifferentPageNChangeSorting.csv |  68 ++++----
 .../ManyToMany/DataSet/ImportDefault.csv      |   6 +-
 .../Classes/Controller/QueueController.php    |   8 +-
 .../Extbase/Persistence/Classes.php           |  27 ---
 .../ExtensionBuilder/settings.yaml            |  97 -----------
 .../irre_tutorial/Configuration/Services.yaml |   1 -
 .../Configuration/TCA/Overrides/pages.php     |  27 ---
 .../TCA/Overrides/tt_content.php              |  45 -----
 .../TypoScript/constants.typoscript           |  15 --
 .../Configuration/TypoScript/setup.typoscript |  40 +----
 .../Extensions/irre_tutorial/README.txt       |   1 -
 .../Private/Language/locallang_db.xlf         |  24 ---
 .../Resources/Private/Layouts/Default.html    |   4 -
 .../Private/Partials/Content/FormFields.html  |   5 -
 .../Private/Partials/Content/Properties.html  |  11 --
 .../Private/Partials/FormErrors.html          |  13 --
 .../Private/Templates/Content/Edit.html       |  26 ---
 .../Private/Templates/Content/List.html       |  37 ----
 .../Private/Templates/Content/New.html        |  26 ---
 .../Private/Templates/Content/Show.html       |  23 ---
 .../irre_tutorial/ext_localconf.php           |   5 -
 .../Extensions/irre_tutorial/ext_tables.php   |   2 +-
 .../Extensions/irre_tutorial/ext_tables.sql   |  96 +++--------
 .../Private/Language/locallang_db.xlf         |   8 +-
 .../Extensions/test_irre_csv/ext_tables.sql   |  16 +-
 .../Classes/Controller/AbstractController.php |  14 +-
 .../Classes/Controller/ContentController.php  |  20 +--
 .../Classes/Controller/QueueController.php    | 102 +++++++++++
 .../Classes/Domain/Model/Content.php          |   4 +-
 .../Classes/Domain/Model/Hotel.php            |   4 +-
 .../Classes/Domain/Model/Offer.php            |   4 +-
 .../Classes/Domain/Model/Price.php            |   2 +-
 .../Domain/Repository/ContentRepository.php   |  34 ++++
 .../Classes/Service/QueueService.php          |  96 +++++++++++
 .../Extbase/Persistence/Classes.php           |  27 +++
 .../FlexForms/tt_content_flexform.xml         |   4 +-
 .../Configuration/Services.yaml               |   9 +
 .../Configuration/TCA/Overrides/pages.php     |  35 ++++
 .../TCA/Overrides/tt_content.php              |  56 ++++++
 .../TCA/tx_testirreforeignfield_hotel.php}    |  18 +-
 .../TCA/tx_testirreforeignfield_offer.php}    |  18 +-
 .../TCA/tx_testirreforeignfield_price.php}    |  16 +-
 .../ExtbaseJsonRenderer.typoscript            |   6 +-
 .../TypoScript/JsonRenderer.typoscript        | 160 ++++++++++++++++++
 .../Configuration/TypoScript/setup.typoscript |   5 +
 .../Private/Language/locallang_db.xlf         |  74 ++++++++
 .../Resources/Public/Icons/Extension.svg      |   1 +
 .../Resources/Public/Icons/icon_hotel.gif     | Bin 0 -> 117 bytes
 .../Resources/Public/Icons/icon_offer.gif     | Bin 0 -> 117 bytes
 .../Resources/Public/Icons/icon_price.gif     | Bin 0 -> 117 bytes
 .../test_irre_foreignfield/ext_emconf.php     |  23 +++
 .../test_irre_foreignfield/ext_localconf.php  |  21 +++
 .../test_irre_foreignfield/ext_tables.php     |  11 ++
 .../test_irre_foreignfield/ext_tables.sql     |  42 +++++
 .../Fixtures/Frontend/JsonRenderer.typoscript |  63 +------
 .../Export/IrreTutorialRecordsTest.php        |   1 +
 .../DatabaseAssertions/importIrreRecords.csv  |  22 +--
 .../DatabaseImports/irre_tutorial.xml         |  56 +++---
 .../Fixtures/IrreRecordsIncludeFields.php     |   8 +-
 .../Fixtures/XmlExports/irre-records.xml      | 102 +++++------
 .../Fixtures/XmlImports/irre-records.xml      | 102 +++++------
 .../Import/IrreTutorialRecordsTest.php        |   1 +
 .../Tests/Functional/ImportExportTest.php     |   1 +
 ...aceholderRemovalIrreForeignFieldImport.csv |  32 ++--
 ...aceholderRemovalIrreForeignFieldResult.csv |  32 ++--
 .../WorkspaceNewPlaceholderRemovalTest.php    |   2 +-
 .../ForeignField/AbstractActionTestCase.php   |   2 +-
 .../ForeignField/DataSet/ImportDefault.csv    |  68 ++++----
 .../DataSet/changeParentContentSorting.csv    |  51 ++----
 .../ForeignField/Discard/DataSet/copyPage.csv |  70 ++++----
 .../copyPageWHotelBeforeParentContent.csv     |  70 ++++----
 .../Discard/DataSet/copyParentContent.csv     |  70 ++++----
 .../copyParentContentToDifferentPage.csv      |  70 ++++----
 ...NCopyParentContentNHotelNOfferChildren.csv |  78 ++++-----
 ...tNHotelNOfferChildrenNDiscardLocParent.csv |  78 ++++-----
 ...alizeParentContentNHotelNOfferChildren.csv |  70 ++++----
 .../Discard/DataSet/createParentContent.csv   |  70 ++++----
 ...reateParentContentNHotelNOfferChildren.csv |  70 ++++----
 .../Discard/DataSet/deletePage.csv            |  70 ++++----
 .../Discard/DataSet/deleteParentContent.csv   |  70 ++++----
 .../localizeParentContentWAllChildren.csv     |  70 ++++----
 ...modifyNDiscardNModifyParentWHotelChild.csv |  70 ++++----
 .../Discard/DataSet/modifyOnlyHotelChild.csv  |  70 ++++----
 .../Discard/DataSet/modifyPage.csv            |  70 ++++----
 .../Discard/DataSet/modifyParentContent.csv   |  70 ++++----
 .../DataSet/modifyParentNAddHotelChild.csv    |  70 ++++----
 ...odifyParentNChangeHotelChildrenSorting.csv |  70 ++++----
 .../DataSet/modifyParentNDeleteHotelChild.csv |  70 ++++----
 .../DataSet/modifyParentNHotelChild.csv       |  70 ++++----
 .../moveParentContentToDifferentPage.csv      |  70 ++++----
 ...ntContentToDifferentPageNChangeSorting.csv |  70 ++++----
 .../moveParentContentToDifferentPageTwice.csv |  70 ++++----
 ...HotelSortingWithOfferNotWorkspaceAware.csv |  76 ++++-----
 .../DataSet/changeParentContentSorting.csv    | 114 ++++++-------
 .../ForeignField/Modify/DataSet/copyPage.csv  | 128 +++++++-------
 .../copyPageWHotelBeforeParentContent.csv     | 128 +++++++-------
 .../Modify/DataSet/copyParentContent.csv      |  82 ++++-----
 .../copyParentContentToDifferentPage.csv      |  82 ++++-----
 ...NCopyParentContentNHotelNOfferChildren.csv |  86 +++++-----
 ...alizeParentContentNHotelNOfferChildren.csv |  90 +++++-----
 ...entContentNHotelNOfferChildrenWOSortBy.csv |  90 +++++-----
 .../Modify/DataSet/createParentContent.csv    |  70 ++++----
 ...reateParentContentNHotelNOfferChildren.csv |  78 ++++-----
 .../Modify/DataSet/deletePage.csv             |  72 ++++----
 .../Modify/DataSet/deleteParentContent.csv    |  82 ++++-----
 ...lineLocalizeSynchronizeLocalizeMissing.csv | 134 +++++++--------
 .../localizeParentContentWAllChildren.csv     |  88 +++++-----
 ...modifyNDiscardNModifyParentWHotelChild.csv | 114 ++++++-------
 .../Modify/DataSet/modifyOnlyHotelChild.csv   |  80 ++++-----
 .../Modify/DataSet/modifyPage.csv             |  72 ++++----
 .../Modify/DataSet/modifyParentContent.csv    |  82 ++++-----
 .../DataSet/modifyParentNAddHotelChild.csv    |  86 +++++-----
 ...odifyParentNChangeHotelChildrenSorting.csv | 114 ++++++-------
 .../DataSet/modifyParentNDeleteHotelChild.csv | 114 ++++++-------
 .../DataSet/modifyParentNHotelChild.csv       | 114 ++++++-------
 .../moveParentContentToDifferentPage.csv      |  82 ++++-----
 ...ntContentToDifferentPageNChangeSorting.csv | 126 +++++++-------
 .../moveParentContentToDifferentPageTwice.csv |  82 ++++-----
 .../DataSet/changeParentContentSorting.csv    |  70 ++++----
 .../ForeignField/Publish/DataSet/copyPage.csv | 128 +++++++-------
 .../copyPageWHotelBeforeParentContent.csv     | 128 +++++++-------
 .../Publish/DataSet/copyParentContent.csv     |  82 ++++-----
 .../copyParentContentToDifferentPage.csv      |  82 ++++-----
 ...NCopyParentContentNHotelNOfferChildren.csv |  86 +++++-----
 ...alizeParentContentNHotelNOfferChildren.csv |  92 +++++-----
 .../Publish/DataSet/createParentContent.csv   |  70 ++++----
 ...reateParentContentNHotelNOfferChildren.csv |  78 ++++-----
 .../Publish/DataSet/deletePage.csv            |  32 ++--
 .../Publish/DataSet/deleteParentContent.csv   |  64 +++----
 .../localizeParentContentWAllChildren.csv     |  88 +++++-----
 ...modifyNDiscardNModifyParentWHotelChild.csv |  70 ++++----
 .../Publish/DataSet/modifyOnlyHotelChild.csv  |  70 ++++----
 .../Publish/DataSet/modifyPage.csv            |  70 ++++----
 .../Publish/DataSet/modifyParentContent.csv   |  70 ++++----
 .../DataSet/modifyParentNAddHotelChild.csv    |  74 ++++----
 ...odifyParentNChangeHotelChildrenSorting.csv |  70 ++++----
 .../DataSet/modifyParentNDeleteHotelChild.csv |  64 +++----
 .../DataSet/modifyParentNHotelChild.csv       |  70 ++++----
 .../moveParentContentToDifferentPage.csv      |  70 ++++----
 ...ntContentToDifferentPageNChangeSorting.csv |  70 ++++----
 .../moveParentContentToDifferentPageTwice.csv |  70 ++++----
 .../DataSet/changeParentContentSorting.csv    |  70 ++++----
 .../PublishAll/DataSet/copyPage.csv           | 128 +++++++-------
 .../copyPageWHotelBeforeParentContent.csv     | 128 +++++++-------
 .../PublishAll/DataSet/copyParentContent.csv  |  82 ++++-----
 .../copyParentContentToDifferentPage.csv      |  82 ++++-----
 ...NCopyParentContentNHotelNOfferChildren.csv |  86 +++++-----
 ...alizeParentContentNHotelNOfferChildren.csv |  90 +++++-----
 .../DataSet/createParentContent.csv           |  70 ++++----
 ...reateParentContentNHotelNOfferChildren.csv |  78 ++++-----
 .../PublishAll/DataSet/deletePage.csv         |  32 ++--
 .../DataSet/deleteParentContent.csv           |  64 +++----
 .../localizeParentContentWAllChildren.csv     |  90 +++++-----
 ...modifyNDiscardNModifyParentWHotelChild.csv |  70 ++++----
 .../DataSet/modifyOnlyHotelChild.csv          |  70 ++++----
 .../PublishAll/DataSet/modifyPage.csv         |  70 ++++----
 .../DataSet/modifyParentContent.csv           |  70 ++++----
 .../DataSet/modifyParentNAddHotelChild.csv    |  74 ++++----
 ...odifyParentNChangeHotelChildrenSorting.csv |  70 ++++----
 .../DataSet/modifyParentNDeleteHotelChild.csv |  64 +++----
 .../DataSet/modifyParentNHotelChild.csv       |  70 ++++----
 .../moveParentContentToDifferentPage.csv      |  70 ++++----
 ...ntContentToDifferentPageNChangeSorting.csv |  70 ++++----
 .../moveParentContentToDifferentPageTwice.csv |  70 ++++----
 .../ManyToMany/DataSet/ImportDefault.csv      |   6 +-
 209 files changed, 6434 insertions(+), 6276 deletions(-)
 delete mode 100644 typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/Extbase/Persistence/Classes.php
 delete mode 100644 typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/ExtensionBuilder/settings.yaml
 delete mode 100644 typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TypoScript/constants.typoscript
 delete mode 100644 typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Resources/Private/Layouts/Default.html
 delete mode 100644 typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Resources/Private/Partials/Content/FormFields.html
 delete mode 100644 typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Resources/Private/Partials/Content/Properties.html
 delete mode 100644 typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Resources/Private/Partials/FormErrors.html
 delete mode 100644 typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Resources/Private/Templates/Content/Edit.html
 delete mode 100644 typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Resources/Private/Templates/Content/List.html
 delete mode 100644 typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Resources/Private/Templates/Content/New.html
 delete mode 100644 typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Resources/Private/Templates/Content/Show.html
 rename typo3/sysext/core/Tests/Functional/Fixtures/Extensions/{irre_tutorial => test_irre_foreignfield}/Classes/Controller/AbstractController.php (89%)
 rename typo3/sysext/core/Tests/Functional/Fixtures/Extensions/{irre_tutorial => test_irre_foreignfield}/Classes/Controller/ContentController.php (78%)
 create mode 100644 typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Classes/Controller/QueueController.php
 rename typo3/sysext/core/Tests/Functional/Fixtures/Extensions/{irre_tutorial => test_irre_foreignfield}/Classes/Domain/Model/Content.php (90%)
 rename typo3/sysext/core/Tests/Functional/Fixtures/Extensions/{irre_tutorial => test_irre_foreignfield}/Classes/Domain/Model/Hotel.php (90%)
 rename typo3/sysext/core/Tests/Functional/Fixtures/Extensions/{irre_tutorial => test_irre_foreignfield}/Classes/Domain/Model/Offer.php (90%)
 rename typo3/sysext/core/Tests/Functional/Fixtures/Extensions/{irre_tutorial => test_irre_foreignfield}/Classes/Domain/Model/Price.php (95%)
 create mode 100644 typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Classes/Domain/Repository/ContentRepository.php
 create mode 100644 typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Classes/Service/QueueService.php
 create mode 100644 typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Configuration/Extbase/Persistence/Classes.php
 rename typo3/sysext/core/Tests/Functional/Fixtures/Extensions/{irre_tutorial => test_irre_foreignfield}/Configuration/FlexForms/tt_content_flexform.xml (89%)
 create mode 100644 typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Configuration/Services.yaml
 create mode 100644 typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Configuration/TCA/Overrides/pages.php
 create mode 100644 typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Configuration/TCA/Overrides/tt_content.php
 rename typo3/sysext/core/Tests/Functional/Fixtures/Extensions/{irre_tutorial/Configuration/TCA/tx_irretutorial_1nff_hotel.php => test_irre_foreignfield/Configuration/TCA/tx_testirreforeignfield_hotel.php} (73%)
 rename typo3/sysext/core/Tests/Functional/Fixtures/Extensions/{irre_tutorial/Configuration/TCA/tx_irretutorial_1nff_offer.php => test_irre_foreignfield/Configuration/TCA/tx_testirreforeignfield_offer.php} (73%)
 rename typo3/sysext/core/Tests/Functional/Fixtures/Extensions/{irre_tutorial/Configuration/TCA/tx_irretutorial_1nff_price.php => test_irre_foreignfield/Configuration/TCA/tx_testirreforeignfield_price.php} (72%)
 rename typo3/sysext/core/Tests/Functional/Fixtures/{Frontend => Extensions/test_irre_foreignfield/Configuration/TypoScript}/ExtbaseJsonRenderer.typoscript (59%)
 create mode 100644 typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Configuration/TypoScript/JsonRenderer.typoscript
 create mode 100644 typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Configuration/TypoScript/setup.typoscript
 create mode 100644 typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Resources/Private/Language/locallang_db.xlf
 create mode 100644 typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Resources/Public/Icons/Extension.svg
 create mode 100644 typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Resources/Public/Icons/icon_hotel.gif
 create mode 100644 typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Resources/Public/Icons/icon_offer.gif
 create mode 100644 typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Resources/Public/Icons/icon_price.gif
 create mode 100644 typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/ext_emconf.php
 create mode 100644 typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/ext_localconf.php
 create mode 100644 typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/ext_tables.php
 create mode 100644 typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/ext_tables.sql

diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Category/OneToOne/Modify/ActionTest.php b/typo3/sysext/core/Tests/Functional/DataHandling/Category/OneToOne/Modify/ActionTest.php
index b17661e611cb..5ba1c69e0c40 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Category/OneToOne/Modify/ActionTest.php
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Category/OneToOne/Modify/ActionTest.php
@@ -222,7 +222,6 @@ class ActionTest extends AbstractActionTestCase
 
         $response = $this->executeFrontendSubRequest((new InternalRequest())->withPageId(self::VALUE_PageId));
         $responseSections = ResponseContent::fromString((string)$response->getBody())->getSections();
-
         self::assertThat(
             $responseSections,
             $this->getRequestSectionStructureHasRecordConstraint()
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/DataHandler/DataSet/LiveDefaultElements.csv b/typo3/sysext/core/Tests/Functional/DataHandling/DataHandler/DataSet/LiveDefaultElements.csv
index 8b5e16a214ae..2a981a3e0e64 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/DataHandler/DataSet/LiveDefaultElements.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/DataHandler/DataSet/LiveDefaultElements.csv
@@ -15,21 +15,21 @@
 ,29,298,"tt_content",0,1,"categories",,,,,,,,,,,
 ,30,298,"tt_content",0,2,"categories",,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","image","categories","tx_irretutorial_1nff_hotels",,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","image","categories","tx_testirreforeignfield_hotels",,
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",0,2,0,,
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",0,2,0,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","l18n_diffsource","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers"
-,3,89,1,0,0,0,,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,0
-,4,89,2,0,0,0,,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,0
-,5,89,1,0,0,0,,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,0
+,3,89,1,0,0,0,,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",0
+,4,89,2,0,0,0,,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",0
+,5,89,1,0,0,0,,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",0
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
 ,"1b70a8e25c22645f7a49a79f57f3cf3f","sys_category",31,"parent",,,,0,0,"sys_category",28,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"3c637501ab9c158daa933643bff8cc43","sys_category",28,"items",,,,0,0,"tt_content",297,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
 ,"aabda97b66f9b693f30d1faf442b37d6","sys_category",29,"items",,,,1,0,"tt_content",298,,,,,,
 ,"b102e2f9b1ed99b14d813363199cb281","sys_category",30,"items",,,,0,0,"tt_content",298,,,,,,
 ,"e19100d609a435906e16432a41b55c72","sys_category",29,"items",,,,0,0,"tt_content",297,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/DataHandler/DefaultValuesTest.php b/typo3/sysext/core/Tests/Functional/DataHandling/DataHandler/DefaultValuesTest.php
index 31d3f57c3645..0e7f1d904e1b 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/DataHandler/DefaultValuesTest.php
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/DataHandler/DefaultValuesTest.php
@@ -37,6 +37,7 @@ class DefaultValuesTest extends AbstractDataHandlerActionTestCase
     protected $scenarioDataSetDirectory = 'typo3/sysext/core/Tests/Functional/DataHandling/DataHandler/DataSet/';
 
     protected $testExtensionsToLoad = [
+        'typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield',
         'typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial',
     ];
 
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/DataHandler/GetUniqueTranslationTest.php b/typo3/sysext/core/Tests/Functional/DataHandling/DataHandler/GetUniqueTranslationTest.php
index 1a627e2ce48a..b7979cb0e029 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/DataHandler/GetUniqueTranslationTest.php
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/DataHandler/GetUniqueTranslationTest.php
@@ -33,6 +33,7 @@ class GetUniqueTranslationTest extends AbstractDataHandlerActionTestCase
     protected $scenarioDataSetDirectory = 'typo3/sysext/core/Tests/Functional/DataHandling/DataHandler/DataSet/';
 
     protected $testExtensionsToLoad = [
+        'typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield',
         'typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial',
     ];
 
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/DataHandler/HookTest.php b/typo3/sysext/core/Tests/Functional/DataHandling/DataHandler/HookTest.php
index 53e42e265f12..91365773f316 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/DataHandler/HookTest.php
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/DataHandler/HookTest.php
@@ -30,9 +30,9 @@ class HookTest extends AbstractDataHandlerActionTestCase
     const VALUE_PageId = 89;
     const VALUE_ContentId = 297;
     const TABLE_Content = 'tt_content';
-    const TABLE_Hotel = 'tx_irretutorial_1nff_hotel';
+    const TABLE_Hotel = 'tx_testirreforeignfield_hotel';
     const TABLE_Category = 'sys_category';
-    const FIELD_ContentHotel = 'tx_irretutorial_1nff_hotels';
+    const FIELD_ContentHotel = 'tx_testirreforeignfield_hotels';
     const FIELD_Categories = 'categories';
 
     /**
@@ -51,6 +51,7 @@ class HookTest extends AbstractDataHandlerActionTestCase
     protected $scenarioDataSetDirectory = 'typo3/sysext/core/Tests/Functional/DataHandling/DataHandler/DataSet/';
 
     protected $testExtensionsToLoad = [
+        'typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield',
         'typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial',
     ];
 
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/FlexformIrre/ActionTest.php b/typo3/sysext/core/Tests/Functional/DataHandling/FlexformIrre/ActionTest.php
index 8a2aee48ac67..24741fb8731e 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/FlexformIrre/ActionTest.php
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/FlexformIrre/ActionTest.php
@@ -42,7 +42,7 @@ class ActionTest extends AbstractDataHandlerActionTestCase
     protected $assertCleanReferenceIndex = false;
 
     protected $testExtensionsToLoad = [
-        'typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial',
+        'typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield',
     ];
 
     /**
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/FlexformIrre/DataSet/LiveDefaultElements.csv b/typo3/sysext/core/Tests/Functional/DataHandling/FlexformIrre/DataSet/LiveDefaultElements.csv
index 45b9259d97b3..23498c221c64 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/FlexformIrre/DataSet/LiveDefaultElements.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/FlexformIrre/DataSet/LiveDefaultElements.csv
@@ -5,7 +5,7 @@
 ,"uid","pid","title","db_mountpoints",,,,,,,,,,
 ,1,0,"Test WS",88,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,
-,"uid","pid","CType","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_flexform"
+,"uid","pid","CType","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_flexform"
 ,100,1,,256,0,0,0,0,0,0,0,0,"Content #1","<?xml version='1.0' encoding='utf-8' standalone='yes' ?><T3FlexForms><data><sheet index='sDEF'><language index='lDEF'><field index='files'><value index='vDEF'>1</value></field></language></sheet></data></T3FlexForms>"
 # we assume the auto-generated storage 1 to exist here
 "sys_file",,,,,,,,,,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/AbstractActionTestCase.php b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/AbstractActionTestCase.php
index 322fdf3debdd..528d93cfbd00 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/AbstractActionTestCase.php
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/AbstractActionTestCase.php
@@ -39,12 +39,12 @@ abstract class AbstractActionTestCase extends AbstractDataHandlerActionTestCase
 
     const TABLE_Page = 'pages';
     const TABLE_Content = 'tt_content';
-    const TABLE_Hotel = 'tx_irretutorial_1nff_hotel';
-    const TABLE_Offer = 'tx_irretutorial_1nff_offer';
-    const TABLE_Price = 'tx_irretutorial_1nff_price';
+    const TABLE_Hotel = 'tx_testirreforeignfield_hotel';
+    const TABLE_Offer = 'tx_testirreforeignfield_offer';
+    const TABLE_Price = 'tx_testirreforeignfield_price';
 
-    const FIELD_PageHotel = 'tx_irretutorial_hotels';
-    const FIELD_ContentHotel = 'tx_irretutorial_1nff_hotels';
+    const FIELD_PageHotel = 'tx_testirreforeignfield_hotels';
+    const FIELD_ContentHotel = 'tx_testirreforeignfield_hotels';
     const FIELD_HotelOffer = 'offers';
     const FIELD_OfferPrice = 'prices';
 
@@ -54,7 +54,7 @@ abstract class AbstractActionTestCase extends AbstractDataHandlerActionTestCase
     protected $scenarioDataSetDirectory = 'typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/DataSet/';
 
     protected $testExtensionsToLoad = [
-        'typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial',
+        'typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield',
     ];
 
     protected function setUp(): void
@@ -66,8 +66,8 @@ abstract class AbstractActionTestCase extends AbstractDataHandlerActionTestCase
         $this->setUpFrontendRootPage(
             1,
             [
-                'typo3/sysext/core/Tests/Functional/Fixtures/Frontend/JsonRenderer.typoscript',
-                'typo3/sysext/core/Tests/Functional/Fixtures/Frontend/ExtbaseJsonRenderer.typoscript',
+                'typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Configuration/TypoScript/JsonRenderer.typoscript',
+                'typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Configuration/TypoScript/ExtbaseJsonRenderer.typoscript',
             ]
         );
     }
@@ -511,10 +511,10 @@ abstract class AbstractActionTestCase extends AbstractDataHandlerActionTestCase
         // Localize CE 297 which has two hotels, those are localized, too.
         $newTableIds = $this->actionService->localizeRecord(self::TABLE_Content, self::VALUE_ContentIdFirst, self::VALUE_LanguageId);
         $this->recordIds['localizedContentId'] = $newTableIds['tt_content'][self::VALUE_ContentIdFirst];
-        $this->recordIds['localizedHotelId'] = $newTableIds['tx_irretutorial_1nff_hotel'][self::VALUE_HotelIdFirst];
+        $this->recordIds['localizedHotelId'] = $newTableIds['tx_testirreforeignfield_hotel'][self::VALUE_HotelIdFirst];
         // Delete one localized hotel (and its children) again.
         // We end up with having one localized hotel child and a missing one, while both exist in default language.
-        $this->actionService->deleteRecord('tx_irretutorial_1nff_hotel', $this->recordIds['localizedHotelId']);
+        $this->actionService->deleteRecord('tx_testirreforeignfield_hotel', $this->recordIds['localizedHotelId']);
         // Now inlineLocalizeSynchronize->localize - This is the 'localize all records' button when inline
         // 'appearance' 'showAllLocalizationLink' has been enabled. It should re-localize the missing hotel again.
         $this->actionService->invoke(
@@ -523,7 +523,7 @@ abstract class AbstractActionTestCase extends AbstractDataHandlerActionTestCase
                 'tt_content' => [
                     $this->recordIds['localizedContentId'] => [
                         'inlineLocalizeSynchronize' => [
-                            'field' => 'tx_irretutorial_1nff_hotels',
+                            'field' => 'tx_testirreforeignfield_hotels',
                             'language' => 1,
                             'action' => 'localize',
                         ],
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/DataSet/ImportDefault.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/DataSet/ImportDefault.csv
index 5b9bca618fb2..42ab4a23a3ee 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/DataSet/ImportDefault.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/DataSet/ImportDefault.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,
+,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,
 ,1,0,256,0,0,0,0,0,0,"FunctionalTest",0,,,,,,
 ,88,1,256,0,0,0,0,0,0,"DataHandlerTest",0,,,,,,
 ,89,88,256,0,0,0,0,0,0,"Relations",1,,,,,,
@@ -9,44 +9,44 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","image","tx_irretutorial_1nff_hotels",,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","image","tx_testirreforeignfield_hotels",,,
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",0,2,,,
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",0,1,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","l18n_diffsource","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers"
 ,2,89,1,0,0,0,,0,0,0,0,0,"Hotel #0",89,"pages",,0
-,3,89,1,0,0,0,,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2
-,4,89,2,0,0,0,,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1
-,5,89,1,0,0,0,,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2
+,4,89,2,0,0,0,,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1
+,5,89,1,0,0,0,,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","l18n_diffsource","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices"
-,5,89,1,0,0,0,,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
-,6,89,2,0,0,0,,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2
-,7,89,1,0,0,0,,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1
-,8,89,1,0,0,0,,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3
+,6,89,2,0,0,0,,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2
+,7,89,1,0,0,0,,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1
+,8,89,1,0,0,0,,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","l18n_diffsource","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",
-,7,89,1,0,0,0,,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
-,8,89,2,0,0,0,,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,
-,9,89,3,0,0,0,,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,
-,10,89,1,0,0,0,,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,
-,11,89,2,0,0,0,,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,
-,12,89,1,0,0,0,,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
-,13,89,1,0,0,0,,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
+,7,89,1,0,0,0,,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,
+,8,89,2,0,0,0,,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,
+,9,89,3,0,0,0,,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,
+,10,89,1,0,0,0,,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,
+,11,89,2,0,0,0,,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,
+,12,89,1,0,0,0,,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,
+,13,89,1,0,0,0,,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/changeParentContentSorting.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/changeParentContentSorting.csv
index c3e47020fabf..45748df0b7a4 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/changeParentContentSorting.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/changeParentContentSorting.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,
+,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,
 ,1,0,256,0,0,0,0,0,0,"FunctionalTest",0,,,,,
 ,88,1,256,0,0,0,0,0,0,"DataHandlerTest",0,,,,,
 ,89,88,256,0,0,0,0,0,0,"Relations",1,,,,,
@@ -9,44 +9,44 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,
 ,297,89,768,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers"
 ,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
-,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2
-,4,89,2,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1
-,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2
+,4,89,2,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1
+,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices"
-,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
-,6,89,2,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2
-,7,89,1,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1
-,8,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3
+,6,89,2,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2
+,7,89,1,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1
+,8,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",
-,7,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
-,8,89,2,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,
-,9,89,3,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,
-,10,89,1,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,
-,11,89,2,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,
-,12,89,1,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
-,13,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
+,7,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,
+,8,89,2,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,
+,9,89,3,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,
+,10,89,1,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,
+,11,89,2,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,
+,12,89,1,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,
+,13,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,
 "sys_refindex",,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyPage.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyPage.csv
index 38364b66bd68..08e64ee44494 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyPage.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyPage.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,
+,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,
 ,1,0,256,0,0,0,0,0,0,"FunctionalTest",0,,,,,
 ,88,1,256,0,0,0,0,0,0,"DataHandlerTest",0,,,,,
 ,89,88,256,0,0,0,0,0,0,"Relations",1,,,,,
@@ -10,76 +10,76 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,
 ,299,91,256,0,0,0,298,0,0,0,0,"Regular Element #2",1,,,
 ,300,91,128,0,0,0,297,0,0,0,0,"Regular Element #1",2,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers"
 ,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
-,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2
-,4,89,2,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1
-,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1
+,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2
+,4,89,2,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1
+,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1
 ,6,91,1,0,0,0,2,0,0,0,0,"Hotel #0",91,"pages",,0
-,7,91,1,0,0,0,5,0,0,0,0,"Hotel #1",299,"tt_content",1nff.hotels,1
-,8,91,1,0,0,0,3,0,0,0,0,"Hotel #1",300,"tt_content",1nff.hotels,2
-,9,91,2,0,0,0,4,0,0,0,0,"Hotel #2",300,"tt_content",1nff.hotels,1
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,
+,7,91,1,0,0,0,5,0,0,0,0,"Hotel #1",299,"tt_content","1nff.hotels",1
+,8,91,1,0,0,0,3,0,0,0,0,"Hotel #1",300,"tt_content","1nff.hotels",2
+,9,91,2,0,0,0,4,0,0,0,0,"Hotel #2",300,"tt_content","1nff.hotels",1
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices"
-,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
-,6,89,2,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2
-,7,89,1,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1
-,8,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
-,9,91,1,0,0,0,8,0,0,0,0,"Offer #1.1",7,"tx_irretutorial_1nff_hotel",,1
-,10,91,1,0,0,0,5,0,0,0,0,"Offer #1.1",8,"tx_irretutorial_1nff_hotel",,3
-,11,91,2,0,0,0,6,0,0,0,0,"Offer #1.2",8,"tx_irretutorial_1nff_hotel",,2
-,12,91,1,0,0,0,7,0,0,0,0,"Offer #2.1",9,"tx_irretutorial_1nff_hotel",,1
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3
+,6,89,2,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2
+,7,89,1,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1
+,8,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1
+,9,91,1,0,0,0,8,0,0,0,0,"Offer #1.1",7,"tx_testirreforeignfield_hotel",,1
+,10,91,1,0,0,0,5,0,0,0,0,"Offer #1.1",8,"tx_testirreforeignfield_hotel",,3
+,11,91,2,0,0,0,6,0,0,0,0,"Offer #1.2",8,"tx_testirreforeignfield_hotel",,2
+,12,91,1,0,0,0,7,0,0,0,0,"Offer #2.1",9,"tx_testirreforeignfield_hotel",,1
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",
-,7,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
-,8,89,2,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,
-,9,89,3,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,
-,10,89,1,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,
-,11,89,2,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,
-,12,89,1,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
-,13,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
-,14,91,1,0,0,0,13,0,0,0,0,"Price #1.1.1",9,"tx_irretutorial_1nff_offer",,
-,15,91,1,0,0,0,7,0,0,0,0,"Price #1.1.1",10,"tx_irretutorial_1nff_offer",,
-,16,91,2,0,0,0,8,0,0,0,0,"Price #1.1.2",10,"tx_irretutorial_1nff_offer",,
-,17,91,3,0,0,0,9,0,0,0,0,"Price #1.1.3",10,"tx_irretutorial_1nff_offer",,
-,18,91,1,0,0,0,10,0,0,0,0,"Price #1.2.1",11,"tx_irretutorial_1nff_offer",,
-,19,91,2,0,0,0,11,0,0,0,0,"Price #1.2.2",11,"tx_irretutorial_1nff_offer",,
-,20,91,1,0,0,0,12,0,0,0,0,"Price #2.1.1",12,"tx_irretutorial_1nff_offer",,
+,7,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,
+,8,89,2,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,
+,9,89,3,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,
+,10,89,1,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,
+,11,89,2,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,
+,12,89,1,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,
+,13,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,
+,14,91,1,0,0,0,13,0,0,0,0,"Price #1.1.1",9,"tx_testirreforeignfield_offer",,
+,15,91,1,0,0,0,7,0,0,0,0,"Price #1.1.1",10,"tx_testirreforeignfield_offer",,
+,16,91,2,0,0,0,8,0,0,0,0,"Price #1.1.2",10,"tx_testirreforeignfield_offer",,
+,17,91,3,0,0,0,9,0,0,0,0,"Price #1.1.3",10,"tx_testirreforeignfield_offer",,
+,18,91,1,0,0,0,10,0,0,0,0,"Price #1.2.1",11,"tx_testirreforeignfield_offer",,
+,19,91,2,0,0,0,11,0,0,0,0,"Price #1.2.2",11,"tx_testirreforeignfield_offer",,
+,20,91,1,0,0,0,12,0,0,0,0,"Price #2.1.1",12,"tx_testirreforeignfield_offer",,
 "sys_refindex",,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,
-,"92e2c9f4ee5e5b6c608d2c980bc4d78f","tx_irretutorial_1nff_hotel",7,"offers",,,,0,0,"tx_irretutorial_1nff_offer",9,,,,,
-,"efcb05dc035086f96053ec60f68186b6","tx_irretutorial_1nff_hotel",8,"offers",,,,0,0,"tx_irretutorial_1nff_offer",10,,,,,
-,"e5fa041e279d04dab69ade17128a9243","tx_irretutorial_1nff_hotel",8,"offers",,,,1,0,"tx_irretutorial_1nff_offer",11,,,,,
-,"3995c1d3a93d3ab38867852371e720e1","tx_irretutorial_1nff_hotel",9,"offers",,,,0,0,"tx_irretutorial_1nff_offer",12,,,,,
-,"266accee962e071564b66166bb002874","pages",91,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",6,,,,,
-,"d0754983bfe2639c6388e918c5c3c243","tx_irretutorial_1nff_offer",9,"prices",,,,0,0,"tx_irretutorial_1nff_price",14,,,,,
-,"277fb6f278dc9c056e0f3164f5e1778e","tx_irretutorial_1nff_offer",10,"prices",,,,0,0,"tx_irretutorial_1nff_price",15,,,,,
-,"a5c771c375921fe4bfb06c5027fbdd51","tx_irretutorial_1nff_offer",10,"prices",,,,1,0,"tx_irretutorial_1nff_price",16,,,,,
-,"cefb86725658b810bea751e1ac3648a3","tx_irretutorial_1nff_offer",10,"prices",,,,2,0,"tx_irretutorial_1nff_price",17,,,,,
-,"494d75b7b111aa689d15a5c4108ddd0d","tx_irretutorial_1nff_offer",11,"prices",,,,0,0,"tx_irretutorial_1nff_price",18,,,,,
-,"7adf68410be27466611b7e3e97ee6aa6","tx_irretutorial_1nff_offer",11,"prices",,,,1,0,"tx_irretutorial_1nff_price",19,,,,,
-,"8c2094cd97152334826cfac5852aa42a","tx_irretutorial_1nff_offer",12,"prices",,,,0,0,"tx_irretutorial_1nff_price",20,,,,,
-,"8383c20f5ece68a05f4e73423ceb4f69","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",7,,,,,
-,"67250ca82106f786e14f2b90f5a5da7d","tt_content",300,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",8,,,,,
-,"b58f0a6489ee99de86faac0511db39ba","tt_content",300,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",9,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,
+,"c5bf340feb4639d5d8f687186b805902","tx_testirreforeignfield_hotel",7,"offers",,,,0,0,"tx_testirreforeignfield_offer",9,,,,,
+,"55682ad5fbb3cd4af94822337cdecddf","tx_testirreforeignfield_hotel",8,"offers",,,,0,0,"tx_testirreforeignfield_offer",10,,,,,
+,"67b4d111498f9949044f6ad1b5f954e0","tx_testirreforeignfield_hotel",8,"offers",,,,1,0,"tx_testirreforeignfield_offer",11,,,,,
+,"caea1dd8a2d11243f920cf60ad54a65b","tx_testirreforeignfield_hotel",9,"offers",,,,0,0,"tx_testirreforeignfield_offer",12,,,,,
+,"f8ab061425b734a86ef5e35ad4a51fe7","pages",91,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",6,,,,,
+,"35f57ab5ca24a48eaa8bcb96cbb3157a","tx_testirreforeignfield_offer",9,"prices",,,,0,0,"tx_testirreforeignfield_price",14,,,,,
+,"0b8d08bb967f60d9231811f97c47151d","tx_testirreforeignfield_offer",10,"prices",,,,0,0,"tx_testirreforeignfield_price",15,,,,,
+,"e5702e604310bb04bd9291394bd7b560","tx_testirreforeignfield_offer",10,"prices",,,,1,0,"tx_testirreforeignfield_price",16,,,,,
+,"ffbd17bd4d58ee80e875b5cdd30ab3cf","tx_testirreforeignfield_offer",10,"prices",,,,2,0,"tx_testirreforeignfield_price",17,,,,,
+,"ca9d3af43d483d6d235eae7946e91476","tx_testirreforeignfield_offer",11,"prices",,,,0,0,"tx_testirreforeignfield_price",18,,,,,
+,"14dd08b537108dba2bb1fd3f783a5364","tx_testirreforeignfield_offer",11,"prices",,,,1,0,"tx_testirreforeignfield_price",19,,,,,
+,"7b83a005a2ce92576cdca33948fcac83","tx_testirreforeignfield_offer",12,"prices",,,,0,0,"tx_testirreforeignfield_price",20,,,,,
+,"3a3ac66303c3333d24712b1f0dbae733","tt_content",299,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",7,,,,,
+,"acbf104c3fcdb85a80b6f1c62213f1b2","tt_content",300,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",8,,,,,
+,"694641347c205cba5f6284af4983e210","tt_content",300,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",9,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyPageWHotelBeforeParentContent.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyPageWHotelBeforeParentContent.csv
index 593a7e00bf22..e749410bc812 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyPageWHotelBeforeParentContent.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyPageWHotelBeforeParentContent.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,
+,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,
 ,1,0,256,0,0,0,0,0,0,"FunctionalTest",0,,,,,
 ,88,1,256,0,0,0,0,0,0,"DataHandlerTest",0,,,,,
 ,89,88,256,0,0,0,0,0,0,"Relations",1,,,,,
@@ -10,76 +10,76 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,
 ,299,91,256,0,0,0,298,0,0,0,0,"Regular Element #2",1,,,
 ,300,91,128,0,0,0,297,0,0,0,0,"Regular Element #1",2,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers"
 ,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
-,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2
-,4,89,2,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1
-,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1
+,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2
+,4,89,2,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1
+,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1
 ,6,91,1,0,0,0,2,0,0,0,0,"Hotel #0",91,"pages",,0
-,7,91,2,0,0,0,4,0,0,0,0,"Hotel #2",300,"tt_content",1nff.hotels,1
-,8,91,1,0,0,0,3,0,0,0,0,"Hotel #1",300,"tt_content",1nff.hotels,2
-,9,91,1,0,0,0,5,0,0,0,0,"Hotel #1",299,"tt_content",1nff.hotels,1
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,
+,7,91,2,0,0,0,4,0,0,0,0,"Hotel #2",300,"tt_content","1nff.hotels",1
+,8,91,1,0,0,0,3,0,0,0,0,"Hotel #1",300,"tt_content","1nff.hotels",2
+,9,91,1,0,0,0,5,0,0,0,0,"Hotel #1",299,"tt_content","1nff.hotels",1
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices"
-,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
-,6,89,2,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2
-,7,89,1,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1
-,8,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
-,9,91,1,0,0,0,7,0,0,0,0,"Offer #2.1",7,"tx_irretutorial_1nff_hotel",,1
-,10,91,1,0,0,0,5,0,0,0,0,"Offer #1.1",8,"tx_irretutorial_1nff_hotel",,3
-,11,91,2,0,0,0,6,0,0,0,0,"Offer #1.2",8,"tx_irretutorial_1nff_hotel",,2
-,12,91,1,0,0,0,8,0,0,0,0,"Offer #1.1",9,"tx_irretutorial_1nff_hotel",,1
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3
+,6,89,2,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2
+,7,89,1,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1
+,8,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1
+,9,91,1,0,0,0,7,0,0,0,0,"Offer #2.1",7,"tx_testirreforeignfield_hotel",,1
+,10,91,1,0,0,0,5,0,0,0,0,"Offer #1.1",8,"tx_testirreforeignfield_hotel",,3
+,11,91,2,0,0,0,6,0,0,0,0,"Offer #1.2",8,"tx_testirreforeignfield_hotel",,2
+,12,91,1,0,0,0,8,0,0,0,0,"Offer #1.1",9,"tx_testirreforeignfield_hotel",,1
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",
-,7,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
-,8,89,2,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,
-,9,89,3,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,
-,10,89,1,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,
-,11,89,2,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,
-,12,89,1,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
-,13,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
-,14,91,1,0,0,0,12,0,0,0,0,"Price #2.1.1",9,"tx_irretutorial_1nff_offer",,
-,15,91,1,0,0,0,7,0,0,0,0,"Price #1.1.1",10,"tx_irretutorial_1nff_offer",,
-,16,91,2,0,0,0,8,0,0,0,0,"Price #1.1.2",10,"tx_irretutorial_1nff_offer",,
-,17,91,3,0,0,0,9,0,0,0,0,"Price #1.1.3",10,"tx_irretutorial_1nff_offer",,
-,18,91,1,0,0,0,10,0,0,0,0,"Price #1.2.1",11,"tx_irretutorial_1nff_offer",,
-,19,91,2,0,0,0,11,0,0,0,0,"Price #1.2.2",11,"tx_irretutorial_1nff_offer",,
-,20,91,1,0,0,0,13,0,0,0,0,"Price #1.1.1",12,"tx_irretutorial_1nff_offer",,
+,7,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,
+,8,89,2,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,
+,9,89,3,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,
+,10,89,1,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,
+,11,89,2,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,
+,12,89,1,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,
+,13,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,
+,14,91,1,0,0,0,12,0,0,0,0,"Price #2.1.1",9,"tx_testirreforeignfield_offer",,
+,15,91,1,0,0,0,7,0,0,0,0,"Price #1.1.1",10,"tx_testirreforeignfield_offer",,
+,16,91,2,0,0,0,8,0,0,0,0,"Price #1.1.2",10,"tx_testirreforeignfield_offer",,
+,17,91,3,0,0,0,9,0,0,0,0,"Price #1.1.3",10,"tx_testirreforeignfield_offer",,
+,18,91,1,0,0,0,10,0,0,0,0,"Price #1.2.1",11,"tx_testirreforeignfield_offer",,
+,19,91,2,0,0,0,11,0,0,0,0,"Price #1.2.2",11,"tx_testirreforeignfield_offer",,
+,20,91,1,0,0,0,13,0,0,0,0,"Price #1.1.1",12,"tx_testirreforeignfield_offer",,
 "sys_refindex",,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,
-,"92e2c9f4ee5e5b6c608d2c980bc4d78f","tx_irretutorial_1nff_hotel",7,"offers",,,,0,0,"tx_irretutorial_1nff_offer",9,,,,,
-,"efcb05dc035086f96053ec60f68186b6","tx_irretutorial_1nff_hotel",8,"offers",,,,0,0,"tx_irretutorial_1nff_offer",10,,,,,
-,"e5fa041e279d04dab69ade17128a9243","tx_irretutorial_1nff_hotel",8,"offers",,,,1,0,"tx_irretutorial_1nff_offer",11,,,,,
-,"3995c1d3a93d3ab38867852371e720e1","tx_irretutorial_1nff_hotel",9,"offers",,,,0,0,"tx_irretutorial_1nff_offer",12,,,,,
-,"266accee962e071564b66166bb002874","pages",91,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",6,,,,,
-,"d0754983bfe2639c6388e918c5c3c243","tx_irretutorial_1nff_offer",9,"prices",,,,0,0,"tx_irretutorial_1nff_price",14,,,,,
-,"277fb6f278dc9c056e0f3164f5e1778e","tx_irretutorial_1nff_offer",10,"prices",,,,0,0,"tx_irretutorial_1nff_price",15,,,,,
-,"a5c771c375921fe4bfb06c5027fbdd51","tx_irretutorial_1nff_offer",10,"prices",,,,1,0,"tx_irretutorial_1nff_price",16,,,,,
-,"cefb86725658b810bea751e1ac3648a3","tx_irretutorial_1nff_offer",10,"prices",,,,2,0,"tx_irretutorial_1nff_price",17,,,,,
-,"494d75b7b111aa689d15a5c4108ddd0d","tx_irretutorial_1nff_offer",11,"prices",,,,0,0,"tx_irretutorial_1nff_price",18,,,,,
-,"7adf68410be27466611b7e3e97ee6aa6","tx_irretutorial_1nff_offer",11,"prices",,,,1,0,"tx_irretutorial_1nff_price",19,,,,,
-,"8c2094cd97152334826cfac5852aa42a","tx_irretutorial_1nff_offer",12,"prices",,,,0,0,"tx_irretutorial_1nff_price",20,,,,,
-,"e5470d0279dc7478bef260bafb85a891","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",9,,,,,
-,"67250ca82106f786e14f2b90f5a5da7d","tt_content",300,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",8,,,,,
-,"8b05d52ad547d77bf8849a29bb3250ec","tt_content",300,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",7,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,
+,"c5bf340feb4639d5d8f687186b805902","tx_testirreforeignfield_hotel",7,"offers",,,,0,0,"tx_testirreforeignfield_offer",9,,,,,
+,"55682ad5fbb3cd4af94822337cdecddf","tx_testirreforeignfield_hotel",8,"offers",,,,0,0,"tx_testirreforeignfield_offer",10,,,,,
+,"67b4d111498f9949044f6ad1b5f954e0","tx_testirreforeignfield_hotel",8,"offers",,,,1,0,"tx_testirreforeignfield_offer",11,,,,,
+,"caea1dd8a2d11243f920cf60ad54a65b","tx_testirreforeignfield_hotel",9,"offers",,,,0,0,"tx_testirreforeignfield_offer",12,,,,,
+,"f8ab061425b734a86ef5e35ad4a51fe7","pages",91,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",6,,,,,
+,"35f57ab5ca24a48eaa8bcb96cbb3157a","tx_testirreforeignfield_offer",9,"prices",,,,0,0,"tx_testirreforeignfield_price",14,,,,,
+,"0b8d08bb967f60d9231811f97c47151d","tx_testirreforeignfield_offer",10,"prices",,,,0,0,"tx_testirreforeignfield_price",15,,,,,
+,"e5702e604310bb04bd9291394bd7b560","tx_testirreforeignfield_offer",10,"prices",,,,1,0,"tx_testirreforeignfield_price",16,,,,,
+,"ffbd17bd4d58ee80e875b5cdd30ab3cf","tx_testirreforeignfield_offer",10,"prices",,,,2,0,"tx_testirreforeignfield_price",17,,,,,
+,"ca9d3af43d483d6d235eae7946e91476","tx_testirreforeignfield_offer",11,"prices",,,,0,0,"tx_testirreforeignfield_price",18,,,,,
+,"14dd08b537108dba2bb1fd3f783a5364","tx_testirreforeignfield_offer",11,"prices",,,,1,0,"tx_testirreforeignfield_price",19,,,,,
+,"7b83a005a2ce92576cdca33948fcac83","tx_testirreforeignfield_offer",12,"prices",,,,0,0,"tx_testirreforeignfield_price",20,,,,,
+,"6d0e0c39fabe3a79e389e2789e61d5df","tt_content",299,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",9,,,,,
+,"acbf104c3fcdb85a80b6f1c62213f1b2","tt_content",300,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",8,,,,,
+,"aa0aa0a7f964cebd105633b45f7aae1f","tt_content",300,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",7,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyParentContent.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyParentContent.csv
index 5c7ff57aeb1d..f7ebe339b9e8 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyParentContent.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyParentContent.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,
+,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,
 ,1,0,256,0,0,0,0,0,0,"FunctionalTest",0,,,,,
 ,88,1,256,0,0,0,0,0,0,"DataHandlerTest",0,,,,,
 ,89,88,256,0,0,0,0,0,0,"Relations",1,,,,,
@@ -9,51 +9,51 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,
 ,299,89,128,0,0,0,298,0,0,0,0,"Regular Element #2 (copy 1)",1,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers"
 ,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
-,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2
-,4,89,2,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1
-,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1
-,6,89,1,0,0,0,5,0,0,0,0,"Hotel #1",299,"tt_content",1nff.hotels,1
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2
+,4,89,2,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1
+,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1
+,6,89,1,0,0,0,5,0,0,0,0,"Hotel #1",299,"tt_content","1nff.hotels",1
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices"
-,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
-,6,89,2,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2
-,7,89,1,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1
-,8,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
-,9,89,1,0,0,0,8,0,0,0,0,"Offer #1.1",6,"tx_irretutorial_1nff_hotel",,1
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3
+,6,89,2,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2
+,7,89,1,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1
+,8,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1
+,9,89,1,0,0,0,8,0,0,0,0,"Offer #1.1",6,"tx_testirreforeignfield_hotel",,1
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",
-,7,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
-,8,89,2,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,
-,9,89,3,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,
-,10,89,1,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,
-,11,89,2,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,
-,12,89,1,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
-,13,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
-,14,89,1,0,0,0,13,0,0,0,0,"Price #1.1.1",9,"tx_irretutorial_1nff_offer",,
+,7,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,
+,8,89,2,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,
+,9,89,3,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,
+,10,89,1,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,
+,11,89,2,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,
+,12,89,1,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,
+,13,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,
+,14,89,1,0,0,0,13,0,0,0,0,"Price #1.1.1",9,"tx_testirreforeignfield_offer",,
 "sys_refindex",,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,
-,"d0754983bfe2639c6388e918c5c3c243","tx_irretutorial_1nff_offer",9,"prices",,,,0,0,"tx_irretutorial_1nff_price",14,,,,,
-,"ec78ae01c0f6099f374b80d6740c1e7d","tx_irretutorial_1nff_hotel",6,"offers",,,,0,0,"tx_irretutorial_1nff_offer",9,,,,,
-,"c5384f6e9469c07c2e90bca873d93cc1","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",6,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,
+,"35f57ab5ca24a48eaa8bcb96cbb3157a","tx_testirreforeignfield_offer",9,"prices",,,,0,0,"tx_testirreforeignfield_price",14,,,,,
+,"77c47e123fc813a6b465fb99ab716357","tx_testirreforeignfield_hotel",6,"offers",,,,0,0,"tx_testirreforeignfield_offer",9,,,,,
+,"0e39ecf7ad8b072a1b1fac05ac2dfd4c","tt_content",299,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",6,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyParentContentToDifferentPage.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyParentContentToDifferentPage.csv
index ec00d28fc6d3..1b15905358c2 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyParentContentToDifferentPage.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyParentContentToDifferentPage.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,
+,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,
 ,1,0,256,0,0,0,0,0,0,"FunctionalTest",0,,,,,
 ,88,1,256,0,0,0,0,0,0,"DataHandlerTest",0,,,,,
 ,89,88,256,0,0,0,0,0,0,"Relations",1,,,,,
@@ -9,51 +9,51 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","t3_origuid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,
+,"uid","pid","sorting","deleted","sys_language_uid","t3_origuid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,
 ,299,90,256,0,0,298,0,0,0,0,0,"Regular Element #2",1,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","t3_origuid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers"
 ,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
-,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2
-,4,89,2,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1
-,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1
-,6,90,1,0,0,5,0,0,0,0,0,"Hotel #1",299,"tt_content",1nff.hotels,1
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2
+,4,89,2,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1
+,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1
+,6,90,1,0,0,5,0,0,0,0,0,"Hotel #1",299,"tt_content","1nff.hotels",1
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","t3_origuid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices"
-,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
-,6,89,2,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2
-,7,89,1,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1
-,8,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
-,9,90,1,0,0,8,0,0,0,0,0,"Offer #1.1",6,"tx_irretutorial_1nff_hotel",,1
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3
+,6,89,2,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2
+,7,89,1,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1
+,8,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1
+,9,90,1,0,0,8,0,0,0,0,0,"Offer #1.1",6,"tx_testirreforeignfield_hotel",,1
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","t3_origuid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",
-,7,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
-,8,89,2,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,
-,9,89,3,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,
-,10,89,1,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,
-,11,89,2,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,
-,12,89,1,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
-,13,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
-,14,90,1,0,0,13,0,0,0,0,0,"Price #1.1.1",9,"tx_irretutorial_1nff_offer",,
+,7,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,
+,8,89,2,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,
+,9,89,3,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,
+,10,89,1,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,
+,11,89,2,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,
+,12,89,1,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,
+,13,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,
+,14,90,1,0,0,13,0,0,0,0,0,"Price #1.1.1",9,"tx_testirreforeignfield_offer",,
 "sys_refindex",,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,
-,"d0754983bfe2639c6388e918c5c3c243","tx_irretutorial_1nff_offer",9,"prices",,,,0,0,"tx_irretutorial_1nff_price",14,,,,,
-,"ec78ae01c0f6099f374b80d6740c1e7d","tx_irretutorial_1nff_hotel",6,"offers",,,,0,0,"tx_irretutorial_1nff_offer",9,,,,,
-,"c5384f6e9469c07c2e90bca873d93cc1","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",6,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,
+,"35f57ab5ca24a48eaa8bcb96cbb3157a","tx_testirreforeignfield_offer",9,"prices",,,,0,0,"tx_testirreforeignfield_price",14,,,,,
+,"77c47e123fc813a6b465fb99ab716357","tx_testirreforeignfield_hotel",6,"offers",,,,0,0,"tx_testirreforeignfield_offer",9,,,,,
+,"0e39ecf7ad8b072a1b1fac05ac2dfd4c","tt_content",299,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",6,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyParentContentToLanguageWAllChildren.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyParentContentToLanguageWAllChildren.csv
index 193b53111ee6..16d30f61cd0e 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyParentContentToLanguageWAllChildren.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyParentContentToLanguageWAllChildren.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,
+,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,
 ,1,0,256,0,0,0,0,0,0,"FunctionalTest",0,,,,,
 ,88,1,256,0,0,0,0,0,0,"DataHandlerTest",0,,,,,
 ,89,88,256,0,0,0,0,0,0,"Relations",1,,,,,
@@ -10,52 +10,52 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,
 ,299,89,768,0,1,0,298,0,0,0,0,"[Translate to Dansk:] Regular Element #2",1,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers"
 ,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
-,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2
-,4,89,514,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1
-,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1
-,6,89,1,0,1,0,5,0,0,0,0,"[Translate to Dansk:] Hotel #1",299,"tt_content",1nff.hotels,1
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2
+,4,89,514,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1
+,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1
+,6,89,1,0,1,0,5,0,0,0,0,"[Translate to Dansk:] Hotel #1",299,"tt_content","1nff.hotels",1
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices"
-,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
-,6,89,514,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2
-,7,89,1,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1
-,8,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
-,9,89,1,0,1,0,8,0,0,0,0,"[Translate to Dansk:] Offer #1.1",6,"tx_irretutorial_1nff_hotel",,1
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3
+,6,89,514,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2
+,7,89,1,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1
+,8,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1
+,9,89,1,0,1,0,8,0,0,0,0,"[Translate to Dansk:] Offer #1.1",6,"tx_testirreforeignfield_hotel",,1
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",
-,7,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
-,8,89,514,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,
-,9,89,515,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,
-,10,89,1,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,
-,11,89,514,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,
-,12,89,1,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
-,13,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
-,14,89,1,0,1,0,13,0,0,0,0,"[Translate to Dansk:] Price #1.1.1",9,"tx_irretutorial_1nff_offer",,
+,7,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,
+,8,89,514,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,
+,9,89,515,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,
+,10,89,1,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,
+,11,89,514,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,
+,12,89,1,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,
+,13,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,
+,14,89,1,0,1,0,13,0,0,0,0,"[Translate to Dansk:] Price #1.1.1",9,"tx_testirreforeignfield_offer",,
 "sys_refindex",,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,
+,"35f57ab5ca24a48eaa8bcb96cbb3157a","tx_testirreforeignfield_offer",9,"prices",,,,0,0,"tx_testirreforeignfield_price",14,,,,,
+,"77c47e123fc813a6b465fb99ab716357","tx_testirreforeignfield_hotel",6,"offers",,,,0,0,"tx_testirreforeignfield_offer",9,,,,,
+,"0e39ecf7ad8b072a1b1fac05ac2dfd4c","tt_content",299,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",6,,,,,
 ,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,
-,"d0754983bfe2639c6388e918c5c3c243","tx_irretutorial_1nff_offer",9,"prices",,,,0,0,"tx_irretutorial_1nff_price",14,,,,,
-,"ec78ae01c0f6099f374b80d6740c1e7d","tx_irretutorial_1nff_hotel",6,"offers",,,,0,0,"tx_irretutorial_1nff_offer",9,,,,,
-,"c5384f6e9469c07c2e90bca873d93cc1","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",6,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNCopyParentContentNHotelNOfferChildren.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNCopyParentContentNHotelNOfferChildren.csv
index c047d29a4791..f21dbec5c4db 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNCopyParentContentNHotelNOfferChildren.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNCopyParentContentNHotelNOfferChildren.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,
+,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,
 ,1,0,256,0,0,0,0,0,0,"FunctionalTest",0,,,,,
 ,88,1,256,0,0,0,0,0,0,"DataHandlerTest",0,,,,,
 ,89,88,256,0,0,0,0,0,0,"Relations",1,,,,,
@@ -9,54 +9,54 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,
 ,299,89,128,0,0,0,0,0,0,0,0,"Testing #1",1,,,
 ,300,89,64,0,0,0,299,0,0,0,0,"Testing #1 (copy 1)",1,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers"
 ,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
-,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2
-,4,89,2,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1
-,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1
-,6,89,1,0,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content",1nff.hotels,1
-,7,89,1,0,0,0,6,0,0,0,0,"Hotel #1",300,"tt_content",1nff.hotels,1
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2
+,4,89,2,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1
+,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1
+,6,89,1,0,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content","1nff.hotels",1
+,7,89,1,0,0,0,6,0,0,0,0,"Hotel #1",300,"tt_content","1nff.hotels",1
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices"
-,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
-,6,89,2,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2
-,7,89,1,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1
-,8,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
-,9,89,1,0,0,0,0,0,0,0,0,"Offer #1",6,"tx_irretutorial_1nff_hotel",,0
-,10,89,1,0,0,0,9,0,0,0,0,"Offer #1",7,"tx_irretutorial_1nff_hotel",,0
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3
+,6,89,2,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2
+,7,89,1,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1
+,8,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1
+,9,89,1,0,0,0,0,0,0,0,0,"Offer #1",6,"tx_testirreforeignfield_hotel",,0
+,10,89,1,0,0,0,9,0,0,0,0,"Offer #1",7,"tx_testirreforeignfield_hotel",,0
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",
-,7,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
-,8,89,2,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,
-,9,89,3,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,
-,10,89,1,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,
-,11,89,2,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,
-,12,89,1,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
-,13,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
+,7,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,
+,8,89,2,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,
+,9,89,3,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,
+,10,89,1,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,
+,11,89,2,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,
+,12,89,1,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,
+,13,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,
 "sys_refindex",,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,
-,"c5384f6e9469c07c2e90bca873d93cc1","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",6,,,,,
-,"ec78ae01c0f6099f374b80d6740c1e7d","tx_irretutorial_1nff_hotel",6,"offers",,,,0,0,"tx_irretutorial_1nff_offer",9,,,,,
-,"e9c09ac89f1212d5b15f3013e2cee2af","tx_irretutorial_1nff_hotel",7,"offers",,,,0,0,"tx_irretutorial_1nff_offer",10,,,,,
-,"093c0d6fb779e67f62011fa7c0d67437","tt_content",300,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",7,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,
+,"0e39ecf7ad8b072a1b1fac05ac2dfd4c","tt_content",299,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",6,,,,,
+,"77c47e123fc813a6b465fb99ab716357","tx_testirreforeignfield_hotel",6,"offers",,,,0,0,"tx_testirreforeignfield_offer",9,,,,,
+,"f14125aa13e88b37c6e61a1714b26a6c","tx_testirreforeignfield_hotel",7,"offers",,,,0,0,"tx_testirreforeignfield_offer",10,,,,,
+,"10d0276aaa8ab897fa1d1fb601b9628e","tt_content",300,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",7,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
index 5a9d7da754a0..d74eac34bf46 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,
+,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,
 ,1,0,256,0,0,0,0,0,0,"FunctionalTest",0,,,,,
 ,88,1,256,0,0,0,0,0,0,"DataHandlerTest",0,,,,,
 ,89,88,256,0,0,0,0,0,0,"Relations",1,,,,,
@@ -10,58 +10,58 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,
 ,299,89,128,0,0,0,0,0,0,0,0,"Testing #1",1,,,
 ,300,89,192,0,1,299,299,0,0,0,0,"[Translate to Dansk:] Testing #1",1,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers"
 ,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
-,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2
-,4,89,514,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1
-,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1
-,6,89,1,0,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content",1nff.hotels,1
-,7,89,1,0,1,6,6,0,0,0,0,"[Translate to Dansk:] Hotel #1",300,"tt_content",1nff.hotels,1
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2
+,4,89,514,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1
+,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1
+,6,89,1,0,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content","1nff.hotels",1
+,7,89,1,0,1,6,6,0,0,0,0,"[Translate to Dansk:] Hotel #1",300,"tt_content","1nff.hotels",1
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices"
-,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
-,6,89,514,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2
-,7,89,1,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1
-,8,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
-,9,89,1,0,0,0,0,0,0,0,0,"Offer #1",6,"tx_irretutorial_1nff_hotel",,0
-,10,89,1,0,1,9,9,0,0,0,0,"[Translate to Dansk:] Offer #1",7,"tx_irretutorial_1nff_hotel",,0
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3
+,6,89,514,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2
+,7,89,1,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1
+,8,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1
+,9,89,1,0,0,0,0,0,0,0,0,"Offer #1",6,"tx_testirreforeignfield_hotel",,0
+,10,89,1,0,1,9,9,0,0,0,0,"[Translate to Dansk:] Offer #1",7,"tx_testirreforeignfield_hotel",,0
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",
-,7,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
-,8,89,2,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,
-,9,89,3,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,
-,10,89,1,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,
-,11,89,2,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,
-,12,89,1,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
-,13,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
+,7,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,
+,8,89,2,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,
+,9,89,3,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,
+,10,89,1,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,
+,11,89,2,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,
+,12,89,1,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,
+,13,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,
 "sys_refindex",,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,
+,"0e39ecf7ad8b072a1b1fac05ac2dfd4c","tt_content",299,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",6,,,,,
+,"77c47e123fc813a6b465fb99ab716357","tx_testirreforeignfield_hotel",6,"offers",,,,0,0,"tx_testirreforeignfield_offer",9,,,,,
+,"13a3a6fe638d72d8dc4516b32a115401","tx_testirreforeignfield_offer",10,"l18n_parent",,,,0,0,"tx_testirreforeignfield_offer",9,,,,,
+,"57786aaa4519b3e0fc9fe248562daef9","tx_testirreforeignfield_hotel",7,"l18n_parent",,,,0,0,"tx_testirreforeignfield_hotel",6,,,,,
+,"f14125aa13e88b37c6e61a1714b26a6c","tx_testirreforeignfield_hotel",7,"offers",,,,0,0,"tx_testirreforeignfield_offer",10,,,,,
+,"10d0276aaa8ab897fa1d1fb601b9628e","tt_content",300,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",7,,,,,
 ,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,
-,"c5384f6e9469c07c2e90bca873d93cc1","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",6,,,,,
-,"ec78ae01c0f6099f374b80d6740c1e7d","tx_irretutorial_1nff_hotel",6,"offers",,,,0,0,"tx_irretutorial_1nff_offer",9,,,,,
-,"e1dcdb90066ed63c6e6eb1a88a9465d4","tx_irretutorial_1nff_offer",10,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_offer",9,,,,,
-,"29589c28b3f6979a757d467e0f180925","tx_irretutorial_1nff_hotel",7,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_hotel",6,,,,,
-,"e9c09ac89f1212d5b15f3013e2cee2af","tx_irretutorial_1nff_hotel",7,"offers",,,,0,0,"tx_irretutorial_1nff_offer",10,,,,,
 ,"1130084e4038e95f2d5806b731cd416a","tt_content",300,"l18n_parent",,,,0,0,"tt_content",299,,,,,
-,"093c0d6fb779e67f62011fa7c0d67437","tt_content",300,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",7,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNLocalizeParentContentNHotelNOfferChildrenWOSortBy.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNLocalizeParentContentNHotelNOfferChildrenWOSortBy.csv
index 9d4f9471279d..2c7f1a3d7b76 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNLocalizeParentContentNHotelNOfferChildrenWOSortBy.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNLocalizeParentContentNHotelNOfferChildrenWOSortBy.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,
+,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,
 ,1,0,256,0,0,0,0,0,0,"FunctionalTest",0,,,,,
 ,88,1,256,0,0,0,0,0,0,"DataHandlerTest",0,,,,,
 ,89,88,256,0,0,0,0,0,0,"Relations",1,,,,,
@@ -10,58 +10,58 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,
 ,299,89,128,0,0,0,0,0,0,0,0,"Testing #1",1,,,
 ,300,89,192,0,1,299,299,0,0,0,0,"[Translate to Dansk:] Testing #1",1,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers"
 ,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
-,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2
-,4,89,2,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1
-,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1
-,6,89,0,0,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content",1nff.hotels,1
-,7,89,0,0,1,6,6,0,0,0,0,"[Translate to Dansk:] Hotel #1",300,"tt_content",1nff.hotels,1
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2
+,4,89,2,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1
+,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1
+,6,89,0,0,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content","1nff.hotels",1
+,7,89,0,0,1,6,6,0,0,0,0,"[Translate to Dansk:] Hotel #1",300,"tt_content","1nff.hotels",1
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices"
-,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
-,6,89,514,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2
-,7,89,1,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1
-,8,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
-,9,89,1,0,0,0,0,0,0,0,0,"Offer #1",6,"tx_irretutorial_1nff_hotel",,0
-,10,89,1,0,1,9,9,0,0,0,0,"[Translate to Dansk:] Offer #1",7,"tx_irretutorial_1nff_hotel",,0
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3
+,6,89,514,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2
+,7,89,1,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1
+,8,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1
+,9,89,1,0,0,0,0,0,0,0,0,"Offer #1",6,"tx_testirreforeignfield_hotel",,0
+,10,89,1,0,1,9,9,0,0,0,0,"[Translate to Dansk:] Offer #1",7,"tx_testirreforeignfield_hotel",,0
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",
-,7,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
-,8,89,2,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,
-,9,89,3,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,
-,10,89,1,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,
-,11,89,2,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,
-,12,89,1,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
-,13,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
+,7,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,
+,8,89,2,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,
+,9,89,3,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,
+,10,89,1,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,
+,11,89,2,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,
+,12,89,1,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,
+,13,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,
 "sys_refindex",,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,
+,"0e39ecf7ad8b072a1b1fac05ac2dfd4c","tt_content",299,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",6,,,,,
+,"77c47e123fc813a6b465fb99ab716357","tx_testirreforeignfield_hotel",6,"offers",,,,0,0,"tx_testirreforeignfield_offer",9,,,,,
+,"13a3a6fe638d72d8dc4516b32a115401","tx_testirreforeignfield_offer",10,"l18n_parent",,,,0,0,"tx_testirreforeignfield_offer",9,,,,,
+,"57786aaa4519b3e0fc9fe248562daef9","tx_testirreforeignfield_hotel",7,"l18n_parent",,,,0,0,"tx_testirreforeignfield_hotel",6,,,,,
+,"f14125aa13e88b37c6e61a1714b26a6c","tx_testirreforeignfield_hotel",7,"offers",,,,0,0,"tx_testirreforeignfield_offer",10,,,,,
+,"10d0276aaa8ab897fa1d1fb601b9628e","tt_content",300,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",7,,,,,
 ,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,
-,"c5384f6e9469c07c2e90bca873d93cc1","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",6,,,,,
-,"ec78ae01c0f6099f374b80d6740c1e7d","tx_irretutorial_1nff_hotel",6,"offers",,,,0,0,"tx_irretutorial_1nff_offer",9,,,,,
-,"e1dcdb90066ed63c6e6eb1a88a9465d4","tx_irretutorial_1nff_offer",10,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_offer",9,,,,,
-,"29589c28b3f6979a757d467e0f180925","tx_irretutorial_1nff_hotel",7,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_hotel",6,,,,,
-,"e9c09ac89f1212d5b15f3013e2cee2af","tx_irretutorial_1nff_hotel",7,"offers",,,,0,0,"tx_irretutorial_1nff_offer",10,,,,,
 ,"1130084e4038e95f2d5806b731cd416a","tt_content",300,"l18n_parent",,,,0,0,"tt_content",299,,,,,
-,"093c0d6fb779e67f62011fa7c0d67437","tt_content",300,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",7,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createParentContent.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createParentContent.csv
index a8182214ecc7..b30b9e6b2f26 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createParentContent.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createParentContent.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,
+,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,
 ,1,0,256,0,0,0,0,0,0,"FunctionalTest",0,,,,,,
 ,88,1,256,0,0,0,0,0,0,"DataHandlerTest",0,,,,,,
 ,89,88,256,0,0,0,0,0,0,"Relations",1,,,,,,
@@ -9,45 +9,45 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,,
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,,
 ,299,89,128,0,0,0,0,0,0,0,0,"Testing #1",0,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","l18n_diffsource","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers"
 ,2,89,1,0,0,0,,0,0,0,0,0,"Hotel #0",89,"pages",,0
-,3,89,1,0,0,0,,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2
-,4,89,2,0,0,0,,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1
-,5,89,1,0,0,0,,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2
+,4,89,2,0,0,0,,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1
+,5,89,1,0,0,0,,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","l18n_diffsource","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices"
-,5,89,1,0,0,0,,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
-,6,89,2,0,0,0,,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2
-,7,89,1,0,0,0,,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1
-,8,89,1,0,0,0,,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3
+,6,89,2,0,0,0,,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2
+,7,89,1,0,0,0,,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1
+,8,89,1,0,0,0,,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","l18n_diffsource","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",
-,7,89,1,0,0,0,,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
-,8,89,2,0,0,0,,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,
-,9,89,3,0,0,0,,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,
-,10,89,1,0,0,0,,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,
-,11,89,2,0,0,0,,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,
-,12,89,1,0,0,0,,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
-,13,89,1,0,0,0,,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
+,7,89,1,0,0,0,,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,
+,8,89,2,0,0,0,,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,
+,9,89,3,0,0,0,,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,
+,10,89,1,0,0,0,,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,
+,11,89,2,0,0,0,,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,
+,12,89,1,0,0,0,,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,
+,13,89,1,0,0,0,,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createParentContentNHotelNOfferChildren.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createParentContentNHotelNOfferChildren.csv
index ae78e5fd96fd..8edc25d31419 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createParentContentNHotelNOfferChildren.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createParentContentNHotelNOfferChildren.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,
+,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,
 ,1,0,256,0,0,0,0,0,0,"FunctionalTest",0,,,,,
 ,88,1,256,0,0,0,0,0,0,"DataHandlerTest",0,,,,,
 ,89,88,256,0,0,0,0,0,0,"Relations",1,,,,,
@@ -9,49 +9,49 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,
 ,299,89,128,0,0,0,0,0,0,0,0,"Testing #1",1,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers"
 ,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
-,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2
-,4,89,2,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1
-,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1
-,6,89,1,0,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content",1nff.hotels,1
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2
+,4,89,2,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1
+,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1
+,6,89,1,0,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content","1nff.hotels",1
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices"
-,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
-,6,89,2,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2
-,7,89,1,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1
-,8,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
-,9,89,1,0,0,0,0,0,0,0,0,"Offer #1",6,"tx_irretutorial_1nff_hotel",,0
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3
+,6,89,2,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2
+,7,89,1,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1
+,8,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1
+,9,89,1,0,0,0,0,0,0,0,0,"Offer #1",6,"tx_testirreforeignfield_hotel",,0
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",
-,7,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
-,8,89,2,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,
-,9,89,3,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,
-,10,89,1,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,
-,11,89,2,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,
-,12,89,1,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
-,13,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
+,7,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,
+,8,89,2,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,
+,9,89,3,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,
+,10,89,1,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,
+,11,89,2,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,
+,12,89,1,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,
+,13,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,
 "sys_refindex",,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,
-,"c5384f6e9469c07c2e90bca873d93cc1","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",6,,,,,
-,"ec78ae01c0f6099f374b80d6740c1e7d","tx_irretutorial_1nff_hotel",6,"offers",,,,0,0,"tx_irretutorial_1nff_offer",9,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,
+,"0e39ecf7ad8b072a1b1fac05ac2dfd4c","tt_content",299,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",6,,,,,
+,"77c47e123fc813a6b465fb99ab716357","tx_testirreforeignfield_hotel",6,"offers",,,,0,0,"tx_testirreforeignfield_offer",9,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/deletePage.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/deletePage.csv
index 74896f802025..0bb431e637fa 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/deletePage.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/deletePage.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,
+,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,
 ,1,0,256,0,0,0,0,0,0,"FunctionalTest",0,,,,,
 ,88,1,256,0,0,0,0,0,0,"DataHandlerTest",0,,,,,
 ,89,88,256,1,0,0,0,0,0,"Relations",1,,,,,
@@ -9,29 +9,29 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,
 ,297,89,256,1,0,0,0,0,0,0,0,"Regular Element #1",2,,,
 ,298,89,512,1,0,0,0,0,0,0,0,"Regular Element #2",1,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers"
 ,2,89,1,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
 ,3,89,1,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2
 ,4,89,2,1,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1
 ,5,89,1,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices"
-,5,89,1,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
-,6,89,2,1,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2
-,7,89,1,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1
-,8,89,1,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,
+,5,89,1,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3
+,6,89,2,1,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2
+,7,89,1,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1
+,8,89,1,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",
-,7,89,1,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
-,8,89,2,1,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,
-,9,89,3,1,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,
-,10,89,1,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,
-,11,89,2,1,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,
-,12,89,1,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
-,13,89,1,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
+,7,89,1,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,
+,8,89,2,1,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,
+,9,89,3,1,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,
+,10,89,1,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,
+,11,89,2,1,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,
+,12,89,1,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,
+,13,89,1,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,
 "sys_refindex",,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/deleteParentContent.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/deleteParentContent.csv
index 4837bc72d1c3..24aa3aae0280 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/deleteParentContent.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/deleteParentContent.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,
+,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,
 ,1,0,256,0,0,0,0,0,0,"FunctionalTest",0,,,,,
 ,88,1,256,0,0,0,0,0,0,"DataHandlerTest",0,,,,,
 ,89,88,256,0,0,0,0,0,0,"Relations",1,,,,,
@@ -9,41 +9,41 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,
 ,298,89,512,1,0,0,0,0,0,0,0,"Regular Element #2",1,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers"
 ,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
-,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2
-,4,89,2,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1
-,5,89,1,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2
+,4,89,2,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1
+,5,89,1,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices"
-,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
-,6,89,2,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2
-,7,89,1,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1
-,8,89,1,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3
+,6,89,2,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2
+,7,89,1,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1
+,8,89,1,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",
-,7,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
-,8,89,2,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,
-,9,89,3,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,
-,10,89,1,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,
-,11,89,2,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,
-,12,89,1,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
-,13,89,1,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
+,7,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,
+,8,89,2,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,
+,9,89,3,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,
+,10,89,1,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,
+,11,89,2,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,
+,12,89,1,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,
+,13,89,1,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,
 "sys_refindex",,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/inlineLocalizeSynchronizeLocalizeMissing.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/inlineLocalizeSynchronizeLocalizeMissing.csv
index cacc77360692..c6afb175e827 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/inlineLocalizeSynchronizeLocalizeMissing.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/inlineLocalizeSynchronizeLocalizeMissing.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","l10n_source","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,
+,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","l10n_source","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,
 ,1,0,256,0,0,0,0,0,0,0,0,0,"FunctionalTest",0,,
 ,88,1,256,0,0,0,0,0,0,0,0,0,"DataHandlerTest",0,,
 ,89,88,256,0,0,0,0,0,0,0,0,0,"Relations",1,,
@@ -10,88 +10,88 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,
 ,299,89,384,0,1,297,297,0,0,0,0,"[Translate to Dansk:] Regular Element #1",2,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers"
 ,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
-,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2
-,4,89,1026,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1
-,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1
-,6,89,1,1,1,3,3,0,0,0,0,"[Translate to Dansk:] Hotel #1",299,"tt_content",1nff.hotels,2
-,7,89,1,0,1,4,4,0,0,0,0,"[Translate to Dansk:] Hotel #2",299,"tt_content",1nff.hotels,1
-,8,89,2,0,1,3,3,0,0,0,0,"[Translate to Dansk:] Hotel #1",299,"tt_content",1nff.hotels,2
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2
+,4,89,1026,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1
+,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1
+,6,89,1,1,1,3,3,0,0,0,0,"[Translate to Dansk:] Hotel #1",299,"tt_content","1nff.hotels",2
+,7,89,1,0,1,4,4,0,0,0,0,"[Translate to Dansk:] Hotel #2",299,"tt_content","1nff.hotels",1
+,8,89,2,0,1,3,3,0,0,0,0,"[Translate to Dansk:] Hotel #1",299,"tt_content","1nff.hotels",2
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices"
-,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
-,6,89,1538,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2
-,7,89,1,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1
-,8,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
-,9,89,1,1,1,5,5,0,0,0,0,"[Translate to Dansk:] Offer #1.1",6,"tx_irretutorial_1nff_hotel",,3
-,10,89,514,1,1,6,6,0,0,0,0,"[Translate to Dansk:] Offer #1.2",6,"tx_irretutorial_1nff_hotel",,2
-,11,89,1,0,1,7,7,0,0,0,0,"[Translate to Dansk:] Offer #2.1",7,"tx_irretutorial_1nff_hotel",,1
-,12,89,1,0,1,5,5,0,0,0,0,"[Translate to Dansk:] Offer #1.1",8,"tx_irretutorial_1nff_hotel",,3
-,13,89,2,0,1,6,6,0,0,0,0,"[Translate to Dansk:] Offer #1.2",8,"tx_irretutorial_1nff_hotel",,2
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3
+,6,89,1538,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2
+,7,89,1,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1
+,8,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1
+,9,89,1,1,1,5,5,0,0,0,0,"[Translate to Dansk:] Offer #1.1",6,"tx_testirreforeignfield_hotel",,3
+,10,89,514,1,1,6,6,0,0,0,0,"[Translate to Dansk:] Offer #1.2",6,"tx_testirreforeignfield_hotel",,2
+,11,89,1,0,1,7,7,0,0,0,0,"[Translate to Dansk:] Offer #2.1",7,"tx_testirreforeignfield_hotel",,1
+,12,89,1,0,1,5,5,0,0,0,0,"[Translate to Dansk:] Offer #1.1",8,"tx_testirreforeignfield_hotel",,3
+,13,89,2,0,1,6,6,0,0,0,0,"[Translate to Dansk:] Offer #1.2",8,"tx_testirreforeignfield_hotel",,2
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",
-,7,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
-,8,89,2562,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,
-,9,89,4611,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,
-,10,89,1,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,
-,11,89,2562,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,
-,12,89,1,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
-,13,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
-,14,89,1,1,1,7,7,0,0,0,0,"[Translate to Dansk:] Price #1.1.1",9,"tx_irretutorial_1nff_offer",,
-,15,89,1026,1,1,8,8,0,0,0,0,"[Translate to Dansk:] Price #1.1.2",9,"tx_irretutorial_1nff_offer",,
-,16,89,1027,1,1,9,9,0,0,0,0,"[Translate to Dansk:] Price #1.1.3",9,"tx_irretutorial_1nff_offer",,
-,17,89,1,1,1,10,10,0,0,0,0,"[Translate to Dansk:] Price #1.2.1",10,"tx_irretutorial_1nff_offer",,
-,18,89,514,1,1,11,11,0,0,0,0,"[Translate to Dansk:] Price #1.2.2",10,"tx_irretutorial_1nff_offer",,
-,19,89,1,0,1,12,12,0,0,0,0,"[Translate to Dansk:] Price #2.1.1",11,"tx_irretutorial_1nff_offer",,
-,20,89,1,0,1,7,7,0,0,0,0,"[Translate to Dansk:] Price #1.1.1",12,"tx_irretutorial_1nff_offer",,
-,21,89,514,0,1,8,8,0,0,0,0,"[Translate to Dansk:] Price #1.1.2",12,"tx_irretutorial_1nff_offer",,
-,22,89,515,0,1,9,9,0,0,0,0,"[Translate to Dansk:] Price #1.1.3",12,"tx_irretutorial_1nff_offer",,
-,23,89,1,0,1,10,10,0,0,0,0,"[Translate to Dansk:] Price #1.2.1",13,"tx_irretutorial_1nff_offer",,
-,24,89,2,0,1,11,11,0,0,0,0,"[Translate to Dansk:] Price #1.2.2",13,"tx_irretutorial_1nff_offer",,
+,7,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,
+,8,89,2562,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,
+,9,89,4611,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,
+,10,89,1,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,
+,11,89,2562,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,
+,12,89,1,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,
+,13,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,
+,14,89,1,1,1,7,7,0,0,0,0,"[Translate to Dansk:] Price #1.1.1",9,"tx_testirreforeignfield_offer",,
+,15,89,1026,1,1,8,8,0,0,0,0,"[Translate to Dansk:] Price #1.1.2",9,"tx_testirreforeignfield_offer",,
+,16,89,1027,1,1,9,9,0,0,0,0,"[Translate to Dansk:] Price #1.1.3",9,"tx_testirreforeignfield_offer",,
+,17,89,1,1,1,10,10,0,0,0,0,"[Translate to Dansk:] Price #1.2.1",10,"tx_testirreforeignfield_offer",,
+,18,89,514,1,1,11,11,0,0,0,0,"[Translate to Dansk:] Price #1.2.2",10,"tx_testirreforeignfield_offer",,
+,19,89,1,0,1,12,12,0,0,0,0,"[Translate to Dansk:] Price #2.1.1",11,"tx_testirreforeignfield_offer",,
+,20,89,1,0,1,7,7,0,0,0,0,"[Translate to Dansk:] Price #1.1.1",12,"tx_testirreforeignfield_offer",,
+,21,89,514,0,1,8,8,0,0,0,0,"[Translate to Dansk:] Price #1.1.2",12,"tx_testirreforeignfield_offer",,
+,22,89,515,0,1,9,9,0,0,0,0,"[Translate to Dansk:] Price #1.1.3",12,"tx_testirreforeignfield_offer",,
+,23,89,1,0,1,10,10,0,0,0,0,"[Translate to Dansk:] Price #1.2.1",13,"tx_testirreforeignfield_offer",,
+,24,89,2,0,1,11,11,0,0,0,0,"[Translate to Dansk:] Price #1.2.2",13,"tx_testirreforeignfield_offer",,
 "sys_refindex",,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,
 ,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,
-,"7c8c9b61b9e0a4503746dc43ba280829","tx_irretutorial_1nff_price",19,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,
-,"7a9ef38af3fb8b25c5ccf23635ebadbf","tx_irretutorial_1nff_offer",11,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,
-,"14a321d5785ee3f32533644f6842f66d","tx_irretutorial_1nff_offer",11,"prices",,,,0,0,"tx_irretutorial_1nff_price",19,,,,,
-,"cf7e2c4470a57ee188db50ef48ffb4ff","tx_irretutorial_1nff_hotel",7,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_hotel",4,,,,,
-,"7168e38e79af70018f9ed09c164b0f8e","tx_irretutorial_1nff_hotel",7,"offers",,,,0,0,"tx_irretutorial_1nff_offer",11,,,,,
+,"bc0495b2442bb0aa85af6abb062dc921","tx_testirreforeignfield_price",19,"l18n_parent",,,,0,0,"tx_testirreforeignfield_price",12,,,,,
+,"dea86f48b004f2289607739607b73b6e","tx_testirreforeignfield_offer",11,"l18n_parent",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,
+,"b6efb46db8706801d77511ae2d8e0074","tx_testirreforeignfield_offer",11,"prices",,,,0,0,"tx_testirreforeignfield_price",19,,,,,
+,"3736e3a9b63e916e301dacec17abdd1f","tx_testirreforeignfield_hotel",7,"l18n_parent",,,,0,0,"tx_testirreforeignfield_hotel",4,,,,,
+,"8f8520bbca483ee41b2d80a10c36f2a8","tx_testirreforeignfield_hotel",7,"offers",,,,0,0,"tx_testirreforeignfield_offer",11,,,,,
 ,"eed4d62814f2d515b4d7de94badbace1","tt_content",299,"l18n_parent",,,,0,0,"tt_content",297,,,,,
-,"8383c20f5ece68a05f4e73423ceb4f69","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",7,,,,,
-,"a7ec526f65745a9ed027b2a10933fdd6","tx_irretutorial_1nff_price",20,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,
-,"b125eed346ebc5c4c2a2eb8de1dd8395","tx_irretutorial_1nff_price",21,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_price",8,,,,,
-,"6561e05f3d575d709c6d584eae451b38","tx_irretutorial_1nff_price",22,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_price",9,,,,,
-,"0df9080aee368183935c3a52d6b48207","tx_irretutorial_1nff_price",23,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,
-,"f319508e16f6b014460480a0695d66f0","tx_irretutorial_1nff_price",24,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_price",11,,,,,
-,"03ab6236716ead91993a153bfe31ce50","tx_irretutorial_1nff_offer",12,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,
-,"8c2094cd97152334826cfac5852aa42a","tx_irretutorial_1nff_offer",12,"prices",,,,0,0,"tx_irretutorial_1nff_price",20,,,,,
-,"cec60d2e24f81281c55c7fabb028bbe6","tx_irretutorial_1nff_offer",12,"prices",,,,1,0,"tx_irretutorial_1nff_price",21,,,,,
-,"2feab04553408f34c56d822e362c375d","tx_irretutorial_1nff_offer",12,"prices",,,,2,0,"tx_irretutorial_1nff_price",22,,,,,
-,"be8429033419f51acae7b6b2a3b5efd3","tx_irretutorial_1nff_offer",13,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_offer",6,,,,,
-,"054a89b5682e08b475e25c52175099dd","tx_irretutorial_1nff_offer",13,"prices",,,,0,0,"tx_irretutorial_1nff_price",23,,,,,
-,"9e24b979fd462050c6f3c11fbc38ba95","tx_irretutorial_1nff_offer",13,"prices",,,,1,0,"tx_irretutorial_1nff_price",24,,,,,
-,"f8b6ffa451f3fc6c172286643eae0364","tx_irretutorial_1nff_hotel",8,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,
-,"c5adc7befc1ffbaa1d0ef2870b6ff87c","tx_irretutorial_1nff_hotel",8,"offers",,,,0,0,"tx_irretutorial_1nff_offer",12,,,,,
-,"9472e354e3d184330c365c2d28841095","tx_irretutorial_1nff_hotel",8,"offers",,,,1,0,"tx_irretutorial_1nff_offer",13,,,,,
-,"8533721c12fa2a6d3ead3d44e85818db","tt_content",299,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",8,,,,,
+,"3a3ac66303c3333d24712b1f0dbae733","tt_content",299,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",7,,,,,
+,"45e576560ca6cce7004e6f384e93332f","tx_testirreforeignfield_price",20,"l18n_parent",,,,0,0,"tx_testirreforeignfield_price",7,,,,,
+,"465f8a2fe2775fbbb22a86d5d79b4aa2","tx_testirreforeignfield_price",21,"l18n_parent",,,,0,0,"tx_testirreforeignfield_price",8,,,,,
+,"6f22cf9fe4623155a94b75b49fde8391","tx_testirreforeignfield_price",22,"l18n_parent",,,,0,0,"tx_testirreforeignfield_price",9,,,,,
+,"bc615ecf3ad6ceddc31350661743aa49","tx_testirreforeignfield_price",23,"l18n_parent",,,,0,0,"tx_testirreforeignfield_price",10,,,,,
+,"891988205d1af0f05e92e2e85e9273ad","tx_testirreforeignfield_price",24,"l18n_parent",,,,0,0,"tx_testirreforeignfield_price",11,,,,,
+,"143249d9744e51aaab88ac3a83ff72be","tx_testirreforeignfield_offer",12,"l18n_parent",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,
+,"7b83a005a2ce92576cdca33948fcac83","tx_testirreforeignfield_offer",12,"prices",,,,0,0,"tx_testirreforeignfield_price",20,,,,,
+,"89c91fbbad62b162b6a68d0a9c921d70","tx_testirreforeignfield_offer",12,"prices",,,,1,0,"tx_testirreforeignfield_price",21,,,,,
+,"89836722101fc0f8536d84d5723a0c34","tx_testirreforeignfield_offer",12,"prices",,,,2,0,"tx_testirreforeignfield_price",22,,,,,
+,"d98cbbd29b65fff59a66ba7ce94cb838","tx_testirreforeignfield_offer",13,"l18n_parent",,,,0,0,"tx_testirreforeignfield_offer",6,,,,,
+,"d0c30d78ed1b989ffe9f7ac3c8c66f1e","tx_testirreforeignfield_offer",13,"prices",,,,0,0,"tx_testirreforeignfield_price",23,,,,,
+,"6773174bf5091628d9f47d350b02ff8a","tx_testirreforeignfield_offer",13,"prices",,,,1,0,"tx_testirreforeignfield_price",24,,,,,
+,"57e2f662b1309eeead9ca5b52599b1ae","tx_testirreforeignfield_hotel",8,"l18n_parent",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,
+,"25c40cf1c7519a78e429aa850772adf9","tx_testirreforeignfield_hotel",8,"offers",,,,0,0,"tx_testirreforeignfield_offer",12,,,,,
+,"7f517dbaf3477f6e0063948be0c59312","tx_testirreforeignfield_hotel",8,"offers",,,,1,0,"tx_testirreforeignfield_offer",13,,,,,
+,"9e79c4820765f01c0d9482bb1bd0632e","tt_content",299,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",8,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeNCopyPageWSynchronization.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeNCopyPageWSynchronization.csv
index 7f65053c88bd..7fbdc48e1e4c 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeNCopyPageWSynchronization.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeNCopyPageWSynchronization.csv
@@ -1,95 +1,95 @@
 "pages",,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels","l10n_state",,
+,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels","l10n_state",,
 ,1,0,256,0,0,0,0,0,0,0,0,"FunctionalTest",0,,,
 ,88,1,256,0,0,0,0,0,0,0,0,"DataHandlerTest",0,,,
 ,89,88,256,0,0,0,0,0,0,0,0,"Relations",1,,,
 ,90,88,512,0,0,0,0,0,0,0,0,"Target",0,,,
-,91,88,256,0,1,89,0,0,0,0,0,"[Translate to Dansk:] Relations",1,"{""starttime"":""parent"",""endtime"":""parent"",""nav_hide"":""parent"",""url"":""parent"",""lastUpdated"":""parent"",""newUntil"":""parent"",""no_search"":""parent"",""shortcut"":""parent"",""shortcut_mode"":""parent"",""content_from_pid"":""parent"",""author"":""parent"",""author_email"":""parent"",""media"":""parent"",""tx_irretutorial_hotels"":""parent""}",,
+,91,88,256,0,1,89,0,0,0,0,0,"[Translate to Dansk:] Relations",1,"{""starttime"":""parent"",""endtime"":""parent"",""nav_hide"":""parent"",""url"":""parent"",""lastUpdated"":""parent"",""newUntil"":""parent"",""no_search"":""parent"",""shortcut"":""parent"",""shortcut_mode"":""parent"",""content_from_pid"":""parent"",""author"":""parent"",""author_email"":""parent"",""media"":""parent"",""tx_testirreforeignfield_hotels"":""parent""}",,
 ,92,90,256,0,0,0,89,0,0,0,0,"Relations",1,,,
-,93,90,256,0,1,92,91,0,0,0,0,"[Translate to Dansk:] Relations",1,"{""starttime"":""parent"",""endtime"":""parent"",""nav_hide"":""parent"",""url"":""parent"",""lastUpdated"":""parent"",""newUntil"":""parent"",""no_search"":""parent"",""shortcut"":""parent"",""shortcut_mode"":""parent"",""content_from_pid"":""parent"",""author"":""parent"",""author_email"":""parent"",""media"":""parent"",""tx_irretutorial_hotels"":""parent""}",,
+,93,90,256,0,1,92,91,0,0,0,0,"[Translate to Dansk:] Relations",1,"{""starttime"":""parent"",""endtime"":""parent"",""nav_hide"":""parent"",""url"":""parent"",""lastUpdated"":""parent"",""newUntil"":""parent"",""no_search"":""parent"",""shortcut"":""parent"",""shortcut_mode"":""parent"",""content_from_pid"":""parent"",""author"":""parent"",""author_email"":""parent"",""media"":""parent"",""tx_testirreforeignfield_hotels"":""parent""}",,
 "sys_language",,,,,,,,,,,,,,,,
 ,"uid","pid","hidden","title","flag",,,,,,,,,,,
 ,1,0,0,"Dansk","dk",,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,
 ,299,92,256,0,0,0,298,0,0,0,0,"Regular Element #2",1,,,
 ,300,92,128,0,0,0,297,0,0,0,0,"Regular Element #1",2,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers"
 ,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
-,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2
-,4,89,514,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1
-,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1
+,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2
+,4,89,514,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1
+,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1
 ,6,89,1,0,1,2,2,0,0,0,0,"[Translate to Dansk:] Hotel #0",91,"pages",,0
 ,7,92,1,0,0,0,2,0,0,0,0,"Hotel #0",92,"pages",,0
 ,8,92,1,0,1,7,6,0,0,0,0,"[Translate to Dansk:] Hotel #0",93,"pages",,0
-,9,92,1,0,0,0,5,0,0,0,0,"Hotel #1",299,"tt_content",1nff.hotels,1
-,10,92,1,0,0,0,3,0,0,0,0,"Hotel #1",300,"tt_content",1nff.hotels,2
-,11,92,2,0,0,0,4,0,0,0,0,"Hotel #2",300,"tt_content",1nff.hotels,1
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,
+,9,92,1,0,0,0,5,0,0,0,0,"Hotel #1",299,"tt_content","1nff.hotels",1
+,10,92,1,0,0,0,3,0,0,0,0,"Hotel #1",300,"tt_content","1nff.hotels",2
+,11,92,2,0,0,0,4,0,0,0,0,"Hotel #2",300,"tt_content","1nff.hotels",1
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices"
-,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
-,6,89,2,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2
-,7,89,1,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1
-,8,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
-,9,92,1,0,0,0,8,0,0,0,0,"Offer #1.1",9,"tx_irretutorial_1nff_hotel",,1
-,10,92,1,0,0,0,5,0,0,0,0,"Offer #1.1",10,"tx_irretutorial_1nff_hotel",,3
-,11,92,2,0,0,0,6,0,0,0,0,"Offer #1.2",10,"tx_irretutorial_1nff_hotel",,2
-,12,92,1,0,0,0,7,0,0,0,0,"Offer #2.1",11,"tx_irretutorial_1nff_hotel",,1
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3
+,6,89,2,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2
+,7,89,1,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1
+,8,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1
+,9,92,1,0,0,0,8,0,0,0,0,"Offer #1.1",9,"tx_testirreforeignfield_hotel",,1
+,10,92,1,0,0,0,5,0,0,0,0,"Offer #1.1",10,"tx_testirreforeignfield_hotel",,3
+,11,92,2,0,0,0,6,0,0,0,0,"Offer #1.2",10,"tx_testirreforeignfield_hotel",,2
+,12,92,1,0,0,0,7,0,0,0,0,"Offer #2.1",11,"tx_testirreforeignfield_hotel",,1
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",
-,7,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
-,8,89,2,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,
-,9,89,3,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,
-,10,89,1,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,
-,11,89,2,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,
-,12,89,1,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
-,13,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
-,14,92,1,0,0,0,13,0,0,0,0,"Price #1.1.1",9,"tx_irretutorial_1nff_offer",,
-,15,92,1,0,0,0,7,0,0,0,0,"Price #1.1.1",10,"tx_irretutorial_1nff_offer",,
-,16,92,2,0,0,0,8,0,0,0,0,"Price #1.1.2",10,"tx_irretutorial_1nff_offer",,
-,17,92,3,0,0,0,9,0,0,0,0,"Price #1.1.3",10,"tx_irretutorial_1nff_offer",,
-,18,92,1,0,0,0,10,0,0,0,0,"Price #1.2.1",11,"tx_irretutorial_1nff_offer",,
-,19,92,2,0,0,0,11,0,0,0,0,"Price #1.2.2",11,"tx_irretutorial_1nff_offer",,
-,20,92,1,0,0,0,12,0,0,0,0,"Price #2.1.1",12,"tx_irretutorial_1nff_offer",,
+,7,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,
+,8,89,2,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,
+,9,89,3,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,
+,10,89,1,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,
+,11,89,2,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,
+,12,89,1,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,
+,13,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,
+,14,92,1,0,0,0,13,0,0,0,0,"Price #1.1.1",9,"tx_testirreforeignfield_offer",,
+,15,92,1,0,0,0,7,0,0,0,0,"Price #1.1.1",10,"tx_testirreforeignfield_offer",,
+,16,92,2,0,0,0,8,0,0,0,0,"Price #1.1.2",10,"tx_testirreforeignfield_offer",,
+,17,92,3,0,0,0,9,0,0,0,0,"Price #1.1.3",10,"tx_testirreforeignfield_offer",,
+,18,92,1,0,0,0,10,0,0,0,0,"Price #1.2.1",11,"tx_testirreforeignfield_offer",,
+,19,92,2,0,0,0,11,0,0,0,0,"Price #1.2.2",11,"tx_testirreforeignfield_offer",,
+,20,92,1,0,0,0,12,0,0,0,0,"Price #2.1.1",12,"tx_testirreforeignfield_offer",,
 "sys_refindex",,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,
-,"9df0da707ad770af10945358a22789f6","tx_irretutorial_1nff_hotel",6,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,
+,"096ffd63595047e9a0b71cecd2a92c27","tx_testirreforeignfield_hotel",6,"l18n_parent",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,
+,"f8ab061425b734a86ef5e35ad4a51fe7","pages",91,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",6,,,,,
+,"4097fe286d169b28da19589577c83795","tx_testirreforeignfield_hotel",8,"l18n_parent",,,,0,0,"tx_testirreforeignfield_hotel",7,,,,,
+,"91b215a544be8c6406956a672247c89b","tx_testirreforeignfield_hotel",9,"offers",,,,0,0,"tx_testirreforeignfield_offer",9,,,,,
+,"081b85d825f11d4933187c30a6e7f853","tx_testirreforeignfield_hotel",10,"offers",,,,0,0,"tx_testirreforeignfield_offer",10,,,,,
+,"d69fa7c131e39a111ecf13ad5667e363","tx_testirreforeignfield_hotel",10,"offers",,,,1,0,"tx_testirreforeignfield_offer",11,,,,,
+,"da1495f4cfd3a391adc72269dd923049","tx_testirreforeignfield_hotel",11,"offers",,,,0,0,"tx_testirreforeignfield_offer",12,,,,,
+,"2b585eca2dec9acb68d9d6ed4e5c1385","pages",92,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",7,,,,,
+,"dbb12810ebbfd90639feb228ab05e5c3","pages",93,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",8,,,,,
+,"35f57ab5ca24a48eaa8bcb96cbb3157a","tx_testirreforeignfield_offer",9,"prices",,,,0,0,"tx_testirreforeignfield_price",14,,,,,
+,"0b8d08bb967f60d9231811f97c47151d","tx_testirreforeignfield_offer",10,"prices",,,,0,0,"tx_testirreforeignfield_price",15,,,,,
+,"e5702e604310bb04bd9291394bd7b560","tx_testirreforeignfield_offer",10,"prices",,,,1,0,"tx_testirreforeignfield_price",16,,,,,
+,"ffbd17bd4d58ee80e875b5cdd30ab3cf","tx_testirreforeignfield_offer",10,"prices",,,,2,0,"tx_testirreforeignfield_price",17,,,,,
+,"ca9d3af43d483d6d235eae7946e91476","tx_testirreforeignfield_offer",11,"prices",,,,0,0,"tx_testirreforeignfield_price",18,,,,,
+,"14dd08b537108dba2bb1fd3f783a5364","tx_testirreforeignfield_offer",11,"prices",,,,1,0,"tx_testirreforeignfield_price",19,,,,,
+,"7b83a005a2ce92576cdca33948fcac83","tx_testirreforeignfield_offer",12,"prices",,,,0,0,"tx_testirreforeignfield_price",20,,,,,
+,"6d0e0c39fabe3a79e389e2789e61d5df","tt_content",299,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",9,,,,,
+,"a58ab9cdb234a4299053cad36c5a7466","tt_content",300,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",10,,,,,
+,"d8605d8eadd65700c58f7716dd8c0118","tt_content",300,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",11,,,,,
 ,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,
-,"266accee962e071564b66166bb002874","pages",91,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",6,,,,,
-,"f9deb9c241aee46f01a5853da0cc82cf","tx_irretutorial_1nff_hotel",8,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_hotel",7,,,,,
-,"63e1a5c21981a873e4d224f3bca1228e","tx_irretutorial_1nff_hotel",9,"offers",,,,0,0,"tx_irretutorial_1nff_offer",9,,,,,
-,"160abb6141e0a7f8d163e8e254c330ff","tx_irretutorial_1nff_hotel",10,"offers",,,,0,0,"tx_irretutorial_1nff_offer",10,,,,,
-,"b80895aca7f4dcc09a88df0b9f47a27e","tx_irretutorial_1nff_hotel",10,"offers",,,,1,0,"tx_irretutorial_1nff_offer",11,,,,,
-,"d34c592485d6f7b809a7963ca222e788","tx_irretutorial_1nff_hotel",11,"offers",,,,0,0,"tx_irretutorial_1nff_offer",12,,,,,
-,"29b6533c8423c49c7794d8dee1de67d8","pages",92,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",7,,,,,
 ,"1b378366812bd1ad436fa8f62b6a8f1e","pages",93,"l10n_parent",,,,0,0,"pages",92,,,,,
-,"4664db8a28397f4cdd8ba5938ed1b28a","pages",93,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",8,,,,,
-,"d0754983bfe2639c6388e918c5c3c243","tx_irretutorial_1nff_offer",9,"prices",,,,0,0,"tx_irretutorial_1nff_price",14,,,,,
-,"277fb6f278dc9c056e0f3164f5e1778e","tx_irretutorial_1nff_offer",10,"prices",,,,0,0,"tx_irretutorial_1nff_price",15,,,,,
-,"a5c771c375921fe4bfb06c5027fbdd51","tx_irretutorial_1nff_offer",10,"prices",,,,1,0,"tx_irretutorial_1nff_price",16,,,,,
-,"cefb86725658b810bea751e1ac3648a3","tx_irretutorial_1nff_offer",10,"prices",,,,2,0,"tx_irretutorial_1nff_price",17,,,,,
-,"494d75b7b111aa689d15a5c4108ddd0d","tx_irretutorial_1nff_offer",11,"prices",,,,0,0,"tx_irretutorial_1nff_price",18,,,,,
-,"7adf68410be27466611b7e3e97ee6aa6","tx_irretutorial_1nff_offer",11,"prices",,,,1,0,"tx_irretutorial_1nff_price",19,,,,,
-,"8c2094cd97152334826cfac5852aa42a","tx_irretutorial_1nff_offer",12,"prices",,,,0,0,"tx_irretutorial_1nff_price",20,,,,,
-,"e5470d0279dc7478bef260bafb85a891","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",9,,,,,
-,"b4df0893e8a5590c6aece8e7c176bb75","tt_content",300,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",10,,,,,
-,"56b68302d7a01b26e44e8c77699baa6f","tt_content",300,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",11,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageAddMonoglotHotelChildNCopyPageWSynchronization.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageAddMonoglotHotelChildNCopyPageWSynchronization.csv
index 526d7676514f..966c8be53235 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageAddMonoglotHotelChildNCopyPageWSynchronization.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageAddMonoglotHotelChildNCopyPageWSynchronization.csv
@@ -1,28 +1,28 @@
 "pages",,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels","l10n_state",,
+,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels","l10n_state",,
 ,1,0,256,0,0,0,0,0,0,0,0,"FunctionalTest",0,,,
 ,88,1,256,0,0,0,0,0,0,0,0,"DataHandlerTest",0,,,
 ,89,88,256,0,0,0,0,0,0,0,0,"Relations",2,,,
 ,90,88,512,0,0,0,0,0,0,0,0,"Target",0,,,
-,91,88,256,0,1,89,0,0,0,0,0,"[Translate to Dansk:] Relations",2,"{""starttime"":""parent"",""endtime"":""parent"",""nav_hide"":""parent"",""url"":""parent"",""lastUpdated"":""parent"",""newUntil"":""parent"",""no_search"":""parent"",""shortcut"":""parent"",""shortcut_mode"":""parent"",""content_from_pid"":""parent"",""author"":""parent"",""author_email"":""parent"",""media"":""parent"",""tx_irretutorial_hotels"":""parent""}",,
+,91,88,256,0,1,89,0,0,0,0,0,"[Translate to Dansk:] Relations",2,"{""starttime"":""parent"",""endtime"":""parent"",""nav_hide"":""parent"",""url"":""parent"",""lastUpdated"":""parent"",""newUntil"":""parent"",""no_search"":""parent"",""shortcut"":""parent"",""shortcut_mode"":""parent"",""content_from_pid"":""parent"",""author"":""parent"",""author_email"":""parent"",""media"":""parent"",""tx_testirreforeignfield_hotels"":""parent""}",,
 ,92,90,256,0,0,0,89,0,0,0,0,"Relations",2,,,
-,93,90,256,0,1,92,91,0,0,0,0,"[Translate to Dansk:] Relations",2,"{""starttime"":""parent"",""endtime"":""parent"",""nav_hide"":""parent"",""url"":""parent"",""lastUpdated"":""parent"",""newUntil"":""parent"",""no_search"":""parent"",""shortcut"":""parent"",""shortcut_mode"":""parent"",""content_from_pid"":""parent"",""author"":""parent"",""author_email"":""parent"",""media"":""parent"",""tx_irretutorial_hotels"":""parent""}",,
+,93,90,256,0,1,92,91,0,0,0,0,"[Translate to Dansk:] Relations",2,"{""starttime"":""parent"",""endtime"":""parent"",""nav_hide"":""parent"",""url"":""parent"",""lastUpdated"":""parent"",""newUntil"":""parent"",""no_search"":""parent"",""shortcut"":""parent"",""shortcut_mode"":""parent"",""content_from_pid"":""parent"",""author"":""parent"",""author_email"":""parent"",""media"":""parent"",""tx_testirreforeignfield_hotels"":""parent""}",,
 "sys_language",,,,,,,,,,,,,,,,
 ,"uid","pid","hidden","title","flag",,,,,,,,,,,
 ,1,0,0,"Dansk","dk",,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,
 ,299,92,256,0,0,0,298,0,0,0,0,"Regular Element #2",1,,,
 ,300,92,128,0,0,0,297,0,0,0,0,"Regular Element #1",2,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers"
 ,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
-,3,89,513,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2
-,4,89,1026,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1
-,5,89,513,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1
+,3,89,513,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2
+,4,89,1026,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1
+,5,89,513,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1
 ,6,89,1,0,0,0,2,0,0,0,0,"Hotel #0",91,"pages",,0
 ,7,89,2,0,0,0,0,0,0,0,0,"Hotel #007",89,"pages",,0
 ,8,89,2,0,0,0,0,0,0,0,0,"Hotel #007",91,"pages",,0
@@ -30,72 +30,72 @@
 ,10,92,2,0,0,0,7,0,0,0,0,"Hotel #007",92,"pages",,0
 ,11,92,1,0,0,0,6,0,0,0,0,"Hotel #0",93,"pages",,0
 ,12,92,2,0,0,0,8,0,0,0,0,"Hotel #007",93,"pages",,0
-,13,92,1,0,0,0,5,0,0,0,0,"Hotel #1",299,"tt_content",1nff.hotels,1
-,14,92,1,0,0,0,3,0,0,0,0,"Hotel #1",300,"tt_content",1nff.hotels,2
-,15,92,2,0,0,0,4,0,0,0,0,"Hotel #2",300,"tt_content",1nff.hotels,1
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,
+,13,92,1,0,0,0,5,0,0,0,0,"Hotel #1",299,"tt_content","1nff.hotels",1
+,14,92,1,0,0,0,3,0,0,0,0,"Hotel #1",300,"tt_content","1nff.hotels",2
+,15,92,2,0,0,0,4,0,0,0,0,"Hotel #2",300,"tt_content","1nff.hotels",1
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices"
-,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
-,6,89,2,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2
-,7,89,1,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1
-,8,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
-,9,92,1,0,0,0,8,0,0,0,0,"Offer #1.1",13,"tx_irretutorial_1nff_hotel",,1
-,10,92,1,0,0,0,5,0,0,0,0,"Offer #1.1",14,"tx_irretutorial_1nff_hotel",,3
-,11,92,2,0,0,0,6,0,0,0,0,"Offer #1.2",14,"tx_irretutorial_1nff_hotel",,2
-,12,92,1,0,0,0,7,0,0,0,0,"Offer #2.1",15,"tx_irretutorial_1nff_hotel",,1
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3
+,6,89,2,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2
+,7,89,1,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1
+,8,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1
+,9,92,1,0,0,0,8,0,0,0,0,"Offer #1.1",13,"tx_testirreforeignfield_hotel",,1
+,10,92,1,0,0,0,5,0,0,0,0,"Offer #1.1",14,"tx_testirreforeignfield_hotel",,3
+,11,92,2,0,0,0,6,0,0,0,0,"Offer #1.2",14,"tx_testirreforeignfield_hotel",,2
+,12,92,1,0,0,0,7,0,0,0,0,"Offer #2.1",15,"tx_testirreforeignfield_hotel",,1
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",
-,7,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
-,8,89,2,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,
-,9,89,3,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,
-,10,89,1,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,
-,11,89,2,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,
-,12,89,1,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
-,13,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
-,14,92,1,0,0,0,13,0,0,0,0,"Price #1.1.1",9,"tx_irretutorial_1nff_offer",,
-,15,92,1,0,0,0,7,0,0,0,0,"Price #1.1.1",10,"tx_irretutorial_1nff_offer",,
-,16,92,2,0,0,0,8,0,0,0,0,"Price #1.1.2",10,"tx_irretutorial_1nff_offer",,
-,17,92,3,0,0,0,9,0,0,0,0,"Price #1.1.3",10,"tx_irretutorial_1nff_offer",,
-,18,92,1,0,0,0,10,0,0,0,0,"Price #1.2.1",11,"tx_irretutorial_1nff_offer",,
-,19,92,2,0,0,0,11,0,0,0,0,"Price #1.2.2",11,"tx_irretutorial_1nff_offer",,
-,20,92,1,0,0,0,12,0,0,0,0,"Price #2.1.1",12,"tx_irretutorial_1nff_offer",,
+,7,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,
+,8,89,2,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,
+,9,89,3,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,
+,10,89,1,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,
+,11,89,2,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,
+,12,89,1,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,
+,13,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,
+,14,92,1,0,0,0,13,0,0,0,0,"Price #1.1.1",9,"tx_testirreforeignfield_offer",,
+,15,92,1,0,0,0,7,0,0,0,0,"Price #1.1.1",10,"tx_testirreforeignfield_offer",,
+,16,92,2,0,0,0,8,0,0,0,0,"Price #1.1.2",10,"tx_testirreforeignfield_offer",,
+,17,92,3,0,0,0,9,0,0,0,0,"Price #1.1.3",10,"tx_testirreforeignfield_offer",,
+,18,92,1,0,0,0,10,0,0,0,0,"Price #1.2.1",11,"tx_testirreforeignfield_offer",,
+,19,92,2,0,0,0,11,0,0,0,0,"Price #1.2.2",11,"tx_testirreforeignfield_offer",,
+,20,92,1,0,0,0,12,0,0,0,0,"Price #2.1.1",12,"tx_testirreforeignfield_offer",,
 "sys_refindex",,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,
+,"f8ab061425b734a86ef5e35ad4a51fe7","pages",91,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",6,,,,,
+,"9ddcc8187e5538e799ca094df37d2e9a","pages",89,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",7,,,,,
+,"04b3d2bd8b9ca0efefa645d1f9b7a544","pages",91,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",8,,,,,
+,"37b4bcf6ac9bb01071c34f1bcb77614e","tx_testirreforeignfield_hotel",13,"offers",,,,0,0,"tx_testirreforeignfield_offer",9,,,,,
+,"c5cd199fddc18bd71cc6f1cc1dd05b5b","tx_testirreforeignfield_hotel",14,"offers",,,,0,0,"tx_testirreforeignfield_offer",10,,,,,
+,"688f3182b16f3b1393ac139f785278d2","tx_testirreforeignfield_hotel",14,"offers",,,,1,0,"tx_testirreforeignfield_offer",11,,,,,
+,"65b0853000674609812b76b90c60831b","tx_testirreforeignfield_hotel",15,"offers",,,,0,0,"tx_testirreforeignfield_offer",12,,,,,
+,"db9f762deeff03ac22f6bd9439bbc2aa","pages",92,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",9,,,,,
+,"443a2eadc1664ceaebe8032a61dcffce","pages",92,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",10,,,,,
+,"d7bbd0787e7edfcd66be9c18389af505","pages",93,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",11,,,,,
+,"4b797ad7c482dec5473d11cf40e68bd0","pages",93,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",12,,,,,
+,"35f57ab5ca24a48eaa8bcb96cbb3157a","tx_testirreforeignfield_offer",9,"prices",,,,0,0,"tx_testirreforeignfield_price",14,,,,,
+,"0b8d08bb967f60d9231811f97c47151d","tx_testirreforeignfield_offer",10,"prices",,,,0,0,"tx_testirreforeignfield_price",15,,,,,
+,"e5702e604310bb04bd9291394bd7b560","tx_testirreforeignfield_offer",10,"prices",,,,1,0,"tx_testirreforeignfield_price",16,,,,,
+,"ffbd17bd4d58ee80e875b5cdd30ab3cf","tx_testirreforeignfield_offer",10,"prices",,,,2,0,"tx_testirreforeignfield_price",17,,,,,
+,"ca9d3af43d483d6d235eae7946e91476","tx_testirreforeignfield_offer",11,"prices",,,,0,0,"tx_testirreforeignfield_price",18,,,,,
+,"14dd08b537108dba2bb1fd3f783a5364","tx_testirreforeignfield_offer",11,"prices",,,,1,0,"tx_testirreforeignfield_price",19,,,,,
+,"7b83a005a2ce92576cdca33948fcac83","tx_testirreforeignfield_offer",12,"prices",,,,0,0,"tx_testirreforeignfield_price",20,,,,,
+,"654b40a42542e1a7f43516a77e9890d4","tt_content",299,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",13,,,,,
+,"b9e98afeb4053b96e3bec9e88d335c17","tt_content",300,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",14,,,,,
+,"c399d18879a4c8e894969d051f518694","tt_content",300,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",15,,,,,
 ,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,
-,"266accee962e071564b66166bb002874","pages",91,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",6,,,,,
-,"db0b3eb875bac3e17a8164454d0363ff","pages",89,"tx_irretutorial_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",7,,,,,
-,"7da166f108ec3797b6ee9e29f56cb966","pages",91,"tx_irretutorial_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",8,,,,,
-,"b719756489ca39b5babae4a1571f0a86","tx_irretutorial_1nff_hotel",13,"offers",,,,0,0,"tx_irretutorial_1nff_offer",9,,,,,
-,"d9f44e18591db01228ae1804fe5170c7","tx_irretutorial_1nff_hotel",14,"offers",,,,0,0,"tx_irretutorial_1nff_offer",10,,,,,
-,"16e78d84047bbb0d1b983b0babee84c1","tx_irretutorial_1nff_hotel",14,"offers",,,,1,0,"tx_irretutorial_1nff_offer",11,,,,,
-,"8e34a1c1913dfb43f2879c71b83bdfff","tx_irretutorial_1nff_hotel",15,"offers",,,,0,0,"tx_irretutorial_1nff_offer",12,,,,,
-,"dc116a94ce47210e4a1bf40d0080ea67","pages",92,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",9,,,,,
-,"c9ba9169138a12a2c7dc39f4e2833cf7","pages",92,"tx_irretutorial_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",10,,,,,
 ,"1b378366812bd1ad436fa8f62b6a8f1e","pages",93,"l10n_parent",,,,0,0,"pages",92,,,,,
-,"a340f6c8b892f5208d961eb4f1376eff","pages",93,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",11,,,,,
-,"64afb023a0de73bf74f89c1c69c57a09","pages",93,"tx_irretutorial_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",12,,,,,
-,"d0754983bfe2639c6388e918c5c3c243","tx_irretutorial_1nff_offer",9,"prices",,,,0,0,"tx_irretutorial_1nff_price",14,,,,,
-,"277fb6f278dc9c056e0f3164f5e1778e","tx_irretutorial_1nff_offer",10,"prices",,,,0,0,"tx_irretutorial_1nff_price",15,,,,,
-,"a5c771c375921fe4bfb06c5027fbdd51","tx_irretutorial_1nff_offer",10,"prices",,,,1,0,"tx_irretutorial_1nff_price",16,,,,,
-,"cefb86725658b810bea751e1ac3648a3","tx_irretutorial_1nff_offer",10,"prices",,,,2,0,"tx_irretutorial_1nff_price",17,,,,,
-,"494d75b7b111aa689d15a5c4108ddd0d","tx_irretutorial_1nff_offer",11,"prices",,,,0,0,"tx_irretutorial_1nff_price",18,,,,,
-,"7adf68410be27466611b7e3e97ee6aa6","tx_irretutorial_1nff_offer",11,"prices",,,,1,0,"tx_irretutorial_1nff_price",19,,,,,
-,"8c2094cd97152334826cfac5852aa42a","tx_irretutorial_1nff_offer",12,"prices",,,,0,0,"tx_irretutorial_1nff_price",20,,,,,
-,"0cbdf47080e630e54791bcadb663f8bd","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",13,,,,,
-,"823306489e7e938994f8abc443f38d51","tt_content",300,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",14,,,,,
-,"ed8332940c9de98de81a4fb6744f5f43","tt_content",300,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",15,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageNAddHotelChildWExclude.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageNAddHotelChildWExclude.csv
index 253b6d91f852..4d9f314132ca 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageNAddHotelChildWExclude.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageNAddHotelChildWExclude.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels","l10n_state",,
+,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels","l10n_state",,
 ,1,0,256,0,0,0,0,0,0,0,0,"FunctionalTest",0,,,
 ,88,1,256,0,0,0,0,0,0,0,0,"DataHandlerTest",0,,,
 ,89,88,256,0,0,0,0,0,0,0,0,"Relations",2,,,
@@ -10,53 +10,53 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers"
 ,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
-,3,89,513,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2
-,4,89,1026,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1
-,5,89,513,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1
+,3,89,513,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2
+,4,89,1026,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1
+,5,89,513,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1
 ,6,89,1,0,1,2,2,0,0,0,0,"Hotel #0",91,"pages",,0
 ,7,89,2,0,0,0,0,0,0,0,0,"Hotel #007",89,"pages",,0
 ,8,89,2,0,1,7,0,0,0,0,0,"Hotel #007",91,"pages",,0
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices"
-,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
-,6,89,2,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2
-,7,89,1,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1
-,8,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3
+,6,89,2,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2
+,7,89,1,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1
+,8,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",
-,7,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
-,8,89,2,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,
-,9,89,3,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,
-,10,89,1,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,
-,11,89,2,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,
-,12,89,1,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
-,13,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
+,7,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,
+,8,89,2,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,
+,9,89,3,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,
+,10,89,1,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,
+,11,89,2,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,
+,12,89,1,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,
+,13,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,
 "sys_refindex",,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,
-,"9df0da707ad770af10945358a22789f6","tx_irretutorial_1nff_hotel",6,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,
+,"096ffd63595047e9a0b71cecd2a92c27","tx_testirreforeignfield_hotel",6,"l18n_parent",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,
+,"f8ab061425b734a86ef5e35ad4a51fe7","pages",91,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",6,,,,,
+,"9ddcc8187e5538e799ca094df37d2e9a","pages",89,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",7,,,,,
+,"04b3d2bd8b9ca0efefa645d1f9b7a544","pages",91,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",8,,,,,
+,"4097fe286d169b28da19589577c83795","tx_testirreforeignfield_hotel",8,"l18n_parent",,,,0,0,"tx_testirreforeignfield_hotel",7,,,,,
 ,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,
-,"266accee962e071564b66166bb002874","pages",91,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",6,,,,,
-,"db0b3eb875bac3e17a8164454d0363ff","pages",89,"tx_irretutorial_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",7,,,,,
-,"7da166f108ec3797b6ee9e29f56cb966","pages",91,"tx_irretutorial_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",8,,,,,
-,"f9deb9c241aee46f01a5853da0cc82cf","tx_irretutorial_1nff_hotel",8,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_hotel",7,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageNAddHotelChildWSynchronization.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageNAddHotelChildWSynchronization.csv
index d29824b96d5c..3799cf88e96b 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageNAddHotelChildWSynchronization.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageNAddHotelChildWSynchronization.csv
@@ -1,62 +1,62 @@
 "pages",,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels","l10n_state",,
+,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels","l10n_state",,
 ,1,0,256,0,0,0,0,0,0,0,0,"FunctionalTest",0,,,
 ,88,1,256,0,0,0,0,0,0,0,0,"DataHandlerTest",0,,,
 ,89,88,256,0,0,0,0,0,0,0,0,"Relations",2,,,
 ,90,88,512,0,0,0,0,0,0,0,0,"Target",0,,,
-,91,88,256,0,1,89,0,0,0,0,0,"[Translate to Dansk:] Relations",2,"{""starttime"":""parent"",""endtime"":""parent"",""nav_hide"":""parent"",""url"":""parent"",""lastUpdated"":""parent"",""newUntil"":""parent"",""no_search"":""parent"",""shortcut"":""parent"",""shortcut_mode"":""parent"",""content_from_pid"":""parent"",""author"":""parent"",""author_email"":""parent"",""media"":""parent"",""tx_irretutorial_hotels"":""parent""}",,
+,91,88,256,0,1,89,0,0,0,0,0,"[Translate to Dansk:] Relations",2,"{""starttime"":""parent"",""endtime"":""parent"",""nav_hide"":""parent"",""url"":""parent"",""lastUpdated"":""parent"",""newUntil"":""parent"",""no_search"":""parent"",""shortcut"":""parent"",""shortcut_mode"":""parent"",""content_from_pid"":""parent"",""author"":""parent"",""author_email"":""parent"",""media"":""parent"",""tx_testirreforeignfield_hotels"":""parent""}",,
 "sys_language",,,,,,,,,,,,,,,,
 ,"uid","pid","hidden","title","flag",,,,,,,,,,,
 ,1,0,0,"Dansk","dk",,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers"
 ,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
-,3,89,513,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2
-,4,89,1026,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1
-,5,89,513,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1
+,3,89,513,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2
+,4,89,1026,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1
+,5,89,513,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1
 ,6,89,1,0,1,2,2,0,0,0,0,"[Translate to Dansk:] Hotel #0",91,"pages",,0
 ,7,89,2,0,0,0,0,0,0,0,0,"Hotel #007",89,"pages",,0
 ,8,89,2,0,1,7,0,0,0,0,0,"[Translate to Dansk:] Hotel #007",91,"pages",,0
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices"
-,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
-,6,89,2,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2
-,7,89,1,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1
-,8,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3
+,6,89,2,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2
+,7,89,1,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1
+,8,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",
-,7,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
-,8,89,2,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,
-,9,89,3,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,
-,10,89,1,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,
-,11,89,2,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,
-,12,89,1,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
-,13,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
+,7,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,
+,8,89,2,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,
+,9,89,3,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,
+,10,89,1,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,
+,11,89,2,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,
+,12,89,1,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,
+,13,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,
 "sys_refindex",,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,
-,"9df0da707ad770af10945358a22789f6","tx_irretutorial_1nff_hotel",6,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,
+,"096ffd63595047e9a0b71cecd2a92c27","tx_testirreforeignfield_hotel",6,"l18n_parent",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,
+,"f8ab061425b734a86ef5e35ad4a51fe7","pages",91,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",6,,,,,
+,"9ddcc8187e5538e799ca094df37d2e9a","pages",89,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",7,,,,,
+,"04b3d2bd8b9ca0efefa645d1f9b7a544","pages",91,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",8,,,,,
+,"4097fe286d169b28da19589577c83795","tx_testirreforeignfield_hotel",8,"l18n_parent",,,,0,0,"tx_testirreforeignfield_hotel",7,,,,,
 ,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,
-,"266accee962e071564b66166bb002874","pages",91,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",6,,,,,
-,"db0b3eb875bac3e17a8164454d0363ff","pages",89,"tx_irretutorial_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",7,,,,,
-,"7da166f108ec3797b6ee9e29f56cb966","pages",91,"tx_irretutorial_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",8,,,,,
-,"f9deb9c241aee46f01a5853da0cc82cf","tx_irretutorial_1nff_hotel",8,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_hotel",7,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageNAddMonoglotHotelChildWSynchronization.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageNAddMonoglotHotelChildWSynchronization.csv
index 1aa318885cc0..bfd7525ee08e 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageNAddMonoglotHotelChildWSynchronization.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageNAddMonoglotHotelChildWSynchronization.csv
@@ -1,60 +1,60 @@
 "pages",,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels","l10n_state",,
+,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels","l10n_state",,
 ,1,0,256,0,0,0,0,0,0,0,0,"FunctionalTest",0,,,
 ,88,1,256,0,0,0,0,0,0,0,0,"DataHandlerTest",0,,,
 ,89,88,256,0,0,0,0,0,0,0,0,"Relations",2,,,
 ,90,88,512,0,0,0,0,0,0,0,0,"Target",0,,,
-,91,88,256,0,1,89,0,0,0,0,0,"[Translate to Dansk:] Relations",2,"{""starttime"":""parent"",""endtime"":""parent"",""nav_hide"":""parent"",""url"":""parent"",""lastUpdated"":""parent"",""newUntil"":""parent"",""no_search"":""parent"",""shortcut"":""parent"",""shortcut_mode"":""parent"",""content_from_pid"":""parent"",""author"":""parent"",""author_email"":""parent"",""media"":""parent"",""tx_irretutorial_hotels"":""parent""}",,
+,91,88,256,0,1,89,0,0,0,0,0,"[Translate to Dansk:] Relations",2,"{""starttime"":""parent"",""endtime"":""parent"",""nav_hide"":""parent"",""url"":""parent"",""lastUpdated"":""parent"",""newUntil"":""parent"",""no_search"":""parent"",""shortcut"":""parent"",""shortcut_mode"":""parent"",""content_from_pid"":""parent"",""author"":""parent"",""author_email"":""parent"",""media"":""parent"",""tx_testirreforeignfield_hotels"":""parent""}",,
 "sys_language",,,,,,,,,,,,,,,,
 ,"uid","pid","hidden","title","flag",,,,,,,,,,,
 ,1,0,0,"Dansk","dk",,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers"
 ,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
-,3,89,513,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2
-,4,89,1026,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1
-,5,89,513,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1
+,3,89,513,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2
+,4,89,1026,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1
+,5,89,513,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1
 ,6,89,1,0,0,0,2,0,0,0,0,"Hotel #0",91,"pages",,0
 ,7,89,2,0,0,0,0,0,0,0,0,"Hotel #007",89,"pages",,0
 ,8,89,2,0,0,0,0,0,0,0,0,"Hotel #007",91,"pages",,0
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices"
-,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
-,6,89,2,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2
-,7,89,1,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1
-,8,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3
+,6,89,2,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2
+,7,89,1,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1
+,8,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",
-,7,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
-,8,89,2,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,
-,9,89,3,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,
-,10,89,1,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,
-,11,89,2,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,
-,12,89,1,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
-,13,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
+,7,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,
+,8,89,2,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,
+,9,89,3,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,
+,10,89,1,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,
+,11,89,2,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,
+,12,89,1,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,
+,13,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,
 "sys_refindex",,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,
+,"f8ab061425b734a86ef5e35ad4a51fe7","pages",91,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",6,,,,,
+,"9ddcc8187e5538e799ca094df37d2e9a","pages",89,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",7,,,,,
+,"04b3d2bd8b9ca0efefa645d1f9b7a544","pages",91,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",8,,,,,
 ,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,
-,"266accee962e071564b66166bb002874","pages",91,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",6,,,,,
-,"db0b3eb875bac3e17a8164454d0363ff","pages",89,"tx_irretutorial_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",7,,,,,
-,"7da166f108ec3797b6ee9e29f56cb966","pages",91,"tx_irretutorial_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",8,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageTwiceWExclude.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageTwiceWExclude.csv
index 0460387c8fce..170379a81b16 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageTwiceWExclude.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageTwiceWExclude.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,
+,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,
 ,1,0,256,0,0,0,0,0,0,0,0,"FunctionalTest",0,,,
 ,88,1,256,0,0,0,0,0,0,0,0,"DataHandlerTest",0,,,
 ,89,88,256,0,0,0,0,0,0,0,0,"Relations",1,,,
@@ -11,52 +11,52 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers"
 ,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
-,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2
-,4,89,1026,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1
-,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1
+,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2
+,4,89,1026,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1
+,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1
 ,6,89,1,0,1,2,2,0,0,0,0,"Hotel #0",91,"pages",,0
 ,7,89,1,0,2,2,2,0,0,0,0,"Hotel #0",92,"pages",,0
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices"
-,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
-,6,89,2,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2
-,7,89,1,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1
-,8,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3
+,6,89,2,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2
+,7,89,1,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1
+,8,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",
-,7,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
-,8,89,2,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,
-,9,89,3,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,
-,10,89,1,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,
-,11,89,2,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,
-,12,89,1,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
-,13,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
+,7,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,
+,8,89,2,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,
+,9,89,3,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,
+,10,89,1,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,
+,11,89,2,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,
+,12,89,1,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,
+,13,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,
 "sys_refindex",,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,
-,"9df0da707ad770af10945358a22789f6","tx_irretutorial_1nff_hotel",6,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,
+,"096ffd63595047e9a0b71cecd2a92c27","tx_testirreforeignfield_hotel",6,"l18n_parent",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,
+,"f8ab061425b734a86ef5e35ad4a51fe7","pages",91,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",6,,,,,
+,"e712993d8340d8c400047f038198bc27","tx_testirreforeignfield_hotel",7,"l18n_parent",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,
+,"2b585eca2dec9acb68d9d6ed4e5c1385","pages",92,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",7,,,,,
 ,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,
-,"266accee962e071564b66166bb002874","pages",91,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",6,,,,,
-,"a46b4c51b6a00b7b4bf6c444128a4ae4","tx_irretutorial_1nff_hotel",7,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,
 ,"2a42323931078b2842779bd9446e8152","pages",92,"l10n_parent",,,,0,0,"pages",89,,,,,
-,"29b6533c8423c49c7794d8dee1de67d8","pages",92,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",7,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageWExclude.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageWExclude.csv
index 824d8524e208..c5979c8e77be 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageWExclude.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageWExclude.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,
+,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,
 ,1,0,256,0,0,0,0,0,0,0,0,"FunctionalTest",0,,,
 ,88,1,256,0,0,0,0,0,0,0,0,"DataHandlerTest",0,,,
 ,89,88,256,0,0,0,0,0,0,0,0,"Relations",1,,,
@@ -10,48 +10,48 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers"
 ,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
-,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2
-,4,89,514,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1
-,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1
+,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2
+,4,89,514,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1
+,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1
 ,6,89,1,0,1,2,2,0,0,0,0,"Hotel #0",91,"pages",,0
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices"
-,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
-,6,89,2,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2
-,7,89,1,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1
-,8,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3
+,6,89,2,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2
+,7,89,1,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1
+,8,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",
-,7,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
-,8,89,2,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,
-,9,89,3,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,
-,10,89,1,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,
-,11,89,2,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,
-,12,89,1,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
-,13,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
+,7,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,
+,8,89,2,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,
+,9,89,3,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,
+,10,89,1,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,
+,11,89,2,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,
+,12,89,1,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,
+,13,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,
 "sys_refindex",,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,
-,"9df0da707ad770af10945358a22789f6","tx_irretutorial_1nff_hotel",6,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,
+,"096ffd63595047e9a0b71cecd2a92c27","tx_testirreforeignfield_hotel",6,"l18n_parent",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,
+,"f8ab061425b734a86ef5e35ad4a51fe7","pages",91,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",6,,,,,
 ,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,
-,"266accee962e071564b66166bb002874","pages",91,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",6,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageWSynchronization.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageWSynchronization.csv
index e598204f44e2..1862dbe3b88a 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageWSynchronization.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageWSynchronization.csv
@@ -1,57 +1,57 @@
 "pages",,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels","l10n_state",,
+,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels","l10n_state",,
 ,1,0,256,0,0,0,0,0,0,0,0,"FunctionalTest",0,,,
 ,88,1,256,0,0,0,0,0,0,0,0,"DataHandlerTest",0,,,
 ,89,88,256,0,0,0,0,0,0,0,0,"Relations",1,,,
 ,90,88,512,0,0,0,0,0,0,0,0,"Target",0,,,
-,91,88,256,0,1,89,0,0,0,0,0,"[Translate to Dansk:] Relations",1,"{""starttime"":""parent"",""endtime"":""parent"",""nav_hide"":""parent"",""url"":""parent"",""lastUpdated"":""parent"",""newUntil"":""parent"",""no_search"":""parent"",""shortcut"":""parent"",""shortcut_mode"":""parent"",""content_from_pid"":""parent"",""author"":""parent"",""author_email"":""parent"",""media"":""parent"",""tx_irretutorial_hotels"":""parent""}",,
+,91,88,256,0,1,89,0,0,0,0,0,"[Translate to Dansk:] Relations",1,"{""starttime"":""parent"",""endtime"":""parent"",""nav_hide"":""parent"",""url"":""parent"",""lastUpdated"":""parent"",""newUntil"":""parent"",""no_search"":""parent"",""shortcut"":""parent"",""shortcut_mode"":""parent"",""content_from_pid"":""parent"",""author"":""parent"",""author_email"":""parent"",""media"":""parent"",""tx_testirreforeignfield_hotels"":""parent""}",,
 "sys_language",,,,,,,,,,,,,,,,
 ,"uid","pid","hidden","title","flag",,,,,,,,,,,
 ,1,0,0,"Dansk","dk",,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers"
 ,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
-,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2
-,4,89,514,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1
-,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1
+,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2
+,4,89,514,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1
+,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1
 ,6,89,1,0,1,2,2,0,0,0,0,"[Translate to Dansk:] Hotel #0",91,"pages",,0
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices"
-,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
-,6,89,2,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2
-,7,89,1,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1
-,8,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3
+,6,89,2,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2
+,7,89,1,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1
+,8,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",
-,7,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
-,8,89,2,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,
-,9,89,3,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,
-,10,89,1,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,
-,11,89,2,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,
-,12,89,1,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
-,13,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
+,7,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,
+,8,89,2,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,
+,9,89,3,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,
+,10,89,1,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,
+,11,89,2,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,
+,12,89,1,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,
+,13,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,
 "sys_refindex",,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,
-,"9df0da707ad770af10945358a22789f6","tx_irretutorial_1nff_hotel",6,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,
+,"096ffd63595047e9a0b71cecd2a92c27","tx_testirreforeignfield_hotel",6,"l18n_parent",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,
+,"f8ab061425b734a86ef5e35ad4a51fe7","pages",91,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",6,,,,,
 ,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,
-,"266accee962e071564b66166bb002874","pages",91,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",6,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageWithSynchronizationAndCustomLocalizedHotel.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageWithSynchronizationAndCustomLocalizedHotel.csv
index a41af7303ea6..4c7d19d5205a 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageWithSynchronizationAndCustomLocalizedHotel.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizePageWithSynchronizationAndCustomLocalizedHotel.csv
@@ -1,59 +1,59 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels","l10n_state",,,
+,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels","l10n_state",,,
 ,1,0,256,0,0,0,0,0,0,0,0,"FunctionalTest",0,,,,
 ,88,1,256,0,0,0,0,0,0,0,0,"DataHandlerTest",0,,,,
 ,89,88,256,0,0,0,0,0,0,0,0,"Relations",1,,,,
 ,90,88,512,0,0,0,0,0,0,0,0,"Target",0,,,,
-,91,88,256,0,1,89,0,0,0,0,0,"[Translate to Dansk:] Relations",2,"{""starttime"":""parent"",""endtime"":""parent"",""nav_hide"":""parent"",""url"":""parent"",""lastUpdated"":""parent"",""newUntil"":""parent"",""no_search"":""parent"",""shortcut"":""parent"",""shortcut_mode"":""parent"",""content_from_pid"":""parent"",""author"":""parent"",""author_email"":""parent"",""media"":""parent"",""tx_irretutorial_hotels"":""custom""}",,,
+,91,88,256,0,1,89,0,0,0,0,0,"[Translate to Dansk:] Relations",2,"{""starttime"":""parent"",""endtime"":""parent"",""nav_hide"":""parent"",""url"":""parent"",""lastUpdated"":""parent"",""newUntil"":""parent"",""no_search"":""parent"",""shortcut"":""parent"",""shortcut_mode"":""parent"",""content_from_pid"":""parent"",""author"":""parent"",""author_email"":""parent"",""media"":""parent"",""tx_testirreforeignfield_hotels"":""custom""}",,,
 "sys_language",,,,,,,,,,,,,,,,,
 ,"uid","pid","hidden","title","flag",,,,,,,,,,,,
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","image","tx_irretutorial_1nff_hotels",,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","image","tx_testirreforeignfield_hotels",,,
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",0,2,,,
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",0,1,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",
 ,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,
-,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,
-,4,89,514,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,
-,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,
+,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,
+,4,89,514,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,
+,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,
 ,6,89,1,0,1,2,2,0,0,0,0,"[Translate to Dansk:] Hotel #0",91,"pages",,0,
 ,7,89,2,0,1,0,0,0,0,0,0,"Hotel in dansk page only",91,"pages",,0,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","l18n_diffsource","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices"
-,5,89,1,0,0,0,,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
-,6,89,2,0,0,0,,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2
-,7,89,1,0,0,0,,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1
-,8,89,1,0,0,0,,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3
+,6,89,2,0,0,0,,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2
+,7,89,1,0,0,0,,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1
+,8,89,1,0,0,0,,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","l18n_diffsource","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",
-,7,89,1,0,0,0,,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
-,8,89,2,0,0,0,,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,
-,9,89,3,0,0,0,,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,
-,10,89,1,0,0,0,,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,
-,11,89,2,0,0,0,,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,
-,12,89,1,0,0,0,,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
-,13,89,1,0,0,0,,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
+,7,89,1,0,0,0,,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,
+,8,89,2,0,0,0,,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,
+,9,89,3,0,0,0,,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,
+,10,89,1,0,0,0,,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,
+,11,89,2,0,0,0,,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,
+,12,89,1,0,0,0,,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,
+,13,89,1,0,0,0,,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"9df0da707ad770af10945358a22789f6","tx_irretutorial_1nff_hotel",6,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
+,"096ffd63595047e9a0b71cecd2a92c27","tx_testirreforeignfield_hotel",6,"l18n_parent",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"f8ab061425b734a86ef5e35ad4a51fe7","pages",91,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",6,,,,,,
+,"d7d24885182409f9124a89e7fbce4343","pages",91,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",7,,,,,,
 ,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,,
-,"266accee962e071564b66166bb002874","pages",91,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",6,,,,,,
-,"26832806a9009a14707170bdd32dfd62","pages",91,"tx_irretutorial_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",7,,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeParentContentChainLanguageSynchronizationSource.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeParentContentChainLanguageSynchronizationSource.csv
index 4b016b022b94..ad136219c289 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeParentContentChainLanguageSynchronizationSource.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeParentContentChainLanguageSynchronizationSource.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,
+,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,
 ,1,0,256,0,0,0,0,0,0,"FunctionalTest",0,,,,,,
 ,88,1,256,0,0,0,0,0,0,"DataHandlerTest",0,,,,,,
 ,89,88,256,0,0,0,0,0,0,"Relations",1,,,,,,
@@ -11,76 +11,76 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","l10n_source","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels","l10n_state",,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","l10n_source","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels","l10n_state",,
 ,297,89,256,0,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,
 ,298,89,512,0,0,0,0,0,0,0,0,0,"Regular Element #2",2,,,
-,299,89,768,0,1,298,298,298,0,0,0,0,"[Translate to Dansk:] Regular Element #2",2,"{""tx_irretutorial_1nff_hotels"":""parent""}",,
-,300,89,1024,0,2,298,299,299,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #2",2,"{""tx_irretutorial_1nff_hotels"":""source""}",,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+,299,89,768,0,1,298,298,298,0,0,0,0,"[Translate to Dansk:] Regular Element #2",2,"{""tx_testirreforeignfield_hotels"":""parent""}",,
+,300,89,1024,0,2,298,299,299,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #2",2,"{""tx_testirreforeignfield_hotels"":""source""}",,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","l10n_source","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers"
 ,2,89,513,0,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
-,3,89,513,0,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2
-,4,89,1538,0,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1
-,5,89,1,0,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1
-,6,89,1,0,1,5,5,5,0,0,0,0,"[Translate to Dansk:] Hotel #1",299,"tt_content",1nff.hotels,1
-,7,89,1,0,2,5,6,6,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Hotel #1",300,"tt_content",1nff.hotels,1
-,8,89,2,0,0,0,0,0,0,0,0,0,"Hotel #2",298,"tt_content",1nff.hotels,0
-,9,89,2,0,1,8,8,0,0,0,0,0,"[Translate to Dansk:] Hotel #2",299,"tt_content",1nff.hotels,0
-,10,89,2,0,2,8,8,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Hotel #2",300,"tt_content",1nff.hotels,0
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,513,0,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2
+,4,89,1538,0,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1
+,5,89,1,0,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1
+,6,89,1,0,1,5,5,5,0,0,0,0,"[Translate to Dansk:] Hotel #1",299,"tt_content","1nff.hotels",1
+,7,89,1,0,2,5,6,6,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Hotel #1",300,"tt_content","1nff.hotels",1
+,8,89,2,0,0,0,0,0,0,0,0,0,"Hotel #2",298,"tt_content","1nff.hotels",0
+,9,89,2,0,1,8,8,0,0,0,0,0,"[Translate to Dansk:] Hotel #2",299,"tt_content","1nff.hotels",0
+,10,89,2,0,2,8,8,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Hotel #2",300,"tt_content","1nff.hotels",0
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","l10n_source","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices"
-,5,89,1,0,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
-,6,89,1026,0,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2
-,7,89,1,0,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1
-,8,89,1,0,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
-,9,89,1,0,1,8,8,8,0,0,0,0,"[Translate to Dansk:] Offer #1.1",6,"tx_irretutorial_1nff_hotel",,1
-,10,89,1,0,2,8,9,9,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Offer #1.1",7,"tx_irretutorial_1nff_hotel",,1
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3
+,6,89,1026,0,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2
+,7,89,1,0,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1
+,8,89,1,0,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1
+,9,89,1,0,1,8,8,8,0,0,0,0,"[Translate to Dansk:] Offer #1.1",6,"tx_testirreforeignfield_hotel",,1
+,10,89,1,0,2,8,9,9,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Offer #1.1",7,"tx_testirreforeignfield_hotel",,1
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","l10n_source","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",
-,7,89,1,0,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
-,8,89,1026,0,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,
-,9,89,1027,0,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,
-,10,89,1,0,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,
-,11,89,1026,0,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,
-,12,89,1,0,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
-,13,89,1,0,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
-,14,89,1,0,1,13,13,13,0,0,0,0,"[Translate to Dansk:] Price #1.1.1",9,"tx_irretutorial_1nff_offer",,
-,15,89,1,0,2,13,14,14,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Price #1.1.1",10,"tx_irretutorial_1nff_offer",,
+,7,89,1,0,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,
+,8,89,1026,0,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,
+,9,89,1027,0,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,
+,10,89,1,0,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,
+,11,89,1026,0,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,
+,12,89,1,0,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,
+,13,89,1,0,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,
+,14,89,1,0,1,13,13,13,0,0,0,0,"[Translate to Dansk:] Price #1.1.1",9,"tx_testirreforeignfield_offer",,
+,15,89,1,0,2,13,14,14,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Price #1.1.1",10,"tx_testirreforeignfield_offer",,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
+,"b66adad459aa936c5af05fbd4c1637ac","tx_testirreforeignfield_price",14,"l18n_parent",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
+,"68e5c6a4c30b43e4e4ce2640c3caceb2","tx_testirreforeignfield_offer",9,"l18n_parent",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"35f57ab5ca24a48eaa8bcb96cbb3157a","tx_testirreforeignfield_offer",9,"prices",,,,0,0,"tx_testirreforeignfield_price",14,,,,,,
+,"a6dffbdd6810a6de3d3af60ef770d04c","tx_testirreforeignfield_hotel",6,"l18n_parent",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"77c47e123fc813a6b465fb99ab716357","tx_testirreforeignfield_hotel",6,"offers",,,,0,0,"tx_testirreforeignfield_offer",9,,,,,,
+,"0e39ecf7ad8b072a1b1fac05ac2dfd4c","tt_content",299,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",6,,,,,,
+,"54a827082ab904de665a619cb44cceaa","tx_testirreforeignfield_price",15,"l18n_parent",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
+,"1d472ae8ad43530657462ce6f08c4ab0","tx_testirreforeignfield_offer",10,"l18n_parent",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"0b8d08bb967f60d9231811f97c47151d","tx_testirreforeignfield_offer",10,"prices",,,,0,0,"tx_testirreforeignfield_price",15,,,,,,
+,"47669a3da80bd6be891c72d80cd2d531","tx_testirreforeignfield_hotel",7,"l18n_parent",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"f14125aa13e88b37c6e61a1714b26a6c","tx_testirreforeignfield_hotel",7,"offers",,,,0,0,"tx_testirreforeignfield_offer",10,,,,,,
+,"10d0276aaa8ab897fa1d1fb601b9628e","tt_content",300,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",7,,,,,,
+,"47ecc62a53b8a1515ffda2c529d041a2","tt_content",298,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",8,,,,,,
+,"ab4f6d6926c701783c24403f810d29ff","tt_content",299,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",9,,,,,,
+,"9384b558e49f337f1984a706e0ff3d27","tt_content",300,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",10,,,,,,
+,"65783b1effbeb741524e083244c9323e","tx_testirreforeignfield_hotel",9,"l18n_parent",,,,0,0,"tx_testirreforeignfield_hotel",8,,,,,,
+,"058eb16e4b1bcfd799e39be777a76009","tx_testirreforeignfield_hotel",10,"l18n_parent",,,,0,0,"tx_testirreforeignfield_hotel",8,,,,,,
 ,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,,
 ,"2a42323931078b2842779bd9446e8152","pages",92,"l10n_parent",,,,0,0,"pages",89,,,,,,
-,"3c507bbfdad3f2a40b04073158fc600b","tx_irretutorial_1nff_price",14,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"fade07fa18e8d5900a634120380ed421","tx_irretutorial_1nff_offer",9,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"d0754983bfe2639c6388e918c5c3c243","tx_irretutorial_1nff_offer",9,"prices",,,,0,0,"tx_irretutorial_1nff_price",14,,,,,,
-,"7588496c840cbdae5640fa2beac65eee","tx_irretutorial_1nff_hotel",6,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
-,"ec78ae01c0f6099f374b80d6740c1e7d","tx_irretutorial_1nff_hotel",6,"offers",,,,0,0,"tx_irretutorial_1nff_offer",9,,,,,,
 ,"6dc66af7d395e5be3c87fc4e13c0455c","tt_content",299,"l18n_parent",,,,0,0,"tt_content",298,,,,,,
-,"c5384f6e9469c07c2e90bca873d93cc1","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",6,,,,,,
-,"15ab2383a097db10b533186c7d07c197","tx_irretutorial_1nff_price",15,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"299a92e95a5a0289812614182f880629","tx_irretutorial_1nff_offer",10,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"277fb6f278dc9c056e0f3164f5e1778e","tx_irretutorial_1nff_offer",10,"prices",,,,0,0,"tx_irretutorial_1nff_price",15,,,,,,
-,"bd06b82bb9288961fa444b181d2167f1","tx_irretutorial_1nff_hotel",7,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
-,"e9c09ac89f1212d5b15f3013e2cee2af","tx_irretutorial_1nff_hotel",7,"offers",,,,0,0,"tx_irretutorial_1nff_offer",10,,,,,,
 ,"96c729dcc96a40a04fd5591a442b68b5","tt_content",300,"l18n_parent",,,,0,0,"tt_content",298,,,,,,
-,"093c0d6fb779e67f62011fa7c0d67437","tt_content",300,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",7,,,,,,
-,"be78553000cb0c8b3440a7c5f8c2f44d","tt_content",298,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",8,,,,,,
-,"41a4430156504ec9044d6c0803955553","tt_content",299,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",9,,,,,,
-,"67b4b0218f2533aff5418fa9d0dae12a","tt_content",300,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",10,,,,,,
-,"a68f6f4deb34438983149e1ba47669c2","tx_irretutorial_1nff_hotel",9,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_hotel",8,,,,,,
-,"557846bc31a575f7d5bcab6a39c64572","tx_irretutorial_1nff_hotel",10,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_hotel",8,,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeParentContentNCreateNestedChildrenWLanguageSynchronization.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeParentContentNCreateNestedChildrenWLanguageSynchronization.csv
index 388933592960..fcd94f374bb8 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeParentContentNCreateNestedChildrenWLanguageSynchronization.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeParentContentNCreateNestedChildrenWLanguageSynchronization.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,
+,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,
 ,1,0,256,0,0,0,0,0,0,"FunctionalTest",0,,,,,,
 ,88,1,256,0,0,0,0,0,0,"DataHandlerTest",0,,,,,,
 ,89,88,256,0,0,0,0,0,0,"Relations",1,,,,,,
@@ -10,71 +10,71 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels","l10n_state",,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels","l10n_state",,,
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2,"\NULL",,,
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",2,"\NULL",,,
-,299,89,768,0,1,298,298,0,0,0,0,"[Translate to Dansk:] Regular Element #2",2,"{""tx_irretutorial_1nff_hotels"":""parent""}",,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+,299,89,768,0,1,298,298,0,0,0,0,"[Translate to Dansk:] Regular Element #2",2,"{""tx_testirreforeignfield_hotels"":""parent""}",,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers","l10n_state"
 ,2,89,513,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,"\NULL"
-,3,89,513,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,"\NULL"
-,4,89,1026,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,"\NULL"
-,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,"\NULL"
-,6,89,1,0,1,5,5,0,0,0,0,"[Translate to Dansk:] Hotel #1",299,"tt_content",1nff.hotels,1,"{""offers"":""parent""}"
-,7,89,2,0,0,0,0,0,0,0,0,"New Hotel #1",298,"tt_content",1nff.hotels,1,"\NULL"
-,8,89,2,0,1,7,0,0,0,0,0,"[Translate to Dansk:] New Hotel #1",299,"tt_content",1nff.hotels,1,"{""offers"":""parent""}"
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,513,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,"\NULL"
+,4,89,1026,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,"\NULL"
+,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,"\NULL"
+,6,89,1,0,1,5,5,0,0,0,0,"[Translate to Dansk:] Hotel #1",299,"tt_content","1nff.hotels",1,"{""offers"":""parent""}"
+,7,89,2,0,0,0,0,0,0,0,0,"New Hotel #1",298,"tt_content","1nff.hotels",1,"\NULL"
+,8,89,2,0,1,7,0,0,0,0,0,"[Translate to Dansk:] New Hotel #1",299,"tt_content","1nff.hotels",1,"{""offers"":""parent""}"
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices","l10n_state"
-,5,89,513,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,"\NULL"
-,6,89,1026,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,"\NULL"
-,7,89,513,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,"\NULL"
-,8,89,513,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,"\NULL"
-,9,89,513,0,1,8,8,0,0,0,0,"[Translate to Dansk:] Offer #1.1",6,"tx_irretutorial_1nff_hotel",,1,"{""prices"":""parent""}"
-,10,89,1,0,0,0,0,0,0,0,0,"New Offer #1.1",7,"tx_irretutorial_1nff_hotel",,1,"\NULL"
-,11,89,1,0,1,10,0,0,0,0,0,"[Translate to Dansk:] New Offer #1.1",8,"tx_irretutorial_1nff_hotel",,1,"{""prices"":""parent""}"
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,513,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,"\NULL"
+,6,89,1026,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,"\NULL"
+,7,89,513,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,"\NULL"
+,8,89,513,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,"\NULL"
+,9,89,513,0,1,8,8,0,0,0,0,"[Translate to Dansk:] Offer #1.1",6,"tx_testirreforeignfield_hotel",,1,"{""prices"":""parent""}"
+,10,89,1,0,0,0,0,0,0,0,0,"New Offer #1.1",7,"tx_testirreforeignfield_hotel",,1,"\NULL"
+,11,89,1,0,1,10,0,0,0,0,0,"[Translate to Dansk:] New Offer #1.1",8,"tx_testirreforeignfield_hotel",,1,"{""prices"":""parent""}"
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","l10n_state",
-,7,89,513,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,"\NULL",
-,8,89,1026,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,"\NULL",
-,9,89,1027,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,"\NULL",
-,10,89,513,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,"\NULL",
-,11,89,1026,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,"\NULL",
-,12,89,513,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,"\NULL",
-,13,89,513,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,"\NULL",
-,14,89,513,0,1,13,13,0,0,0,0,"[Translate to Dansk:] Price #1.1.1",9,"tx_irretutorial_1nff_offer",,"\NULL",
-,15,89,1,0,0,0,0,0,0,0,0,"New Price #1.1.1",10,"tx_irretutorial_1nff_offer",,"\NULL",
-,16,89,1,0,1,15,0,0,0,0,0,"[Translate to Dansk:] New Price #1.1.1",11,"tx_irretutorial_1nff_offer",,"\NULL",
+,7,89,513,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,"\NULL",
+,8,89,1026,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,"\NULL",
+,9,89,1027,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,"\NULL",
+,10,89,513,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,"\NULL",
+,11,89,1026,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,"\NULL",
+,12,89,513,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,"\NULL",
+,13,89,513,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,"\NULL",
+,14,89,513,0,1,13,13,0,0,0,0,"[Translate to Dansk:] Price #1.1.1",9,"tx_testirreforeignfield_offer",,"\NULL",
+,15,89,1,0,0,0,0,0,0,0,0,"New Price #1.1.1",10,"tx_testirreforeignfield_offer",,"\NULL",
+,16,89,1,0,1,15,0,0,0,0,0,"[Translate to Dansk:] New Price #1.1.1",11,"tx_testirreforeignfield_offer",,"\NULL",
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
+,"b66adad459aa936c5af05fbd4c1637ac","tx_testirreforeignfield_price",14,"l18n_parent",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
+,"68e5c6a4c30b43e4e4ce2640c3caceb2","tx_testirreforeignfield_offer",9,"l18n_parent",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"35f57ab5ca24a48eaa8bcb96cbb3157a","tx_testirreforeignfield_offer",9,"prices",,,,0,0,"tx_testirreforeignfield_price",14,,,,,,
+,"a6dffbdd6810a6de3d3af60ef770d04c","tx_testirreforeignfield_hotel",6,"l18n_parent",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"77c47e123fc813a6b465fb99ab716357","tx_testirreforeignfield_hotel",6,"offers",,,,0,0,"tx_testirreforeignfield_offer",9,,,,,,
+,"0e39ecf7ad8b072a1b1fac05ac2dfd4c","tt_content",299,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",6,,,,,,
+,"708e9637fba52252fd0b28cd3d2f1fd5","tt_content",298,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",7,,,,,,
+,"9e79c4820765f01c0d9482bb1bd0632e","tt_content",299,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",8,,,,,,
+,"f14125aa13e88b37c6e61a1714b26a6c","tx_testirreforeignfield_hotel",7,"offers",,,,0,0,"tx_testirreforeignfield_offer",10,,,,,,
+,"4097fe286d169b28da19589577c83795","tx_testirreforeignfield_hotel",8,"l18n_parent",,,,0,0,"tx_testirreforeignfield_hotel",7,,,,,,
+,"68d2a36e9822daadbb85182fcafbc8b5","tx_testirreforeignfield_hotel",8,"offers",,,,0,0,"tx_testirreforeignfield_offer",11,,,,,,
+,"0b8d08bb967f60d9231811f97c47151d","tx_testirreforeignfield_offer",10,"prices",,,,0,0,"tx_testirreforeignfield_price",15,,,,,,
+,"f4d798b24bbca374db114dcd94467f67","tx_testirreforeignfield_offer",11,"l18n_parent",,,,0,0,"tx_testirreforeignfield_offer",10,,,,,,
+,"93cf9871381a2435ac586d6a83b801ea","tx_testirreforeignfield_offer",11,"prices",,,,0,0,"tx_testirreforeignfield_price",16,,,,,,
+,"95d44784896ad40f37817350918ce52f","tx_testirreforeignfield_price",16,"l18n_parent",,,,0,0,"tx_testirreforeignfield_price",15,,,,,,
 ,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,,
-,"3c507bbfdad3f2a40b04073158fc600b","tx_irretutorial_1nff_price",14,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"fade07fa18e8d5900a634120380ed421","tx_irretutorial_1nff_offer",9,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"d0754983bfe2639c6388e918c5c3c243","tx_irretutorial_1nff_offer",9,"prices",,,,0,0,"tx_irretutorial_1nff_price",14,,,,,,
-,"7588496c840cbdae5640fa2beac65eee","tx_irretutorial_1nff_hotel",6,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
-,"ec78ae01c0f6099f374b80d6740c1e7d","tx_irretutorial_1nff_hotel",6,"offers",,,,0,0,"tx_irretutorial_1nff_offer",9,,,,,,
 ,"6dc66af7d395e5be3c87fc4e13c0455c","tt_content",299,"l18n_parent",,,,0,0,"tt_content",298,,,,,,
-,"c5384f6e9469c07c2e90bca873d93cc1","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",6,,,,,,
-,"3186356d41d5349c64afab914747c186","tt_content",298,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",7,,,,,,
-,"8533721c12fa2a6d3ead3d44e85818db","tt_content",299,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",8,,,,,,
-,"e9c09ac89f1212d5b15f3013e2cee2af","tx_irretutorial_1nff_hotel",7,"offers",,,,0,0,"tx_irretutorial_1nff_offer",10,,,,,,
-,"f9deb9c241aee46f01a5853da0cc82cf","tx_irretutorial_1nff_hotel",8,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_hotel",7,,,,,,
-,"bd9fc535705c2e1d650cf90276628081","tx_irretutorial_1nff_hotel",8,"offers",,,,0,0,"tx_irretutorial_1nff_offer",11,,,,,,
-,"277fb6f278dc9c056e0f3164f5e1778e","tx_irretutorial_1nff_offer",10,"prices",,,,0,0,"tx_irretutorial_1nff_price",15,,,,,,
-,"e3f831a73cabfa51b5d4b46a74753290","tx_irretutorial_1nff_offer",11,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_offer",10,,,,,,
-,"3e90e7e724dd19e513c0c77537e839b4","tx_irretutorial_1nff_offer",11,"prices",,,,0,0,"tx_irretutorial_1nff_price",16,,,,,,
-,"b84cd124046f729f73c996d2ade1a4dd","tx_irretutorial_1nff_price",16,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_price",15,,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeParentContentSynchronization.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeParentContentSynchronization.csv
index c5a1f1433aaa..87e7764162b0 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeParentContentSynchronization.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeParentContentSynchronization.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,
+,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,
 ,1,0,256,0,0,0,0,0,0,"FunctionalTest",0,,,,,,
 ,88,1,256,0,0,0,0,0,0,"DataHandlerTest",0,,,,,,
 ,89,88,256,0,0,0,0,0,0,"Relations",1,,,,,,
@@ -10,56 +10,56 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels","l10n_state",,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels","l10n_state",,,
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2,"\NULL",,,
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",1,"\NULL",,,
-,299,89,768,0,1,298,298,0,0,0,0,"[Translate to Dansk:] Regular Element #2",1,"{""tx_irretutorial_1nff_hotels"":""parent""}",,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+,299,89,768,0,1,298,298,0,0,0,0,"[Translate to Dansk:] Regular Element #2",1,"{""tx_testirreforeignfield_hotels"":""parent""}",,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers","l10n_state"
 ,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,"\NULL"
-,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,"\NULL"
-,4,89,514,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,"\NULL"
-,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,"\NULL"
-,6,89,1,0,1,5,5,0,0,0,0,"[Translate to Dansk:] Hotel #1",299,"tt_content",1nff.hotels,1,"{""offers"":""parent""}"
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,"\NULL"
+,4,89,514,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,"\NULL"
+,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,"\NULL"
+,6,89,1,0,1,5,5,0,0,0,0,"[Translate to Dansk:] Hotel #1",299,"tt_content","1nff.hotels",1,"{""offers"":""parent""}"
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices","l10n_state"
-,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,"\NULL"
-,6,89,514,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,"\NULL"
-,7,89,1,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,"\NULL"
-,8,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,"\NULL"
-,9,89,1,0,1,8,8,0,0,0,0,"[Translate to Dansk:] Offer #1.1",6,"tx_irretutorial_1nff_hotel",,1,"{""prices"":""parent""}"
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,"\NULL"
+,6,89,514,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,"\NULL"
+,7,89,1,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,"\NULL"
+,8,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,"\NULL"
+,9,89,1,0,1,8,8,0,0,0,0,"[Translate to Dansk:] Offer #1.1",6,"tx_testirreforeignfield_hotel",,1,"{""prices"":""parent""}"
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","l10n_state",
-,7,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,"\NULL",
-,8,89,514,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,"\NULL",
-,9,89,515,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,"\NULL",
-,10,89,1,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,"\NULL",
-,11,89,514,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,"\NULL",
-,12,89,1,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,"\NULL",
-,13,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,"\NULL",
-,14,89,1,0,1,13,13,0,0,0,0,"[Translate to Dansk:] Price #1.1.1",9,"tx_irretutorial_1nff_offer",,"\NULL",
+,7,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,"\NULL",
+,8,89,514,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,"\NULL",
+,9,89,515,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,"\NULL",
+,10,89,1,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,"\NULL",
+,11,89,514,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,"\NULL",
+,12,89,1,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,"\NULL",
+,13,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,"\NULL",
+,14,89,1,0,1,13,13,0,0,0,0,"[Translate to Dansk:] Price #1.1.1",9,"tx_testirreforeignfield_offer",,"\NULL",
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
 ,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,,
-,"3c507bbfdad3f2a40b04073158fc600b","tx_irretutorial_1nff_price",14,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"fade07fa18e8d5900a634120380ed421","tx_irretutorial_1nff_offer",9,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"d0754983bfe2639c6388e918c5c3c243","tx_irretutorial_1nff_offer",9,"prices",,,,0,0,"tx_irretutorial_1nff_price",14,,,,,,
-,"7588496c840cbdae5640fa2beac65eee","tx_irretutorial_1nff_hotel",6,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
-,"ec78ae01c0f6099f374b80d6740c1e7d","tx_irretutorial_1nff_hotel",6,"offers",,,,0,0,"tx_irretutorial_1nff_offer",9,,,,,,
+,"b66adad459aa936c5af05fbd4c1637ac","tx_testirreforeignfield_price",14,"l18n_parent",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
+,"68e5c6a4c30b43e4e4ce2640c3caceb2","tx_testirreforeignfield_offer",9,"l18n_parent",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"35f57ab5ca24a48eaa8bcb96cbb3157a","tx_testirreforeignfield_offer",9,"prices",,,,0,0,"tx_testirreforeignfield_price",14,,,,,,
+,"a6dffbdd6810a6de3d3af60ef770d04c","tx_testirreforeignfield_hotel",6,"l18n_parent",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"77c47e123fc813a6b465fb99ab716357","tx_testirreforeignfield_hotel",6,"offers",,,,0,0,"tx_testirreforeignfield_offer",9,,,,,,
 ,"6dc66af7d395e5be3c87fc4e13c0455c","tt_content",299,"l18n_parent",,,,0,0,"tt_content",298,,,,,,
-,"c5384f6e9469c07c2e90bca873d93cc1","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",6,,,,,,
+,"0e39ecf7ad8b072a1b1fac05ac2dfd4c","tt_content",299,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",6,,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeParentContentWAllChildren.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeParentContentWAllChildren.csv
index 54384f24af3a..adc7abbeb23a 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeParentContentWAllChildren.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeParentContentWAllChildren.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,
+,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,
 ,1,0,256,0,0,0,0,0,0,"FunctionalTest",0,,,,,
 ,88,1,256,0,0,0,0,0,0,"DataHandlerTest",0,,,,,
 ,89,88,256,0,0,0,0,0,0,"Relations",1,,,,,
@@ -10,56 +10,56 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,
 ,299,89,768,0,1,298,298,0,0,0,0,"[Translate to Dansk:] Regular Element #2",1,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers"
 ,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
-,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2
-,4,89,514,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1
-,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1
-,6,89,1,0,1,5,5,0,0,0,0,"[Translate to Dansk:] Hotel #1",299,"tt_content",1nff.hotels,1
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2
+,4,89,514,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1
+,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1
+,6,89,1,0,1,5,5,0,0,0,0,"[Translate to Dansk:] Hotel #1",299,"tt_content","1nff.hotels",1
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices"
-,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
-,6,89,514,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2
-,7,89,1,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1
-,8,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
-,9,89,1,0,1,8,8,0,0,0,0,"[Translate to Dansk:] Offer #1.1",6,"tx_irretutorial_1nff_hotel",,1
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3
+,6,89,514,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2
+,7,89,1,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1
+,8,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1
+,9,89,1,0,1,8,8,0,0,0,0,"[Translate to Dansk:] Offer #1.1",6,"tx_testirreforeignfield_hotel",,1
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",
-,7,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
-,8,89,514,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,
-,9,89,515,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,
-,10,89,1,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,
-,11,89,514,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,
-,12,89,1,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
-,13,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
-,14,89,1,0,1,13,13,0,0,0,0,"[Translate to Dansk:] Price #1.1.1",9,"tx_irretutorial_1nff_offer",,
+,7,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,
+,8,89,514,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,
+,9,89,515,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,
+,10,89,1,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,
+,11,89,514,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,
+,12,89,1,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,
+,13,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,
+,14,89,1,0,1,13,13,0,0,0,0,"[Translate to Dansk:] Price #1.1.1",9,"tx_testirreforeignfield_offer",,
 "sys_refindex",,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,
+,"b66adad459aa936c5af05fbd4c1637ac","tx_testirreforeignfield_price",14,"l18n_parent",,,,0,0,"tx_testirreforeignfield_price",13,,,,,
+,"68e5c6a4c30b43e4e4ce2640c3caceb2","tx_testirreforeignfield_offer",9,"l18n_parent",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,
+,"35f57ab5ca24a48eaa8bcb96cbb3157a","tx_testirreforeignfield_offer",9,"prices",,,,0,0,"tx_testirreforeignfield_price",14,,,,,
+,"a6dffbdd6810a6de3d3af60ef770d04c","tx_testirreforeignfield_hotel",6,"l18n_parent",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,
+,"77c47e123fc813a6b465fb99ab716357","tx_testirreforeignfield_hotel",6,"offers",,,,0,0,"tx_testirreforeignfield_offer",9,,,,,
+,"0e39ecf7ad8b072a1b1fac05ac2dfd4c","tt_content",299,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",6,,,,,
 ,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,
-,"3c507bbfdad3f2a40b04073158fc600b","tx_irretutorial_1nff_price",14,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,
-,"fade07fa18e8d5900a634120380ed421","tx_irretutorial_1nff_offer",9,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,
-,"d0754983bfe2639c6388e918c5c3c243","tx_irretutorial_1nff_offer",9,"prices",,,,0,0,"tx_irretutorial_1nff_price",14,,,,,
-,"7588496c840cbdae5640fa2beac65eee","tx_irretutorial_1nff_hotel",6,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,
-,"ec78ae01c0f6099f374b80d6740c1e7d","tx_irretutorial_1nff_hotel",6,"offers",,,,0,0,"tx_irretutorial_1nff_offer",9,,,,,
 ,"6dc66af7d395e5be3c87fc4e13c0455c","tt_content",299,"l18n_parent",,,,0,0,"tt_content",298,,,,,
-,"c5384f6e9469c07c2e90bca873d93cc1","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",6,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyOnlyHotelChild.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyOnlyHotelChild.csv
index 9f3c15cf397f..716c18c7636f 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyOnlyHotelChild.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyOnlyHotelChild.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,
+,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,
 ,1,0,256,0,0,0,0,0,0,"FunctionalTest",0,,,,,
 ,88,1,256,0,0,0,0,0,0,"DataHandlerTest",0,,,,,
 ,89,88,256,0,0,0,0,0,0,"Relations",1,,,,,
@@ -9,44 +9,44 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers"
 ,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
-,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2
-,4,89,2,0,0,0,0,0,0,0,0,"Testing #1",297,"tt_content",1nff.hotels,1
-,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2
+,4,89,2,0,0,0,0,0,0,0,0,"Testing #1",297,"tt_content","1nff.hotels",1
+,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices"
-,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
-,6,89,2,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2
-,7,89,1,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1
-,8,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3
+,6,89,2,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2
+,7,89,1,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1
+,8,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",
-,7,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
-,8,89,2,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,
-,9,89,3,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,
-,10,89,1,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,
-,11,89,2,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,
-,12,89,1,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
-,13,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
+,7,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,
+,8,89,2,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,
+,9,89,3,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,
+,10,89,1,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,
+,11,89,2,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,
+,12,89,1,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,
+,13,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,
 "sys_refindex",,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyPage.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyPage.csv
index b315e87a7bbb..e1ca872fad9b 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyPage.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyPage.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,
+,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,
 ,1,0,256,0,0,0,0,0,0,"FunctionalTest",0,,,,,,
 ,88,1,256,0,0,0,0,0,0,"DataHandlerTest",0,,,,,,
 ,89,88,256,0,0,0,0,0,0,"Testing #1",1,,,,,,
@@ -9,44 +9,44 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","image","tx_irretutorial_1nff_hotels",,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","image","tx_testirreforeignfield_hotels",,,
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",0,2,,,
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",0,1,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","l18n_diffsource","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers"
 ,2,89,1,0,0,0,,0,0,0,0,0,"Hotel #0",89,"pages",,0
-,3,89,1,0,0,0,,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2
-,4,89,2,0,0,0,,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1
-,5,89,1,0,0,0,,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2
+,4,89,2,0,0,0,,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1
+,5,89,1,0,0,0,,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","l18n_diffsource","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices"
-,5,89,1,0,0,0,,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
-,6,89,2,0,0,0,,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2
-,7,89,1,0,0,0,,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1
-,8,89,1,0,0,0,,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3
+,6,89,2,0,0,0,,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2
+,7,89,1,0,0,0,,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1
+,8,89,1,0,0,0,,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","l18n_diffsource","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",
-,7,89,1,0,0,0,,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
-,8,89,2,0,0,0,,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,
-,9,89,3,0,0,0,,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,
-,10,89,1,0,0,0,,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,
-,11,89,2,0,0,0,,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,
-,12,89,1,0,0,0,,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
-,13,89,1,0,0,0,,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
+,7,89,1,0,0,0,,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,
+,8,89,2,0,0,0,,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,
+,9,89,3,0,0,0,,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,
+,10,89,1,0,0,0,,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,
+,11,89,2,0,0,0,,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,
+,12,89,1,0,0,0,,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,
+,13,89,1,0,0,0,,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentContent.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentContent.csv
index 2b69b836f498..f2c6d2b6d5d1 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentContent.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentContent.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,
+,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,
 ,1,0,256,0,0,0,0,0,0,"FunctionalTest",0,,,,,,
 ,88,1,256,0,0,0,0,0,0,"DataHandlerTest",0,,,,,,
 ,89,88,256,0,0,0,0,0,0,"Relations",1,,,,,,
@@ -9,44 +9,44 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,,
 ,298,89,512,0,0,0,0,0,0,0,0,"Testing #1",1,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","l18n_diffsource","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers"
 ,2,89,1,0,0,0,,0,0,0,0,0,"Hotel #0",89,"pages",,0
-,3,89,1,0,0,0,,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2
-,4,89,2,0,0,0,,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1
-,5,89,1,0,0,0,,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2
+,4,89,2,0,0,0,,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1
+,5,89,1,0,0,0,,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","l18n_diffsource","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices"
-,5,89,1,0,0,0,,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
-,6,89,2,0,0,0,,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2
-,7,89,1,0,0,0,,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1
-,8,89,1,0,0,0,,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3
+,6,89,2,0,0,0,,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2
+,7,89,1,0,0,0,,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1
+,8,89,1,0,0,0,,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","l18n_diffsource","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",
-,7,89,1,0,0,0,,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
-,8,89,2,0,0,0,,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,
-,9,89,3,0,0,0,,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,
-,10,89,1,0,0,0,,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,
-,11,89,2,0,0,0,,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,
-,12,89,1,0,0,0,,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
-,13,89,1,0,0,0,,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
+,7,89,1,0,0,0,,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,
+,8,89,2,0,0,0,,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,
+,9,89,3,0,0,0,,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,
+,10,89,1,0,0,0,,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,
+,11,89,2,0,0,0,,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,
+,12,89,1,0,0,0,,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,
+,13,89,1,0,0,0,,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNAddHotelChild.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNAddHotelChild.csv
index 31b9ab4f350d..cbfc750f1b8a 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNAddHotelChild.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNAddHotelChild.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,
+,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,
 ,1,0,256,0,0,0,0,0,0,"FunctionalTest",0,,,,,
 ,88,1,256,0,0,0,0,0,0,"DataHandlerTest",0,,,,,
 ,89,88,256,0,0,0,0,0,0,"Relations",1,,,,,
@@ -9,46 +9,46 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",2,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers"
 ,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
-,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2
-,4,89,2,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1
-,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1
-,6,89,2,0,0,0,0,0,0,0,0,"Hotel #2",298,"tt_content",1nff.hotels,0
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2
+,4,89,2,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1
+,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1
+,6,89,2,0,0,0,0,0,0,0,0,"Hotel #2",298,"tt_content","1nff.hotels",0
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices"
-,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
-,6,89,2,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2
-,7,89,1,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1
-,8,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3
+,6,89,2,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2
+,7,89,1,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1
+,8,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",
-,7,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
-,8,89,2,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,
-,9,89,3,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,
-,10,89,1,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,
-,11,89,2,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,
-,12,89,1,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
-,13,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
+,7,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,
+,8,89,2,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,
+,9,89,3,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,
+,10,89,1,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,
+,11,89,2,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,
+,12,89,1,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,
+,13,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,
 "sys_refindex",,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,
-,"de717e02573414cc71f3656c98325951","tt_content",298,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",6,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,
+,"6f5463bfa118f571d698b190d8a6f7bb","tt_content",298,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",6,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNChangeHotelChildrenSorting.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNChangeHotelChildrenSorting.csv
index a89e45d0209e..08bed68cedaa 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNChangeHotelChildrenSorting.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNChangeHotelChildrenSorting.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,
+,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,
 ,1,0,256,0,0,0,0,0,0,"FunctionalTest",0,,,,,
 ,88,1,256,0,0,0,0,0,0,"DataHandlerTest",0,,,,,
 ,89,88,256,0,0,0,0,0,0,"Relations",1,,,,,
@@ -9,44 +9,44 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers"
 ,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
-,3,89,2,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2
-,4,89,1,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1
-,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,
+,3,89,2,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2
+,4,89,1,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1
+,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices"
-,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
-,6,89,2,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2
-,7,89,1,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1
-,8,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3
+,6,89,2,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2
+,7,89,1,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1
+,8,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",
-,7,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
-,8,89,2,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,
-,9,89,3,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,
-,10,89,1,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,
-,11,89,2,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,
-,12,89,1,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
-,13,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
+,7,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,
+,8,89,2,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,
+,9,89,3,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,
+,10,89,1,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,
+,11,89,2,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,
+,12,89,1,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,
+,13,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,
 "sys_refindex",,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,
-,"7bcc41134c060bfa73b90d3567ac49a2","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",4,,,,,
-,"d65e58ff32d9e5931e752c0d5fbf7ced","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",3,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,
+,"065384c0060244f65c861635191c4601","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",4,,,,,
+,"f48173fd32b40982f84ce03c0df3781f","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",3,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNDeleteHotelChild.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNDeleteHotelChild.csv
index 5fdaee00c554..2813c60f841b 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNDeleteHotelChild.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNDeleteHotelChild.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,
+,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,
 ,1,0,256,0,0,0,0,0,0,"FunctionalTest",0,,,,,
 ,88,1,256,0,0,0,0,0,0,"DataHandlerTest",0,,,,,
 ,89,88,256,0,0,0,0,0,0,"Relations",1,,,,,
@@ -9,41 +9,41 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",1,,,
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers"
 ,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
-,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2
-,4,89,2,1,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1
-,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2
+,4,89,2,1,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1
+,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices"
-,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
-,6,89,2,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2
-,7,89,1,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1
-,8,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3
+,6,89,2,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2
+,7,89,1,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1
+,8,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",
-,7,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
-,8,89,2,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,
-,9,89,3,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,
-,10,89,1,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,
-,11,89,2,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,
-,12,89,1,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
-,13,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
+,7,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,
+,8,89,2,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,
+,9,89,3,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,
+,10,89,1,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,
+,11,89,2,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,
+,12,89,1,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,
+,13,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,
 "sys_refindex",,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNHotelChild.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNHotelChild.csv
index 9f3c15cf397f..716c18c7636f 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNHotelChild.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNHotelChild.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,
+,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,
 ,1,0,256,0,0,0,0,0,0,"FunctionalTest",0,,,,,
 ,88,1,256,0,0,0,0,0,0,"DataHandlerTest",0,,,,,
 ,89,88,256,0,0,0,0,0,0,"Relations",1,,,,,
@@ -9,44 +9,44 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers"
 ,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
-,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2
-,4,89,2,0,0,0,0,0,0,0,0,"Testing #1",297,"tt_content",1nff.hotels,1
-,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2
+,4,89,2,0,0,0,0,0,0,0,0,"Testing #1",297,"tt_content","1nff.hotels",1
+,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices"
-,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
-,6,89,2,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2
-,7,89,1,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1
-,8,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3
+,6,89,2,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2
+,7,89,1,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1
+,8,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",
-,7,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
-,8,89,2,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,
-,9,89,3,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,
-,10,89,1,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,
-,11,89,2,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,
-,12,89,1,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
-,13,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
+,7,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,
+,8,89,2,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,
+,9,89,3,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,
+,10,89,1,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,
+,11,89,2,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,
+,12,89,1,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,
+,13,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,
 "sys_refindex",,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/moveParentContentToDifferentPage.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/moveParentContentToDifferentPage.csv
index 1b4bcd6700d2..8890dac068c1 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/moveParentContentToDifferentPage.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/moveParentContentToDifferentPage.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,
+,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,
 ,1,0,256,0,0,0,0,0,0,"FunctionalTest",0,,,,,
 ,88,1,256,0,0,0,0,0,0,"DataHandlerTest",0,,,,,
 ,89,88,256,0,0,0,0,0,0,"Relations",1,,,,,
@@ -9,44 +9,44 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,
 ,298,90,256,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers"
 ,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
-,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2
-,4,89,2,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1
-,5,90,256,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2
+,4,89,2,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1
+,5,90,256,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices"
-,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
-,6,89,2,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2
-,7,89,1,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1
-,8,90,256,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3
+,6,89,2,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2
+,7,89,1,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1
+,8,90,256,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",
-,7,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
-,8,89,2,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,
-,9,89,3,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,
-,10,89,1,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,
-,11,89,2,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,
-,12,89,1,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
-,13,90,256,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
+,7,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,
+,8,89,2,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,
+,9,89,3,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,
+,10,89,1,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,
+,11,89,2,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,
+,12,89,1,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,
+,13,90,256,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,
 "sys_refindex",,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/moveParentContentToDifferentPageNChangeSorting.csv b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/moveParentContentToDifferentPageNChangeSorting.csv
index 37c1856c984f..eed2acb555e4 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/moveParentContentToDifferentPageNChangeSorting.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/moveParentContentToDifferentPageNChangeSorting.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,
+,"uid","pid","sorting","deleted","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,
 ,1,0,256,0,0,0,0,0,0,"FunctionalTest",0,,,,,
 ,88,1,256,0,0,0,0,0,0,"DataHandlerTest",0,,,,,
 ,89,88,256,0,0,0,0,0,0,"Relations",1,,,,,
@@ -9,44 +9,44 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,
 ,297,90,512,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,
 ,298,90,256,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers"
 ,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
-,3,90,64,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2
-,4,90,128,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1
-,5,90,256,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,
+,3,90,64,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2
+,4,90,128,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1
+,5,90,256,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices"
-,5,90,32,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
-,6,90,64,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2
-,7,90,128,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1
-,8,90,256,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,
+,5,90,32,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3
+,6,90,64,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2
+,7,90,128,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1
+,8,90,256,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",
-,7,90,4,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
-,8,90,8,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,
-,9,90,16,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,
-,10,90,32,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,
-,11,90,64,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,
-,12,90,128,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
-,13,90,256,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
+,7,90,4,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,
+,8,90,8,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,
+,9,90,16,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,
+,10,90,32,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,
+,11,90,64,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,
+,12,90,128,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,
+,13,90,256,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,
 "sys_refindex",,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/DataSet/ImportDefault.csv b/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/DataSet/ImportDefault.csv
index 3dbb5af945e4..08ecc63b0b7a 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/DataSet/ImportDefault.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/DataSet/ImportDefault.csv
@@ -21,9 +21,9 @@
 ,29,298,"tt_content",0,1,"categories",,,,,,,,,,
 ,30,298,"tt_content",0,2,"categories",,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","image","categories","tx_irretutorial_1nff_hotels",
-,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",0,2,0,
-,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",0,2,0,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","image","categories",,
+,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",0,2,,
+,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",0,2,,
 "sys_refindex",,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,
 ,"3c637501ab9c158daa933643bff8cc43","sys_category",28,"items",,,,0,0,"tt_content",297,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Classes/Controller/QueueController.php b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Classes/Controller/QueueController.php
index 899c277d38f0..6dd96e729b76 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Classes/Controller/QueueController.php
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Classes/Controller/QueueController.php
@@ -23,6 +23,7 @@ use Psr\Http\Message\ResponseInterface;
 use TYPO3\CMS\Core\Http\Response;
 use TYPO3\CMS\Core\Http\Stream;
 use TYPO3\CMS\Extbase\Http\ForwardResponse;
+use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
 use TYPO3\CMS\Extbase\Mvc\View\JsonView;
 use TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMapFactory;
 use TYPO3\CMS\Extbase\Persistence\PersistenceManagerInterface;
@@ -30,8 +31,10 @@ use TYPO3\CMS\Extbase\Persistence\PersistenceManagerInterface;
 /**
  * ContentController
  */
-class QueueController extends AbstractController
+class QueueController extends ActionController
 {
+    protected DataMapFactory $dataMapFactory;
+    protected QueueService $queueService;
     private ContentRepository $contentRepository;
     private PersistenceManagerInterface $persistenceManager;
 
@@ -46,7 +49,8 @@ class QueueController extends AbstractController
         ContentRepository $contentRepository,
         PersistenceManagerInterface $persistenceManager
     ) {
-        parent::__construct($dataMapFactory, $queueService);
+        $this->dataMapFactory = $dataMapFactory;
+        $this->queueService = $queueService;
         $this->contentRepository = $contentRepository;
         $this->persistenceManager = $persistenceManager;
     }
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/Extbase/Persistence/Classes.php b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/Extbase/Persistence/Classes.php
deleted file mode 100644
index e7be37486735..000000000000
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/Extbase/Persistence/Classes.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-declare(strict_types=1);
-use OliverHader\IrreTutorial\Domain\Model\Content;
-use OliverHader\IrreTutorial\Domain\Model\Hotel;
-use OliverHader\IrreTutorial\Domain\Model\Offer;
-use OliverHader\IrreTutorial\Domain\Model\Price;
-
-return [
-    Content::class => [
-        'tableName' => 'tt_content',
-        'properties' => [
-            'hotels' => [
-                'fieldName' => 'tx_irretutorial_1nff_hotels',
-            ],
-        ],
-    ],
-    Hotel::class => [
-        'tableName' => 'tx_irretutorial_1nff_hotel',
-    ],
-    Offer::class => [
-        'tableName' => 'tx_irretutorial_1nff_offer',
-    ],
-    Price::class => [
-        'tableName' => 'tx_irretutorial_1nff_price',
-    ],
-];
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/ExtensionBuilder/settings.yaml b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/ExtensionBuilder/settings.yaml
deleted file mode 100644
index 0d4dd5290c73..000000000000
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/ExtensionBuilder/settings.yaml
+++ /dev/null
@@ -1,97 +0,0 @@
-#
-# Extension Builder settings for extension irre_tutorial
-# generated 2014-06-06T11:22:00Z
-#
-# See http://www.yaml.org/spec/1.2/spec.html
-#
-
----
-
-###########    Overwrite settings  ###########
-#
-# These settings only apply, if the roundtrip feature of the extension builder
-# is enabled in the extension manager
-#
-# Usage:
-# nesting reflects the file structure
-# a setting applies to a file or recursive to all files and subfolders
-#
-# merge:
-#   means for classes: All properties ,methods and method bodies
-#   of the existing class will be modified according to the new settings
-#   but not overwritten
-#
-#   for locallang xlf files: Existing keys and labels are always
-#   preserved (renaming a property or DomainObject will result in new keys and new labels)
-#
-#   for other files: You will find a Split token at the end of the file
-#   After this token you can write whatever you want and it will be appended
-#   every time the code is generated
-#
-# keep:
-#   files are never overwritten
-#   These settings may break the functionality of the extension builder!
-#   Handle with care!
-#
-#
-
-############  extension settings  ##############
-
-overwriteSettings:
-  Classes:
-    Controller: merge
-    Domain:
-      Model: merge
-      Repository: merge
-
-  Configuration:
-    #TCA: merge
-    #TypoScript: keep
-
-  Resources:
-    Private:
-      #Language: merge
-      #Templates: keep
-    Public:
-      Icons:
-        Extension.gif: keep
-
-#  ext_localconf.php: merge
-
-#  ext_tables.php: merge
-
-#  ext_tables.sql: merge
-
-## use static date attribute in xliff files ##
-#staticDateInXliffFiles: 2014-06-06T11:22:00Z
-
-## list of error codes for warnings that should be ignored ##
-#ignoreWarnings:
-  #503
-
-######### settings for classBuilder #############################
-#
-# here you may define default parent classes for your classes
-# these settings only apply for new generated classes
-# you may also just change the parent class in the generated class file.
-# It will be kept on next code generation, if the overwrite settings
-# are configured to merge it
-#
-#################################################################
-
-classBuilder:
-
-  Controller:
-    parentClass: \TYPO3\CMS\Extbase\Mvc\Controller\ActionController
-
-  Model:
-    AbstractEntity:
-      parentClass: \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
-
-    AbstractValueObject:
-      parentClass: \TYPO3\CMS\Extbase\DomainObject\AbstractValueObject
-
-  Repository:
-    parentClass: \TYPO3\CMS\Extbase\Persistence\Repository
-
-  setDefaultValuesForClassProperties: true
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/Services.yaml b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/Services.yaml
index 71146cd373b7..616f1622da44 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/Services.yaml
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/Services.yaml
@@ -6,4 +6,3 @@ services:
 
   OliverHader\IrreTutorial\:
     resource: '../Classes/*'
-    exclude: '../Classes/Domain/Model'
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/Overrides/pages.php b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/Overrides/pages.php
index e395268d907f..29a601ca8d11 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/Overrides/pages.php
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/Overrides/pages.php
@@ -6,30 +6,3 @@ defined('TYPO3') or die();
 
 // Show copied pages records in frontend request
 $GLOBALS['TCA']['pages']['ctrl']['hideAtCopy'] = false;
-
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTCAcolumns(
-    'pages',
-    [
-        'tx_irretutorial_hotels' => [
-            'exclude' => true,
-            'label' => 'LLL:EXT:irre_tutorial/Resources/Private/Language/locallang_db.xlf:pages.tx_irretutorial_hotels',
-            'config' => [
-                'type' => 'inline',
-                'foreign_table' => 'tx_irretutorial_1nff_hotel',
-                'foreign_field' => 'parentid',
-                'foreign_table_field' => 'parenttable',
-                'maxitems' => 10,
-                'appearance' => [
-                    'showSynchronizationLink' => 1,
-                    'showAllLocalizationLink' => 1,
-                    'showPossibleLocalizationRecords' => 1,
-                ],
-            ],
-        ],
-    ]
-);
-
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addToAllTCAtypes(
-    'pages',
-    '--div--;LLL:EXT:irre_tutorial/Resources/Private/Language/locallang_db.xlf:pages.doktype.div.irre, tx_irretutorial_hotels'
-);
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/Overrides/tt_content.php b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/Overrides/tt_content.php
index f664a1c20119..8b899f7ca808 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/Overrides/tt_content.php
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/Overrides/tt_content.php
@@ -6,48 +6,3 @@ defined('TYPO3') or die();
 
 // Show copied tt_content records in frontend request
 $GLOBALS['TCA']['tt_content']['ctrl']['hideAtCopy'] = false;
-
-\TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin('irre_tutorial', 'Irre', 'IRRE');
-
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTCAcolumns(
-    'tt_content',
-    [
-        'tx_irretutorial_1nff_hotels' => [
-            'exclude' => true,
-            'label' => 'LLL:EXT:irre_tutorial/Resources/Private/Language/locallang_db.xlf:tt_content.tx_irretutorial_1nff_hotels',
-            'config' => [
-                'type' => 'inline',
-                'foreign_table' => 'tx_irretutorial_1nff_hotel',
-                'foreign_field' => 'parentid',
-                'foreign_table_field' => 'parenttable',
-                'foreign_match_fields' => [
-                    // The flex from field below has an inline relation to hotels, too. The
-                    // child table needs a unique string to distinguish the two relations.
-                    'parentidentifier' => '1nff.hotels',
-                ],
-                'maxitems' => 10,
-                'appearance' => [
-                    'showSynchronizationLink' => 1,
-                    'showAllLocalizationLink' => 1,
-                    'showPossibleLocalizationRecords' => 1,
-                ],
-            ],
-        ],
-        'tx_irretutorial_flexform' => [
-            'exclude' => true,
-            'label' => 'LLL:EXT:irre_tutorial/Resources/Private/Language/locallang_db.xlf:tt_content.tx_irretutorial_flexform',
-            'config' => [
-                'type' => 'flex',
-                'ds' => [
-                    'default' => 'FILE:EXT:irre_tutorial/Configuration/FlexForms/tt_content_flexform.xml',
-                ],
-                'default' => '',
-            ],
-        ],
-    ]
-);
-
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addToAllTCAtypes(
-    'tt_content',
-    '--div--;LLL:EXT:irre_tutorial/Resources/Private/Language/locallang_db.xlf:tt_content.div.irre, tx_irretutorial_1nff_hotels, tx_irretutorial_flexform'
-);
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TypoScript/constants.typoscript b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TypoScript/constants.typoscript
deleted file mode 100644
index 15a2cbb1d286..000000000000
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TypoScript/constants.typoscript
+++ /dev/null
@@ -1,15 +0,0 @@
-
-plugin.tx_irretutorial {
-	view {
-		# cat=plugin.tx_irretutorial/file; type=string; label=Path to template root (FE)
-		templateRootPath = EXT:irre_tutorial/Resources/Private/Templates/
-		# cat=plugin.tx_irretutorial/file; type=string; label=Path to template partials (FE)
-		partialRootPath = EXT:irre_tutorial/Resources/Private/Partials/
-		# cat=plugin.tx_irretutorial/file; type=string; label=Path to template layouts (FE)
-		layoutRootPath = EXT:irre_tutorial/Resources/Private/Layouts/
-	}
-	persistence {
-		# cat=plugin.tx_irretutorial//a; type=string; label=Default storage PID
-		storagePid =
-	}
-}
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TypoScript/setup.typoscript b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TypoScript/setup.typoscript
index 9882ab7d7622..490e61993280 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TypoScript/setup.typoscript
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TypoScript/setup.typoscript
@@ -1,43 +1,5 @@
 plugin.tx_irretutorial {
-	view {
-		templateRootPath = {$plugin.tx_irretutorial.view.templateRootPath}
-		partialRootPath = {$plugin.tx_irretutorial.view.partialRootPath}
-		layoutRootPath = {$plugin.tx_irretutorial.view.layoutRootPath}
-	}
 	persistence {
 		storagePid.data = page:uid
 	}
-}
-
-plugin.tx_irretutorial._CSS_DEFAULT_STYLE (
-	textarea.f3-form-error {
-		background-color:#FF9F9F;
-		border: 1px #FF0000 solid;
-	}
-
-	input.f3-form-error {
-		background-color:#FF9F9F;
-		border: 1px #FF0000 solid;
-	}
-
-	.tx-irre-tutorial table {
-		border-collapse:separate;
-		border-spacing:10px;
-	}
-
-	.tx-irre-tutorial table th {
-		font-weight:bold;
-	}
-
-	.tx-irre-tutorial table td {
-		vertical-align:top;
-	}
-
-	.typo3-messages .message-error {
-		color:red;
-	}
-
-	.typo3-messages .message-ok {
-		color:green;
-	}
-)
+}
\ No newline at end of file
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/README.txt b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/README.txt
index 67e8ed737e4c..3a86c6b5ebb9 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/README.txt
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/README.txt
@@ -33,7 +33,6 @@ You can just do, what ever you'd like to. The ext_tables.php and tca.php have a
 their filenames. This should help you to find the case you're looking fore faster. See the following
 description what these strings (e.g. like "tx_irretutorial_<string>_hotel or tca.<string>.php) mean:
 
-	* 1nff: 1:n relations using foreign_field as pointer on child table
 	* mnasym: m:n bidirectional asymmetric relations using intermediate table
 	* mnsym: m:n bidirectional symmetric relations using intermediate table
 	* mnattr: m:n bidirectional asymmetric attributed relations using intermediate table
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Resources/Private/Language/locallang_db.xlf b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Resources/Private/Language/locallang_db.xlf
index 6315551009e7..2374f5d16129 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Resources/Private/Language/locallang_db.xlf
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Resources/Private/Language/locallang_db.xlf
@@ -16,31 +16,7 @@
 			<trans-unit id="pages.doktype.I.233" resname="pages.doktype.I.233">
 				<source>IRRE Tutorial Test Page</source>
 			</trans-unit>
-			<trans-unit id="pages.tx_irretutorial_hotels" resname="pages.tx_irretutorial_hotels">
-				<source>Hotels:</source>
-			</trans-unit>
-			<trans-unit id="tt_content.tx_irretutorial_1nff_hotels" resname="tt_content.tx_irretutorial_1nff_hotels">
-				<source>Hotels (1nff):</source>
-			</trans-unit>
-			<trans-unit id="tt_content.tx_irretutorial_flexform" resname="tt_content.tx_irretutorial_flexform">
-				<source>IRRE:</source>
-			</trans-unit>
-			<trans-unit id="tt_content.tx_irretutorial_flexform.hotels" resname="tt_content.tx_irretutorial_flexform.hotels">
-				<source>IRRE:</source>
-			</trans-unit>
-			<trans-unit id="tt_content.div.irre" resname="tt_content.div.irre">
-				<source>IRRE Tutorial</source>
-			</trans-unit>
 
-			<trans-unit id="tx_irretutorial_1nff_hotel" resname="tx_irretutorial_1nff_hotel">
-				<source>1:n FF: Hotels</source>
-			</trans-unit>
-			<trans-unit id="tx_irretutorial_1nff_offer" resname="tx_irretutorial_1nff_offer">
-				<source>1:n FF: Offers</source>
-			</trans-unit>
-			<trans-unit id="tx_irretutorial_1nff_price" resname="tx_irretutorial_1nff_price">
-				<source>1:n FF: Prices</source>
-			</trans-unit>
 			<trans-unit id="tx_irretutorial_mnasym_hotel" resname="tx_irretutorial_mnasym_hotel">
 				<source>m:n ASym: Hotels</source>
 			</trans-unit>
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Resources/Private/Layouts/Default.html b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Resources/Private/Layouts/Default.html
deleted file mode 100644
index 90a5e68221d1..000000000000
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Resources/Private/Layouts/Default.html
+++ /dev/null
@@ -1,4 +0,0 @@
-
-<div class="tx-irre-tutorial">
-	<f:render section="main" />
-</div>
\ No newline at end of file
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Resources/Private/Partials/Content/FormFields.html b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Resources/Private/Partials/Content/FormFields.html
deleted file mode 100644
index 70f41ecb5437..000000000000
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Resources/Private/Partials/Content/FormFields.html
+++ /dev/null
@@ -1,5 +0,0 @@
-
-<label for="header">
-	<f:translate key="tx_irretutorial_domain_model_content.header" />
-</label><br />
-	<f:form.textfield property="header" /><br />
\ No newline at end of file
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Resources/Private/Partials/Content/Properties.html b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Resources/Private/Partials/Content/Properties.html
deleted file mode 100644
index 254ec6b8f181..000000000000
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Resources/Private/Partials/Content/Properties.html
+++ /dev/null
@@ -1,11 +0,0 @@
-
-<table class="tx-irre-tutorial" >
-	<tr>
-		<td>
-			<f:translate key="tx_irretutorial_domain_model_content.header" />
-		</td>
-		<td>
-		{content.header}
-		</td>
-	</tr>
-</table>
\ No newline at end of file
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Resources/Private/Partials/FormErrors.html b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Resources/Private/Partials/FormErrors.html
deleted file mode 100644
index bdf280a5d481..000000000000
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Resources/Private/Partials/FormErrors.html
+++ /dev/null
@@ -1,13 +0,0 @@
-
-<f:form.validationResults for="{object}">
-	<f:if condition="{validationResults.flattenedErrors}">
-		<ul>
-		<f:for each="{validationResults.flattenedErrors}" key="propertyPath" as="errors">
-			<li>
-			{propertyPath}: <ul>
-				<f:for each="{errors}" as="error"><li>{error}</li></f:for>
-				</ul>
-			</li>
-		</f:for></ul>
-</f:if>
-</f:form.validationResults>
\ No newline at end of file
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Resources/Private/Templates/Content/Edit.html b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Resources/Private/Templates/Content/Edit.html
deleted file mode 100644
index 747e26253c43..000000000000
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Resources/Private/Templates/Content/Edit.html
+++ /dev/null
@@ -1,26 +0,0 @@
-
-<f:layout name="Default" />
-
-This template displays an EDIT form for the current domain object.
-
-If you modify this template, do not forget to change the overwrite settings
-in /Configuration/ExtensionBuilder/settings.yaml:
-  Resources:
-    Private:
-      Templates:
-        Edit.html: keep
-
-Otherwise your changes will be overwritten the next time you save the extension in the extension builder
-
-<f:section name="main">
-<h1>Edit Content</h1>
-
-<f:flashMessages />
-
-<f:render partial="FormErrors" arguments="{object:Content}" />
-
-<f:form action="update" name="content" object="{content}" >
-<f:render partial="Content/FormFields" arguments="{content:content}" />
-	<f:form.submit value="Save" />
-</f:form>
-</f:section>
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Resources/Private/Templates/Content/List.html b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Resources/Private/Templates/Content/List.html
deleted file mode 100644
index 996a16f3ef59..000000000000
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Resources/Private/Templates/Content/List.html
+++ /dev/null
@@ -1,37 +0,0 @@
-
-<f:layout name="Default" />
-
-This Template is responsible for creating a table of domain objects.
-
-If you modify this template, do not forget to change the overwrite settings
-in /Configuration/ExtensionBuilder/settings.yaml:
-  Resources:
-    Private:
-      Templates:
-        List.html: keep
-
-Otherwise your changes will be overwritten the next time you save the extension in the extension builder
-
-<f:section name="main">
-<h1>Listing for Content</h1>
-
-<f:flashMessages />
-
-<table  class="tx_irretutorial" >
-	<tr>
-		<th><f:translate key="tx_irretutorial_domain_model_content.header" /></th>
-		<th> </th>
-		<th> </th>
-	</tr>
-
-	<f:for each="{contents}" as="content">
-		<tr>
-			<td><f:link.action action="show" arguments="{content : content}"> {content.header}</f:link.action></td>
-			<td><f:link.action action="edit" arguments="{content : content}">Edit</f:link.action></td>
-			<td><f:link.action action="delete" arguments="{content : content}">Delete</f:link.action></td>
-		</tr>
-	</f:for>
-</table>
-
-<f:link.action action="new">New Content</f:link.action>
-</f:section>
\ No newline at end of file
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Resources/Private/Templates/Content/New.html b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Resources/Private/Templates/Content/New.html
deleted file mode 100644
index 9b8feb5aed38..000000000000
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Resources/Private/Templates/Content/New.html
+++ /dev/null
@@ -1,26 +0,0 @@
-
-<f:layout name="Default" />
-
-This template displays a NEW form for the current domain object.
-
-If you modify this template, do not forget to change the overwrite settings
-in /Configuration/ExtensionBuilder/settings.yaml:
-  Resources:
-    Private:
-      Templates:
-        New.html: keep
-
-Otherwise your changes will be overwritten the next time you save the extension in the extension builder
-
-<f:section name="main">
-<h1>New Content</h1>
-
-<f:flashMessages />
-
-<f:render partial="FormErrors" arguments="{object:Content}" />
-
-<f:form action="create"  name="newContent" object="{newContent}">
-<f:render partial="Content/FormFields" />
-	<f:form.submit value="Create new" />
-</f:form>
-</f:section>
\ No newline at end of file
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Resources/Private/Templates/Content/Show.html b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Resources/Private/Templates/Content/Show.html
deleted file mode 100644
index 98c18ea45ef7..000000000000
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Resources/Private/Templates/Content/Show.html
+++ /dev/null
@@ -1,23 +0,0 @@
-
-<f:layout name="Default" />
-
-This Template is responsible for displaying a single view for a domain object
-
-If you modify this template, do not forget to change the overwrite settings
-in /Configuration/ExtensionBuilder/settings.yaml:
-  Resources:
-    Private:
-      Templates:
-        Show.html: keep
-
-Otherwise your changes will be overwritten the next time you save the extension in the extension builder
-
-<f:section name="main">
-<h1>Single View for Content</h1>
-<f:debug>{content}</f:debug>
-
-<f:flashMessages />
-<f:render partial="Content/Properties" arguments="{content:content}" />
-<f:link.action action="list">Back to list</f:link.action><br />
-<f:link.action action="new">New Content</f:link.action>
-</f:section>
\ No newline at end of file
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/ext_localconf.php b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/ext_localconf.php
index 8727f2d45adc..8c13d8affe60 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/ext_localconf.php
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/ext_localconf.php
@@ -2,7 +2,6 @@
 
 declare(strict_types=1);
 
-use OliverHader\IrreTutorial\Controller\ContentController;
 use OliverHader\IrreTutorial\Controller\QueueController;
 use TYPO3\CMS\Extbase\Utility\ExtensionUtility;
 
@@ -13,9 +12,5 @@ ExtensionUtility::configurePlugin(
     'Irre',
     [
         QueueController::class => 'index',
-        ContentController::class => 'list, show, new, create, edit, update, delete',
     ],
-    [
-        ContentController::class => 'create, update, delete',
-    ]
 );
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/ext_tables.php b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/ext_tables.php
index eaad0c29306e..d9cff3862bea 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/ext_tables.php
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/ext_tables.php
@@ -7,7 +7,7 @@ use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
 defined('TYPO3') or die();
 
 ExtensionManagementUtility::allowTableOnStandardPages(
-    'tx_irretutorial_1nff_hotel,tx_irretutorial_1nff_offer,tx_irretutorial_1nff_price,tx_irretutorial_mnasym_hotel,tx_irretutorial_mnasym_hotel_offer_rel'
+    'tx_irretutorial_mnasym_hotel,tx_irretutorial_mnasym_hotel_offer_rel'
 );
 ExtensionManagementUtility::allowTableOnStandardPages(
     'tx_irretutorial_mnasym_offer,tx_irretutorial_mnasym_price,tx_irretutorial_mnmmasym_hotel,tx_irretutorial_mnmmasym_offer,tx_irretutorial_mnattr_offer'
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/ext_tables.sql b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/ext_tables.sql
index c4ee980a4ba9..d16ec9bebc67 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/ext_tables.sql
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/ext_tables.sql
@@ -1,63 +1,3 @@
-#######################################################################################################################
-# Extend the pages table to have hotels with a 1:n relationship added there
-#######################################################################################################################
-
-#
-# Table structure for table 'pages'
-#
-CREATE TABLE pages (
-    tx_irretutorial_hotels int(11) DEFAULT '0' NOT NULL
-);
-
-#
-# Table structure for table 'tt_content'
-#
-CREATE TABLE tt_content (
-    tx_irretutorial_1nff_hotels int(11) DEFAULT '0' NOT NULL,
-    tx_irretutorial_flexform mediumtext
-);
-
-#######################################################################################################################
-# 1nff: 1:n relations using foreign_field as pointer on child table
-#######################################################################################################################
-
-#
-# Table structure for table 'tx_irretutorial_1nff_hotel'
-#
-CREATE TABLE tx_irretutorial_1nff_hotel (
-	parentid int(11) DEFAULT '0' NOT NULL,
-	parenttable tinytext NOT NULL,
-	parentidentifier tinytext NOT NULL,
-	title tinytext NOT NULL,
-	offers int(11) DEFAULT '0' NOT NULL
-);
-
-
-
-#
-# Table structure for table 'tx_irretutorial_1nff_offer'
-#
-CREATE TABLE tx_irretutorial_1nff_offer (
-	parentid int(11) DEFAULT '0' NOT NULL,
-	parenttable tinytext NOT NULL,
-	parentidentifier tinytext NOT NULL,
-	title tinytext NOT NULL,
-	prices int(11) DEFAULT '0' NOT NULL
-);
-
-
-
-#
-# Table structure for table 'tx_irretutorial_1nff_price'
-#
-CREATE TABLE tx_irretutorial_1nff_price (
-	parentid int(11) DEFAULT '0' NOT NULL,
-	parenttable tinytext NOT NULL,
-	parentidentifier tinytext NOT NULL,
-	title tinytext NOT NULL,
-	price varchar(255) DEFAULT '0.00' NOT NULL
-);
-
 #######################################################################################################################
 # mnasym: m:n bidirectional anti-symmetric relations using intermediate table
 #######################################################################################################################
@@ -65,7 +5,8 @@ CREATE TABLE tx_irretutorial_1nff_price (
 #
 # Table structure for table 'tx_irretutorial_mnasym_hotel'
 #
-CREATE TABLE tx_irretutorial_mnasym_hotel (
+CREATE TABLE tx_irretutorial_mnasym_hotel
+(
 	title tinytext NOT NULL,
 	offers int(11) DEFAULT '0' NOT NULL
 );
@@ -75,7 +16,8 @@ CREATE TABLE tx_irretutorial_mnasym_hotel (
 #
 # Table structure for table 'tx_irretutorial_mnasym_hotel_offer_rel'
 #
-CREATE TABLE tx_irretutorial_mnasym_hotel_offer_rel (
+CREATE TABLE tx_irretutorial_mnasym_hotel_offer_rel
+(
 	hotelid int(11) DEFAULT '0' NOT NULL,
 	offerid int(11) DEFAULT '0' NOT NULL,
 	hotelsort int(10) DEFAULT '0' NOT NULL,
@@ -88,7 +30,8 @@ CREATE TABLE tx_irretutorial_mnasym_hotel_offer_rel (
 #
 # Table structure for table 'tx_irretutorial_mnasym_offer'
 #
-CREATE TABLE tx_irretutorial_mnasym_offer (
+CREATE TABLE tx_irretutorial_mnasym_offer
+(
 	title tinytext NOT NULL,
 	hotels int(11) DEFAULT '0' NOT NULL
 );
@@ -98,7 +41,8 @@ CREATE TABLE tx_irretutorial_mnasym_offer (
 #
 # Table structure for table 'tx_irretutorial_mnasym_price'
 #
-CREATE TABLE tx_irretutorial_mnasym_price (
+CREATE TABLE tx_irretutorial_mnasym_price
+(
 	parentid int(11) DEFAULT '0' NOT NULL,
 	title tinytext NOT NULL,
 	price varchar(255) DEFAULT '0.00' NOT NULL
@@ -111,7 +55,8 @@ CREATE TABLE tx_irretutorial_mnasym_price (
 #
 # Table structure for table 'tx_irretutorial_mnmmasym_hotel'
 #
-CREATE TABLE tx_irretutorial_mnmmasym_hotel (
+CREATE TABLE tx_irretutorial_mnmmasym_hotel
+(
 	title tinytext NOT NULL,
 	offers int(11) DEFAULT '0' NOT NULL
 );
@@ -121,7 +66,8 @@ CREATE TABLE tx_irretutorial_mnmmasym_hotel (
 #
 # Table structure for table 'tx_irretutorial_mnmmasym_offer'
 #
-CREATE TABLE tx_irretutorial_mnmmasym_offer (
+CREATE TABLE tx_irretutorial_mnmmasym_offer
+(
 	title tinytext NOT NULL,
 	hotels int(11) DEFAULT '0' NOT NULL,
 	prices int(11) DEFAULT '0' NOT NULL
@@ -132,7 +78,8 @@ CREATE TABLE tx_irretutorial_mnmmasym_offer (
 #
 # Table structure for table 'tx_irretutorial_mnmmasym_price'
 #
-CREATE TABLE tx_irretutorial_mnmmasym_price (
+CREATE TABLE tx_irretutorial_mnmmasym_price
+(
 	title tinytext NOT NULL,
 	price varchar(255) DEFAULT '0.00' NOT NULL,
 	offers int(11) DEFAULT '0' NOT NULL
@@ -145,7 +92,8 @@ CREATE TABLE tx_irretutorial_mnmmasym_price (
 #
 # Table structure for table 'tx_irretutorial_mnsym_hotel'
 #
-CREATE TABLE tx_irretutorial_mnsym_hotel (
+CREATE TABLE tx_irretutorial_mnsym_hotel
+(
 	title tinytext NOT NULL,
 	branches int(11) DEFAULT '0' NOT NULL
 );
@@ -155,7 +103,8 @@ CREATE TABLE tx_irretutorial_mnsym_hotel (
 #
 # Table structure for table 'tx_irretutorial_mnsym_hotel_rel'
 #
-CREATE TABLE tx_irretutorial_mnsym_hotel_rel (
+CREATE TABLE tx_irretutorial_mnsym_hotel_rel
+(
 	hotelid int(11) DEFAULT '0' NOT NULL,
 	branchid int(11) DEFAULT '0' NOT NULL,
 	hotelsort int(10) DEFAULT '0' NOT NULL,
@@ -169,7 +118,8 @@ CREATE TABLE tx_irretutorial_mnsym_hotel_rel (
 #
 # Table structure for table 'tx_irretutorial_mnattr_hotel'
 #
-CREATE TABLE tx_irretutorial_mnattr_hotel (
+CREATE TABLE tx_irretutorial_mnattr_hotel
+(
 	title tinytext NOT NULL,
 	offers int(11) DEFAULT '0' NOT NULL
 );
@@ -179,7 +129,8 @@ CREATE TABLE tx_irretutorial_mnattr_hotel (
 #
 # Table structure for table 'tx_irretutorial_mnattr_hotel_offer_rel'
 #
-CREATE TABLE tx_irretutorial_mnattr_hotel_offer_rel (
+CREATE TABLE tx_irretutorial_mnattr_hotel_offer_rel
+(
 	hotelid int(11) DEFAULT '0' NOT NULL,
 	offerid int(11) DEFAULT '0' NOT NULL,
 	hotelsort int(10) DEFAULT '0' NOT NULL,
@@ -193,7 +144,8 @@ CREATE TABLE tx_irretutorial_mnattr_hotel_offer_rel (
 #
 # Table structure for table 'tx_irretutorial_mnattr_offer'
 #
-CREATE TABLE tx_irretutorial_mnattr_offer (
+CREATE TABLE tx_irretutorial_mnattr_offer
+(
 	title tinytext NOT NULL,
 	hotels int(11) DEFAULT '0' NOT NULL
 );
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_csv/Resources/Private/Language/locallang_db.xlf b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_csv/Resources/Private/Language/locallang_db.xlf
index dc116bf1b872..41ff619045d8 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_csv/Resources/Private/Language/locallang_db.xlf
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_csv/Resources/Private/Language/locallang_db.xlf
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-	<file source-language="en" datatype="plaintext" original="EXT:test_irre_csv/Resources/Private/Language/locallang_db.xlf" date="2021-11-13T08:05:00Z" product-name="test_irre_csv">
+	<file source-language="en" datatype="plaintext"
+		  original="EXT:test_irre_csv/Resources/Private/Language/locallang_db.xlf" date="2021-11-13T08:05:00Z"
+		  product-name="test_irre_csv">
 		<header/>
 		<body>
 			<trans-unit id="tabs.general" resname="tabs.general">
@@ -21,10 +23,10 @@
 			<trans-unit id="tx_testirrecsv_price" resname="tx_testirrecsv_price">
 				<source>1:n CSV: Prices</source>
 			</trans-unit>
-			<trans-unit id="pages.div.test_irre_csv" resname="pages.doktype.div.test_irre_csv">
+			<trans-unit id="pages.div.test_irre_csv" resname="pages.div.test_irre_csv">
 				<source>TEST IRRE CSV</source>
 			</trans-unit>
-			<trans-unit id="tt_content.div.test_irre_csv" resname="pages.doktype.div.test_irre_csv">
+			<trans-unit id="tt_content.div.test_irre_csv" resname="pages.div.test_irre_csv">
 				<source>TEST IRRE CSV</source>
 			</trans-unit>
 			<trans-unit id="tx_irretutorial_hotel.title" resname="tx_irretutorial_hotel.title">
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_csv/ext_tables.sql b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_csv/ext_tables.sql
index 68114a064210..3bdb80d2baea 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_csv/ext_tables.sql
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_csv/ext_tables.sql
@@ -7,8 +7,8 @@
 #
 CREATE TABLE tx_testirrecsv_hotel
 (
-	title  tinytext NOT NULL,
-	offers text     NOT NULL
+    title  tinytext NOT NULL,
+    offers text     NOT NULL
 );
 
 #
@@ -16,8 +16,8 @@ CREATE TABLE tx_testirrecsv_hotel
 #
 CREATE TABLE tx_testirrecsv_offer
 (
-	title  tinytext NOT NULL,
-	prices text     NOT NULL
+    title  tinytext NOT NULL,
+    prices text     NOT NULL
 );
 
 #
@@ -25,8 +25,8 @@ CREATE TABLE tx_testirrecsv_offer
 #
 CREATE TABLE tx_testirrecsv_price
 (
-	title tinytext                    NOT NULL,
-	price varchar(255) DEFAULT '0.00' NOT NULL
+    title tinytext                    NOT NULL,
+    price varchar(255) DEFAULT '0.00' NOT NULL
 );
 
 #
@@ -34,7 +34,7 @@ CREATE TABLE tx_testirrecsv_price
 #
 CREATE TABLE pages
 (
-	tx_testirrecsv_hotels text
+    tx_testirrecsv_hotels text
 );
 
 #
@@ -42,5 +42,5 @@ CREATE TABLE pages
 #
 CREATE TABLE tt_content
 (
-	tx_testirrecsv_hotels text
+    tx_testirrecsv_hotels text
 );
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Classes/Controller/AbstractController.php b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Classes/Controller/AbstractController.php
similarity index 89%
rename from typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Classes/Controller/AbstractController.php
rename to typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Classes/Controller/AbstractController.php
index a32e1865bf80..3d8d06b45589 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Classes/Controller/AbstractController.php
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Classes/Controller/AbstractController.php
@@ -15,16 +15,17 @@ declare(strict_types=1);
  * The TYPO3 project - inspiring people to share!
  */
 
-namespace OliverHader\IrreTutorial\Controller;
+namespace TYPO3\TestIrreForeignfield\Controller;
 
-use OliverHader\IrreTutorial\Service\QueueService;
 use Psr\Http\Message\ResponseInterface;
+use TYPO3\CMS\Extbase\DomainObject\AbstractEntity;
 use TYPO3\CMS\Extbase\Http\ForwardResponse;
 use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
 use TYPO3\CMS\Extbase\Mvc\RequestInterface;
 use TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMapFactory;
 use TYPO3\CMS\Extbase\Property\Exception;
 use TYPO3\CMS\Extbase\Reflection\ObjectAccess;
+use TYPO3\TestIrreForeignfield\Service\QueueService;
 
 /**
  * ContentController
@@ -43,8 +44,8 @@ abstract class AbstractController extends ActionController
     }
 
     /**
-     * @param \TYPO3\CMS\Extbase\Mvc\RequestInterface $request
-     * @return \Psr\Http\Message\ResponseInterface
+     * @param RequestInterface $request
+     * @return ResponseInterface
      * @throws \RuntimeException
      */
     public function processRequest(RequestInterface $request): ResponseInterface
@@ -60,7 +61,7 @@ abstract class AbstractController extends ActionController
     }
 
     /**
-     * @param \Iterator|\TYPO3\CMS\Extbase\DomainObject\AbstractEntity[] $iterator
+     * @param \Iterator|AbstractEntity[] $iterator
      * @return array
      */
     protected function getStructure($iterator): array
@@ -105,7 +106,8 @@ abstract class AbstractController extends ActionController
             return (new ForwardResponse('process'))->withControllerName('Queue');
         }
         $this->view->assign('value', $value);
-        return $this->view->render();
+        return $this->responseFactory->createResponse()
+            ->withBody($this->streamFactory->createStream($this->view->render()));
     }
 
     /**
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Classes/Controller/ContentController.php b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Classes/Controller/ContentController.php
similarity index 78%
rename from typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Classes/Controller/ContentController.php
rename to typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Classes/Controller/ContentController.php
index 4de235187229..b6d924adcb9c 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Classes/Controller/ContentController.php
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Classes/Controller/ContentController.php
@@ -15,14 +15,14 @@ declare(strict_types=1);
  * The TYPO3 project - inspiring people to share!
  */
 
-namespace OliverHader\IrreTutorial\Controller;
+namespace TYPO3\TestIrreForeignfield\Controller;
 
-use OliverHader\IrreTutorial\Domain\Model\Content;
-use OliverHader\IrreTutorial\Domain\Repository\ContentRepository;
-use OliverHader\IrreTutorial\Service\QueueService;
 use TYPO3\CMS\Extbase\Annotation as Extbase;
 use TYPO3\CMS\Extbase\Mvc\View\JsonView;
 use TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMapFactory;
+use TYPO3\TestIrreForeignfield\Domain\Model\Content;
+use TYPO3\TestIrreForeignfield\Domain\Repository\ContentRepository;
+use TYPO3\TestIrreForeignfield\Service\QueueService;
 
 /**
  * ContentController
@@ -53,7 +53,7 @@ class ContentController extends AbstractController
     }
 
     /**
-     * @param \OliverHader\IrreTutorial\Domain\Model\Content $content
+     * @param \TYPO3\TestIrreForeignfield\Domain\Model\Content $content
      */
     public function showAction(Content $content)
     {
@@ -62,7 +62,7 @@ class ContentController extends AbstractController
     }
 
     /**
-     * @param \OliverHader\IrreTutorial\Domain\Model\Content $newContent
+     * @param \TYPO3\TestIrreForeignfield\Domain\Model\Content $newContent
      * @Extbase\IgnoreValidation("newContent")
      */
     public function newAction(Content $newContent = null): void
@@ -71,7 +71,7 @@ class ContentController extends AbstractController
     }
 
     /**
-     * @param \OliverHader\IrreTutorial\Domain\Model\Content $newContent
+     * @param \TYPO3\TestIrreForeignfield\Domain\Model\Content $newContent
      */
     public function createAction(Content $newContent): void
     {
@@ -80,7 +80,7 @@ class ContentController extends AbstractController
     }
 
     /**
-     * @param \OliverHader\IrreTutorial\Domain\Model\Content $content
+     * @param \TYPO3\TestIrreForeignfield\Domain\Model\Content $content
      * @Extbase\IgnoreValidation("content")
      */
     public function editAction(Content $content): void
@@ -89,7 +89,7 @@ class ContentController extends AbstractController
     }
 
     /**
-     * @param \OliverHader\IrreTutorial\Domain\Model\Content $content
+     * @param \TYPO3\TestIrreForeignfield\Domain\Model\Content $content
      */
     public function updateAction(Content $content): void
     {
@@ -98,7 +98,7 @@ class ContentController extends AbstractController
     }
 
     /**
-     * @param \OliverHader\IrreTutorial\Domain\Model\Content $content
+     * @param \TYPO3\TestIrreForeignfield\Domain\Model\Content $content
      */
     public function deleteAction(Content $content): void
     {
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Classes/Controller/QueueController.php b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Classes/Controller/QueueController.php
new file mode 100644
index 000000000000..c221eb3654ae
--- /dev/null
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Classes/Controller/QueueController.php
@@ -0,0 +1,102 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the TYPO3 CMS project.
+ *
+ * It is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, either version 2
+ * of the License, or any later version.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ *
+ * The TYPO3 project - inspiring people to share!
+ */
+
+namespace TYPO3\TestIrreForeignfield\Controller;
+
+use Psr\Http\Message\ResponseInterface;
+use TYPO3\CMS\Core\Http\Response;
+use TYPO3\CMS\Core\Http\Stream;
+use TYPO3\CMS\Extbase\Http\ForwardResponse;
+use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
+use TYPO3\CMS\Extbase\Mvc\View\JsonView;
+use TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMapFactory;
+use TYPO3\CMS\Extbase\Persistence\PersistenceManagerInterface;
+use TYPO3\TestIrreForeignfield\Domain\Repository\ContentRepository;
+use TYPO3\TestIrreForeignfield\Service\QueueService;
+
+/**
+ * ContentController
+ */
+class QueueController extends ActionController
+{
+    protected DataMapFactory $dataMapFactory;
+    protected QueueService $queueService;
+    private ContentRepository $contentRepository;
+    private PersistenceManagerInterface $persistenceManager;
+
+    /**
+     * @var string
+     */
+    protected $defaultViewObjectName = JsonView::class;
+
+    public function __construct(
+        DataMapFactory $dataMapFactory,
+        QueueService $queueService,
+        ContentRepository $contentRepository,
+        PersistenceManagerInterface $persistenceManager
+    ) {
+        $this->dataMapFactory = $dataMapFactory;
+        $this->queueService = $queueService;
+        $this->contentRepository = $contentRepository;
+        $this->persistenceManager = $persistenceManager;
+    }
+
+    public function indexAction(): ResponseInterface
+    {
+        $calls = [];
+        $calls[] = ['Content', 'list'];
+        $contents = $this->contentRepository->findAll();
+        foreach ($contents as $content) {
+            $uid = $content->getUid();
+            $calls[] = ['Content', 'show', ['content' => (string)$uid]];
+        }
+        $this->queueService->set($calls);
+        return new ForwardResponse('process');
+    }
+
+    public function processAction(): ResponseInterface
+    {
+        $call = $this->queueService->shift();
+        if ($call === null) {
+            return new ForwardResponse('finish');
+        }
+        // Clear these states and fetch fresh entities!
+        $this->persistenceManager->clearState();
+
+        $response = (new ForwardResponse($call[1]))
+            ->withControllerName($call[0]);
+
+        $arguments = $call[2] ?? null;
+        if (is_array($arguments)) {
+            $response = $response->withArguments($arguments);
+        }
+
+        return $response;
+    }
+
+    public function finishAction(): ResponseInterface
+    {
+        $typoScriptFrontendController = $GLOBALS['TSFE'];
+        $typoScriptFrontendController->setContentType('application/json');
+
+        $value = $this->queueService->getValues();
+        $this->view->assign('value', $value);
+        $body = new Stream('php://temp', 'rw');
+        $body->write($this->view->render());
+        return new Response($body);
+    }
+}
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Classes/Domain/Model/Content.php b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Classes/Domain/Model/Content.php
similarity index 90%
rename from typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Classes/Domain/Model/Content.php
rename to typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Classes/Domain/Model/Content.php
index 94e8347c1fd3..2bb75c0cbbb1 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Classes/Domain/Model/Content.php
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Classes/Domain/Model/Content.php
@@ -15,7 +15,7 @@ declare(strict_types=1);
  * The TYPO3 project - inspiring people to share!
  */
 
-namespace OliverHader\IrreTutorial\Domain\Model;
+namespace TYPO3\TestIrreForeignfield\Domain\Model;
 
 use TYPO3\CMS\Extbase\DomainObject\AbstractEntity;
 use TYPO3\CMS\Extbase\Persistence\ObjectStorage;
@@ -31,7 +31,7 @@ class Content extends AbstractEntity
     protected $header = '';
 
     /**
-     * @var \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\OliverHader\IrreTutorial\Domain\Model\Hotel>
+     * @var \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\TYPO3\TestIrreForeignfield\Domain\Model\Hotel>
      */
     protected $hotels;
 
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Classes/Domain/Model/Hotel.php b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Classes/Domain/Model/Hotel.php
similarity index 90%
rename from typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Classes/Domain/Model/Hotel.php
rename to typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Classes/Domain/Model/Hotel.php
index 18d4d75668c0..961e27eeb216 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Classes/Domain/Model/Hotel.php
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Classes/Domain/Model/Hotel.php
@@ -15,7 +15,7 @@ declare(strict_types=1);
  * The TYPO3 project - inspiring people to share!
  */
 
-namespace OliverHader\IrreTutorial\Domain\Model;
+namespace TYPO3\TestIrreForeignfield\Domain\Model;
 
 use TYPO3\CMS\Extbase\Annotation as Extbase;
 use TYPO3\CMS\Extbase\DomainObject\AbstractEntity;
@@ -33,7 +33,7 @@ class Hotel extends AbstractEntity
 
     /**
      * @Extbase\ORM\Lazy
-     * @var \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\OliverHader\IrreTutorial\Domain\Model\Offer>
+     * @var \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\TYPO3\TestIrreForeignfield\Domain\Model\Offer>
      */
     protected $offers;
 
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Classes/Domain/Model/Offer.php b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Classes/Domain/Model/Offer.php
similarity index 90%
rename from typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Classes/Domain/Model/Offer.php
rename to typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Classes/Domain/Model/Offer.php
index 607bb74a6136..2a1b51dd7b8b 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Classes/Domain/Model/Offer.php
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Classes/Domain/Model/Offer.php
@@ -15,7 +15,7 @@ declare(strict_types=1);
  * The TYPO3 project - inspiring people to share!
  */
 
-namespace OliverHader\IrreTutorial\Domain\Model;
+namespace TYPO3\TestIrreForeignfield\Domain\Model;
 
 use TYPO3\CMS\Extbase\Annotation as Extbase;
 use TYPO3\CMS\Extbase\DomainObject\AbstractEntity;
@@ -33,7 +33,7 @@ class Offer extends AbstractEntity
 
     /**
      * @Extbase\ORM\Lazy
-     * @var \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\OliverHader\IrreTutorial\Domain\Model\Offer>
+     * @var \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\TYPO3\TestIrreForeignfield\Domain\Model\Offer>
      */
     protected $prices;
 
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Classes/Domain/Model/Price.php b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Classes/Domain/Model/Price.php
similarity index 95%
rename from typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Classes/Domain/Model/Price.php
rename to typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Classes/Domain/Model/Price.php
index da38b1aa82a6..56922c038cf3 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Classes/Domain/Model/Price.php
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Classes/Domain/Model/Price.php
@@ -15,7 +15,7 @@ declare(strict_types=1);
  * The TYPO3 project - inspiring people to share!
  */
 
-namespace OliverHader\IrreTutorial\Domain\Model;
+namespace TYPO3\TestIrreForeignfield\Domain\Model;
 
 use TYPO3\CMS\Extbase\DomainObject\AbstractEntity;
 
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Classes/Domain/Repository/ContentRepository.php b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Classes/Domain/Repository/ContentRepository.php
new file mode 100644
index 000000000000..add89b9e4b5d
--- /dev/null
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Classes/Domain/Repository/ContentRepository.php
@@ -0,0 +1,34 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the TYPO3 CMS project.
+ *
+ * It is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, either version 2
+ * of the License, or any later version.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ *
+ * The TYPO3 project - inspiring people to share!
+ */
+
+namespace TYPO3\TestIrreForeignfield\Domain\Repository;
+
+use TYPO3\CMS\Extbase\Persistence\QueryInterface;
+use TYPO3\CMS\Extbase\Persistence\Repository;
+
+/**
+ * Content Repository
+ */
+class ContentRepository extends Repository
+{
+    /**
+     * @var array
+     */
+    protected $defaultOrderings = [
+        'sorting' => QueryInterface::ORDER_ASCENDING,
+    ];
+}
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Classes/Service/QueueService.php b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Classes/Service/QueueService.php
new file mode 100644
index 000000000000..a00e0e61a6b5
--- /dev/null
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Classes/Service/QueueService.php
@@ -0,0 +1,96 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the TYPO3 CMS project.
+ *
+ * It is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, either version 2
+ * of the License, or any later version.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ *
+ * The TYPO3 project - inspiring people to share!
+ */
+
+namespace TYPO3\TestIrreForeignfield\Service;
+
+use TYPO3\CMS\Core\SingletonInterface;
+
+/**
+ * ContentController
+ */
+class QueueService implements SingletonInterface
+{
+    /**
+     * @var array
+     */
+    protected $calls;
+
+    /**
+     * @var array
+     */
+    protected $values = [];
+
+    /**
+     * @var bool
+     */
+    protected $active = false;
+
+    /**
+     * @param array $calls
+     */
+    public function set(array $calls): void
+    {
+        $this->calls = $calls;
+        $this->active = true;
+    }
+
+    /**
+     * @return array
+     */
+    public function get(): array
+    {
+        return $this->calls;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isActive(): bool
+    {
+        return $this->active;
+    }
+
+    public function setActive($active = true): void
+    {
+        $this->active = (bool)$active;
+    }
+
+    /**
+     * @return array|null
+     */
+    public function shift(): ?array
+    {
+        return array_shift($this->calls);
+    }
+
+    /**
+     * @param string $identifier
+     * @param mixed $value
+     */
+    public function addValue($identifier, $value): void
+    {
+        $this->values[$identifier] = $value;
+    }
+
+    /**
+     * @return array
+     */
+    public function getValues(): array
+    {
+        return $this->values;
+    }
+}
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Configuration/Extbase/Persistence/Classes.php b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Configuration/Extbase/Persistence/Classes.php
new file mode 100644
index 000000000000..64f4aef3d46a
--- /dev/null
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Configuration/Extbase/Persistence/Classes.php
@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+use TYPO3\TestIrreForeignfield\Domain\Model\Content;
+use TYPO3\TestIrreForeignfield\Domain\Model\Hotel;
+use TYPO3\TestIrreForeignfield\Domain\Model\Offer;
+use TYPO3\TestIrreForeignfield\Domain\Model\Price;
+
+return [
+    Content::class => [
+        'tableName' => 'tt_content',
+        'properties' => [
+            'hotels' => [
+                'fieldName' => 'tx_testirreforeignfield_hotels',
+            ],
+        ],
+    ],
+    Hotel::class => [
+        'tableName' => 'tx_testirreforeignfield_hotel',
+    ],
+    Offer::class => [
+        'tableName' => 'tx_testirreforeignfield_offer',
+    ],
+    Price::class => [
+        'tableName' => 'tx_testirreforeignfield_price',
+    ],
+];
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/FlexForms/tt_content_flexform.xml b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Configuration/FlexForms/tt_content_flexform.xml
similarity index 89%
rename from typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/FlexForms/tt_content_flexform.xml
rename to typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Configuration/FlexForms/tt_content_flexform.xml
index 32de1593c9cf..a5c82ae7eb23 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/FlexForms/tt_content_flexform.xml
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Configuration/FlexForms/tt_content_flexform.xml
@@ -7,11 +7,11 @@
 					<hotels>
 						<TCEforms>
 							<label>
-								LLL:EXT:irre_tutorial/Resources/Private/Language/locallang_db.xlf:tt_content.tx_irretutorial_flexform.hotels
+								LLL:EXT:test_irre_foreignfield/Resources/Private/Language/locallang_db.xlf:tt_content.tx_testirreforeignfield_flexform.hotels
 							</label>
 							<config>
 								<type>inline</type>
-								<foreign_table>tx_irretutorial_1nff_hotel</foreign_table>
+								<foreign_table>tx_testirreforeignfield_hotel</foreign_table>
 								<foreign_field>parentid</foreign_field>
 								<foreign_table_field>parenttable</foreign_table_field>
 								<foreign_match_fields type="array">
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Configuration/Services.yaml b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Configuration/Services.yaml
new file mode 100644
index 000000000000..664a652e55eb
--- /dev/null
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Configuration/Services.yaml
@@ -0,0 +1,9 @@
+services:
+  _defaults:
+    autowire: true
+    autoconfigure: true
+    public: false
+
+  TYPO3\TestIrreForeignfield\:
+    resource: '../Classes/*'
+    exclude: '../Classes/Domain/Model'
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Configuration/TCA/Overrides/pages.php b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Configuration/TCA/Overrides/pages.php
new file mode 100644
index 000000000000..eaf53e6e7d60
--- /dev/null
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Configuration/TCA/Overrides/pages.php
@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+defined('TYPO3') or die();
+
+// Show copied pages records in frontend request
+$GLOBALS['TCA']['pages']['ctrl']['hideAtCopy'] = false;
+
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTCAcolumns(
+    'pages',
+    [
+        'tx_testirreforeignfield_hotels' => [
+            'exclude' => true,
+            'label' => 'LLL:EXT:test_irre_foreignfield/Resources/Private/Language/locallang_db.xlf:pages.tx_testirreforeignfield_hotels',
+            'config' => [
+                'type' => 'inline',
+                'foreign_table' => 'tx_testirreforeignfield_hotel',
+                'foreign_field' => 'parentid',
+                'foreign_table_field' => 'parenttable',
+                'maxitems' => 10,
+                'appearance' => [
+                    'showSynchronizationLink' => 1,
+                    'showAllLocalizationLink' => 1,
+                    'showPossibleLocalizationRecords' => 1,
+                ],
+            ],
+        ],
+    ]
+);
+
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addToAllTCAtypes(
+    'pages',
+    '--div--;LLL:EXT:test_irre_foreignfield/Resources/Private/Language/locallang_db.xlf:pages.div.test_irre_foreignfield, tx_testirreforeignfield_hotels'
+);
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Configuration/TCA/Overrides/tt_content.php b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Configuration/TCA/Overrides/tt_content.php
new file mode 100644
index 000000000000..d3e1183f0138
--- /dev/null
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Configuration/TCA/Overrides/tt_content.php
@@ -0,0 +1,56 @@
+<?php
+
+declare(strict_types=1);
+
+use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
+use TYPO3\CMS\Extbase\Utility\ExtensionUtility;
+
+defined('TYPO3') or die();
+
+// Show copied tt_content records in frontend request
+$GLOBALS['TCA']['tt_content']['ctrl']['hideAtCopy'] = false;
+
+ExtensionUtility::registerPlugin('test_irre_foreignfield', 'Test', 'IRRE Foreignfield');
+
+ExtensionManagementUtility::addTCAcolumns(
+    'tt_content',
+    [
+        'tx_testirreforeignfield_hotels' => [
+            'exclude' => true,
+            'label' => 'LLL:EXT:test_irre_foreignfield/Resources/Private/Language/locallang_db.xlf:tt_content.tx_testirreforeignfield_hotels',
+            'config' => [
+                'type' => 'inline',
+                'foreign_table' => 'tx_testirreforeignfield_hotel',
+                'foreign_field' => 'parentid',
+                'foreign_table_field' => 'parenttable',
+                'foreign_match_fields' => [
+                    // The flex from field below has an inline relation to hotels, too. The
+                    // child table needs a unique string to distinguish the two relations.
+                    'parentidentifier' => '1nff.hotels',
+                ],
+                'maxitems' => 10,
+                'appearance' => [
+                    'showSynchronizationLink' => 1,
+                    'showAllLocalizationLink' => 1,
+                    'showPossibleLocalizationRecords' => 1,
+                ],
+            ],
+        ],
+        'tx_testirreforeignfield_flexform' => [
+            'exclude' => true,
+            'label' => 'LLL:EXT:test_irre_foreignfield/Resources/Private/Language/locallang_db.xlf:tt_content.tx_testirreforeignfield_flexform',
+            'config' => [
+                'type' => 'flex',
+                'ds' => [
+                    'default' => 'FILE:EXT:test_irre_foreignfield/Configuration/FlexForms/tt_content_flexform.xml',
+                ],
+                'default' => '',
+            ],
+        ],
+    ]
+);
+
+ExtensionManagementUtility::addToAllTCAtypes(
+    'tt_content',
+    '--div--;LLL:EXT:test_irre_foreignfield/Resources/Private/Language/locallang_db.xlf:tt_content.div.test_irre_foreignfield, tx_testirreforeignfield_hotels, tx_testirreforeignfield_flexform'
+);
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_1nff_hotel.php b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Configuration/TCA/tx_testirreforeignfield_hotel.php
similarity index 73%
rename from typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_1nff_hotel.php
rename to typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Configuration/TCA/tx_testirreforeignfield_hotel.php
index b746b603b132..935c1017cf3f 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_1nff_hotel.php
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Configuration/TCA/tx_testirreforeignfield_hotel.php
@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 return [
     'ctrl' => [
-        'title' => 'LLL:EXT:irre_tutorial/Resources/Private/Language/locallang_db.xlf:tx_irretutorial_1nff_hotel',
+        'title' => 'LLL:EXT:test_irre_foreignfield/Resources/Private/Language/locallang_db.xlf:tx_testirreforeignfield_hotel',
         'label' => 'title',
         'tstamp' => 'tstamp',
         'crdate' => 'crdate',
@@ -18,7 +18,7 @@ return [
         'enablecolumns' => [
             'disabled' => 'hidden',
         ],
-        'iconfile' => 'EXT:irre_tutorial/Resources/Public/Icons/icon_tx_irretutorial_hotel.gif',
+        'iconfile' => 'EXT:test_irre_foreignfield/Resources/Public/Icons/icon_hotel.gif',
         'versioningWS' => true,
         'origUid' => 't3_origuid',
     ],
@@ -39,8 +39,8 @@ return [
                 'items' => [
                     ['', 0],
                 ],
-                'foreign_table' => 'tx_irretutorial_1nff_hotel',
-                'foreign_table_where' => 'AND {#tx_irretutorial_1nff_hotel}.{#pid}=###CURRENT_PID### AND {#tx_irretutorial_1nff_hotel}.{#sys_language_uid} IN (-1,0)',
+                'foreign_table' => 'tx_testirreforeignfield_hotel',
+                'foreign_table_where' => 'AND {#tx_testirreforeignfield_hotel}.{#pid}=###CURRENT_PID### AND {#tx_testirreforeignfield_hotel}.{#sys_language_uid} IN (-1,0)',
                 'default' => 0,
             ],
         ],
@@ -79,7 +79,7 @@ return [
         'title' => [
             'exclude' => true,
             'l10n_mode' => 'prefixLangTitle',
-            'label' => 'LLL:EXT:irre_tutorial/Resources/Private/Language/locallang_db.xlf:tx_irretutorial_hotel.title',
+            'label' => 'LLL:EXT:test_irre_foreignfield/Resources/Private/Language/locallang_db.xlf:tx_testirreforeignfield_hotel.title',
             'config' => [
                 'type' => 'input',
                 'size' => 30,
@@ -88,10 +88,10 @@ return [
         ],
         'offers' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:irre_tutorial/Resources/Private/Language/locallang_db.xlf:tx_irretutorial_hotel.offers',
+            'label' => 'LLL:EXT:test_irre_foreignfield/Resources/Private/Language/locallang_db.xlf:tx_testirreforeignfield_hotel.offers',
             'config' => [
                 'type' => 'inline',
-                'foreign_table' => 'tx_irretutorial_1nff_offer',
+                'foreign_table' => 'tx_testirreforeignfield_offer',
                 'foreign_field' => 'parentid',
                 'foreign_table_field' => 'parenttable',
                 'maxitems' => 10,
@@ -105,8 +105,8 @@ return [
     ],
     'types' => [
         '0' => ['showitem' =>
-            '--div--;LLL:EXT:irre_tutorial/Resources/Private/Language/locallang_db.xlf:tabs.general, title, offers,' .
-            '--div--;LLL:EXT:irre_tutorial/Resources/Private/Language/locallang_db.xlf:tabs.visibility, sys_language_uid, l18n_parent, l18n_diffsource, hidden',
+            '--div--;LLL:EXT:test_irre_foreignfield/Resources/Private/Language/locallang_db.xlf:tabs.general, title, offers,' .
+            '--div--;LLL:EXT:test_irre_foreignfield/Resources/Private/Language/locallang_db.xlf:tabs.visibility, sys_language_uid, l18n_parent, l18n_diffsource, hidden',
         ],
     ],
     'palettes' => [
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_1nff_offer.php b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Configuration/TCA/tx_testirreforeignfield_offer.php
similarity index 73%
rename from typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_1nff_offer.php
rename to typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Configuration/TCA/tx_testirreforeignfield_offer.php
index e265276fd526..08be7de3ccc7 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_1nff_offer.php
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Configuration/TCA/tx_testirreforeignfield_offer.php
@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 return [
     'ctrl' => [
-        'title' => 'LLL:EXT:irre_tutorial/Resources/Private/Language/locallang_db.xlf:tx_irretutorial_1nff_offer',
+        'title' => 'LLL:EXT:test_irre_foreignfield/Resources/Private/Language/locallang_db.xlf:tx_testirreforeignfield_offer',
         'label' => 'title',
         'tstamp' => 'tstamp',
         'crdate' => 'crdate',
@@ -18,7 +18,7 @@ return [
         'enablecolumns' => [
             'disabled' => 'hidden',
         ],
-        'iconfile' => 'EXT:irre_tutorial/Resources/Public/Icons/icon_tx_irretutorial_offer.gif',
+        'iconfile' => 'EXT:test_irre_foreignfield/Resources/Public/Icons/icon_offer.gif',
         'versioningWS' => true,
         'origUid' => 't3_origuid',
     ],
@@ -39,8 +39,8 @@ return [
                 'items' => [
                     ['', 0],
                 ],
-                'foreign_table' => 'tx_irretutorial_1nff_offer',
-                'foreign_table_where' => 'AND {#tx_irretutorial_1nff_offer}.{#pid}=###CURRENT_PID### AND {#tx_irretutorial_1nff_offer}.{#sys_language_uid} IN (-1,0)',
+                'foreign_table' => 'tx_testirreforeignfield_offer',
+                'foreign_table_where' => 'AND {#tx_testirreforeignfield_offer}.{#pid}=###CURRENT_PID### AND {#tx_testirreforeignfield_offer}.{#sys_language_uid} IN (-1,0)',
                 'default' => 0,
             ],
         ],
@@ -79,7 +79,7 @@ return [
         'title' => [
             'exclude' => true,
             'l10n_mode' => 'prefixLangTitle',
-            'label' => 'LLL:EXT:irre_tutorial/Resources/Private/Language/locallang_db.xlf:tx_irretutorial_offer.title',
+            'label' => 'LLL:EXT:test_irre_foreignfield/Resources/Private/Language/locallang_db.xlf:tx_testirreforeignfield_offer.title',
             'config' => [
                 'type' => 'input',
                 'size' => 30,
@@ -88,10 +88,10 @@ return [
         ],
         'prices' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:irre_tutorial/Resources/Private/Language/locallang_db.xlf:tx_irretutorial_offer.prices',
+            'label' => 'LLL:EXT:test_irre_foreignfield/Resources/Private/Language/locallang_db.xlf:tx_testirreforeignfield_offer.prices',
             'config' => [
                 'type' => 'inline',
-                'foreign_table' => 'tx_irretutorial_1nff_price',
+                'foreign_table' => 'tx_testirreforeignfield_price',
                 'foreign_field' => 'parentid',
                 'foreign_table_field' => 'parenttable',
                 'maxitems' => 10,
@@ -105,8 +105,8 @@ return [
     ],
     'types' => [
         '0' => ['showitem' =>
-            '--div--;LLL:EXT:irre_tutorial/Resources/Private/Language/locallang_db.xlf:tabs.general, title, prices,' .
-            '--div--;LLL:EXT:irre_tutorial/Resources/Private/Language/locallang_db.xlf:tabs.visibility, sys_language_uid, l18n_parent, l18n_diffsource, hidden, parentid, parenttable',
+            '--div--;LLL:EXT:test_irre_foreignfield/Resources/Private/Language/locallang_db.xlf:tabs.general, title, prices,' .
+            '--div--;LLL:EXT:test_irre_foreignfield/Resources/Private/Language/locallang_db.xlf:tabs.visibility, sys_language_uid, l18n_parent, l18n_diffsource, hidden, parentid, parenttable',
         ],
     ],
     'palettes' => [
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_1nff_price.php b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Configuration/TCA/tx_testirreforeignfield_price.php
similarity index 72%
rename from typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_1nff_price.php
rename to typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Configuration/TCA/tx_testirreforeignfield_price.php
index cbd1e0627719..b910a0fc3f34 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TCA/tx_irretutorial_1nff_price.php
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Configuration/TCA/tx_testirreforeignfield_price.php
@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 return [
     'ctrl' => [
-        'title' => 'LLL:EXT:irre_tutorial/Resources/Private/Language/locallang_db.xlf:tx_irretutorial_1nff_price',
+        'title' => 'LLL:EXT:test_irre_foreignfield/Resources/Private/Language/locallang_db.xlf:tx_testirreforeignfield_price',
         'label' => 'title',
         'tstamp' => 'tstamp',
         'crdate' => 'crdate',
@@ -18,7 +18,7 @@ return [
         'enablecolumns' => [
             'disabled' => 'hidden',
         ],
-        'iconfile' => 'EXT:irre_tutorial/Resources/Public/Icons/icon_tx_irretutorial_price.gif',
+        'iconfile' => 'EXT:test_irre_foreignfield/Resources/Public/Icons/icon_price.gif',
         'versioningWS' => true,
         'origUid' => 't3_origuid',
     ],
@@ -39,8 +39,8 @@ return [
                 'items' => [
                     ['', 0],
                 ],
-                'foreign_table' => 'tx_irretutorial_1nff_price',
-                'foreign_table_where' => 'AND {#tx_irretutorial_1nff_price}.{#pid}=###CURRENT_PID### AND {#tx_irretutorial_1nff_price}.{#sys_language_uid} IN (-1,0)',
+                'foreign_table' => 'tx_testirreforeignfield_price',
+                'foreign_table_where' => 'AND {#tx_testirreforeignfield_price}.{#pid}=###CURRENT_PID### AND {#tx_testirreforeignfield_price}.{#sys_language_uid} IN (-1,0)',
                 'default' => 0,
             ],
         ],
@@ -79,7 +79,7 @@ return [
         'title' => [
             'exclude' => true,
             'l10n_mode' => 'prefixLangTitle',
-            'label' => 'LLL:EXT:irre_tutorial/Resources/Private/Language/locallang_db.xlf:tx_irretutorial_price.title',
+            'label' => 'LLL:EXT:test_irre_foreignfield/Resources/Private/Language/locallang_db.xlf:tx_testirreforeignfield_price.title',
             'config' => [
                 'type' => 'input',
                 'size' => 30,
@@ -88,7 +88,7 @@ return [
         ],
         'price' => [
             'exclude' => true,
-            'label' => 'LLL:EXT:irre_tutorial/Resources/Private/Language/locallang_db.xlf:tx_irretutorial_price.price',
+            'label' => 'LLL:EXT:test_irre_foreignfield/Resources/Private/Language/locallang_db.xlf:tx_testirreforeignfield_price.price',
             'config' => [
                 'type' => 'input',
                 'size' => 30,
@@ -98,8 +98,8 @@ return [
     ],
     'types' => [
         '0' => ['showitem' =>
-            '--div--;LLL:EXT:irre_tutorial/Resources/Private/Language/locallang_db.xlf:tabs.general, title, price,' .
-            '--div--;LLL:EXT:irre_tutorial/Resources/Private/Language/locallang_db.xlf:tabs.visibility, sys_language_uid, l18n_parent, l18n_diffsource, hidden, parentid',
+            '--div--;LLL:EXT:test_irre_foreignfield/Resources/Private/Language/locallang_db.xlf:tabs.general, title, price,' .
+            '--div--;LLL:EXT:test_irre_foreignfield/Resources/Private/Language/locallang_db.xlf:tabs.visibility, sys_language_uid, l18n_parent, l18n_diffsource, hidden, parentid',
         ],
     ],
     'palettes' => [
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Frontend/ExtbaseJsonRenderer.typoscript b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Configuration/TypoScript/ExtbaseJsonRenderer.typoscript
similarity index 59%
rename from typo3/sysext/core/Tests/Functional/Fixtures/Frontend/ExtbaseJsonRenderer.typoscript
rename to typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Configuration/TypoScript/ExtbaseJsonRenderer.typoscript
index be18d59c235b..58804dc74b5d 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Frontend/ExtbaseJsonRenderer.typoscript
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Configuration/TypoScript/ExtbaseJsonRenderer.typoscript
@@ -1,4 +1,4 @@
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:irre_tutorial/Configuration/TypoScript/setup.typoscript">
+<INCLUDE_TYPOSCRIPT: source="FILE:EXT:test_irre_foreignfield/Configuration/TypoScript/setup.typoscript">
 
 page {
 	20 = COA
@@ -6,8 +6,8 @@ page {
 		10 = USER
 		10 {
 			userFunc = TYPO3\CMS\Extbase\Core\Bootstrap->run
-			extensionName = IrreTutorial
-			pluginName = Irre
+			extensionName = TestIrreForeignfield
+			pluginName = Test
 		}
 		stdWrap.postUserFunc = TYPO3\TestingFramework\Core\Functional\Framework\Frontend\Renderer->parseValues
 		stdWrap.postUserFunc.as = Extbase
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Configuration/TypoScript/JsonRenderer.typoscript b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Configuration/TypoScript/JsonRenderer.typoscript
new file mode 100644
index 000000000000..cb62886c589d
--- /dev/null
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Configuration/TypoScript/JsonRenderer.typoscript
@@ -0,0 +1,160 @@
+config {
+	no_cache = 1
+	debug = 0
+	admPanel = 0
+	disableAllHeaderCode = 1
+	sendCacheHeaders = 0
+	additionalHeaders.10.header = Content-Type: application/json; charset=utf-8
+	additionalHeaders.10.replace = 1
+
+	watcher {
+		tableFields {
+			pages = uid,_PAGES_OVERLAY_UID,pid,sorting,title,tx_testirreforeignfield_hotels
+			tt_content = uid,_ORIG_uid,_LOCALIZED_UID,pid,sorting,sys_language_uid,header,categories,tx_testirreforeignfield_hotels,tx_testdatahandler_categories,tx_testdatahandler_category
+			tx_testirreforeignfield_hotel = uid,_ORIG_uid,_LOCALIZED_UID,pid,sorting,sys_language_uid,title,offers
+			tx_testirreforeignfield_offer = uid,_ORIG_uid,_LOCALIZED_UID,pid,sorting,sys_language_uid,title,prices
+			tx_testirreforeignfield_price = uid,_ORIG_uid,_LOCALIZED_UID,pid,sorting,sys_language_uid,title,price
+		}
+	}
+}
+
+lib.watcherDataObject = COA
+lib.watcherDataObject {
+	1 = LOAD_REGISTER
+	1.watcher.dataWrap = |
+	2 = USER
+	2.userFunc = TYPO3\TestingFramework\Core\Functional\Framework\Frontend\Collector->addRecordData
+	99 = RESTORE_REGISTER
+}
+
+lib.watcherFileObject = COA
+lib.watcherFileObject {
+	1 = LOAD_REGISTER
+	1.watcher.dataWrap = |
+	2 = USER
+	2.userFunc = TYPO3\TestingFramework\Core\Functional\Framework\Frontend\Collector->addFileData
+	99 = RESTORE_REGISTER
+}
+
+page = PAGE
+page {
+	10 = COA
+	10 {
+		1 = LOAD_REGISTER
+		1.watcher.dataWrap = pages:{field:uid}
+		2 = USER
+		2.userFunc = TYPO3\TestingFramework\Core\Functional\Framework\Frontend\Collector->addRecordData
+		10 = CONTENT
+		10 {
+			stdWrap.required = 1
+			table = pages
+			select {
+				orderBy = sorting
+				pidInList = this
+				# prevent sys_language_uid lookup
+				languageField = 0
+			}
+			renderObj < lib.watcherDataObject
+			renderObj.1.watcher.dataWrap = {register:watcher}|.__pages/pages:{field:uid}
+		}
+		15 = CONTENT
+		15 {
+			if.isTrue.field = tx_testirreforeignfield_hotels
+			table = tx_testirreforeignfield_hotel
+			select {
+				orderBy = sorting
+				where.field = uid
+				where.intval = 1
+				where.wrap = parenttable='pages' AND parentid=|
+			}
+			renderObj < lib.watcherDataObject
+			renderObj.1.watcher.dataWrap = {register:watcher}|.tx_testirreforeignfield_hotels/tx_testirreforeignfield_hotel:{field:uid}
+		}
+		20 = CONTENT
+		20 {
+			table = tt_content
+			select {
+				orderBy = sorting
+				where = {#colPos}=0
+			}
+			renderObj < lib.watcherDataObject
+			renderObj.1.watcher.dataWrap = {register:watcher}|.__contents/tt_content:{field:uid}
+			renderObj {
+				20 = CONTENT
+				20 {
+					if.isTrue.field = tx_testirreforeignfield_hotels
+					table = tx_testirreforeignfield_hotel
+					select {
+						orderBy = sorting
+						where.field = uid
+						where.intval = 1
+						where.wrap = parenttable='tt_content' AND parentid=|
+					}
+					renderObj < lib.watcherDataObject
+					renderObj.1.watcher.dataWrap = {register:watcher}|.tx_testirreforeignfield_hotels/tx_testirreforeignfield_hotel:{field:uid}
+					renderObj {
+						10 = CONTENT
+						10 {
+							if.isTrue.field = offers
+							table = tx_testirreforeignfield_offer
+							select {
+								orderBy = sorting
+								where.field = uid
+								where.intval = 1
+								where.wrap = parenttable='tx_testirreforeignfield_hotel' AND parentid=|
+							}
+							renderObj < lib.watcherDataObject
+							renderObj.1.watcher.dataWrap = {register:watcher}|.offers/tx_testirreforeignfield_offer:{field:uid}
+							renderObj {
+								10 = CONTENT
+								10 {
+									if.isTrue.field = prices
+									table = tx_testirreforeignfield_price
+									select {
+										orderBy = sorting
+										where.field = uid
+										where.intval = 1
+										where.wrap = parenttable='tx_testirreforeignfield_offer' AND parentid=|
+									}
+									renderObj < lib.watcherDataObject
+									renderObj.1.watcher.dataWrap = {register:watcher}|.prices/tx_testirreforeignfield_price:{field:uid}
+								}
+							}
+						}
+					}
+				}
+				40 = FILES
+				40 {
+					if.isTrue.field = image
+					references {
+						fieldName = image
+					}
+					renderObj < lib.watcherFileObject
+					renderObj.1.watcher.dataWrap = {register:watcher}|.image/
+				}
+			}
+		}
+		stdWrap.postUserFunc = TYPO3\TestingFramework\Core\Functional\Framework\Frontend\Collector->attachSection
+		stdWrap.postUserFunc.as = Default
+	}
+	99999 = COA
+	99999 {
+		stdWrap.postUserFunc = TYPO3\TestingFramework\Core\Functional\Framework\Frontend\Renderer->renderValues
+		stdWrap.postUserFunc.values {
+			page.children {
+				uid.data = page:uid
+				pid.data = page:pid
+				title.data = page:title
+			}
+			languageInfo.children {
+				id.data = context:language:id
+				contentId.data = context:language:contentId
+				fallbackType.data = sitelanguage:fallbackType
+				fallbackChain.data = context:language:fallbackChain
+				overlayType.data = context:language:overlayType
+			}
+		}
+		stdWrap.postUserFunc.as = Scope
+	}
+	stdWrap.postUserFunc = TYPO3\TestingFramework\Core\Functional\Framework\Frontend\Renderer->renderSections
+}
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Configuration/TypoScript/setup.typoscript b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Configuration/TypoScript/setup.typoscript
new file mode 100644
index 000000000000..2872b9ecbc0d
--- /dev/null
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Configuration/TypoScript/setup.typoscript
@@ -0,0 +1,5 @@
+plugin.tx_testirreforeignfield {
+	persistence {
+		storagePid.data = page:uid
+	}
+}
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Resources/Private/Language/locallang_db.xlf b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Resources/Private/Language/locallang_db.xlf
new file mode 100644
index 000000000000..d74de956286c
--- /dev/null
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Resources/Private/Language/locallang_db.xlf
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
+	<file source-language="en" datatype="plaintext"
+		  original="EXT:test_irre_csv/Resources/Private/Language/locallang_db.xlf" date="2021-11-13T08:05:00Z"
+		  product-name="test_irre_csv">
+		<header/>
+		<body>
+			<trans-unit id="tabs.general" resname="tabs.general">
+				<source>General</source>
+			</trans-unit>
+			<trans-unit id="tabs.visibility" resname="tabs.visibility">
+				<source>Visibility</source>
+			</trans-unit>
+			<trans-unit id="pages.tx_testirreforeignfield_hotels" resname="pages.tx_testirreforeignfield_hotels">
+				<source>Hotels:</source>
+			</trans-unit>
+			<trans-unit id="tt_content.tx_testirreforeignfield_hotels"
+						resname="tt_content.tx_testirreforeignfield_hotels">
+				<source>Hotels:</source>
+			</trans-unit>
+			<trans-unit id="tt_content.tx_testirreforeignfield_flexform"
+						resname="tt_content.tx_testirreforeignfield_flexform">
+				<source>IRRE:</source>
+			</trans-unit>
+			<trans-unit id="tt_content.tx_testirreforeignfield_flexform.hotels"
+						resname="tt_content.tx_testirreforeignfield_flexform.hotels">
+				<source>IRRE:</source>
+			</trans-unit>
+			<trans-unit id="tt_content.div.test_irre_foreignfield" resname="tt_content.div.test_irre_foreignfield">
+				<source>TEST IRRE Foreign Field</source>
+			</trans-unit>
+			<trans-unit id="pages.div.test_irre_foreignfield" resname="pages.div.test_irre_foreignfield">
+				<source>TEST IRRE Foreign Field</source>
+			</trans-unit>
+
+			<trans-unit id="tx_testirreforeignfield_hotel" resname="tx_testirreforeignfield_hotel">
+				<source>1:n FF: Hotels</source>
+			</trans-unit>
+			<trans-unit id="tx_testirreforeignfield_offer" resname="tx_testirreforeignfield_offer">
+				<source>1:n FF: Offers</source>
+			</trans-unit>
+			<trans-unit id="tx_testirreforeignfield_price" resname="tx_testirreforeignfield_price">
+				<source>1:n FF: Prices</source>
+			</trans-unit>
+
+			<trans-unit id="tx_testirreforeignfield_hotel.title" resname="tx_testirreforeignfield_hotel.title">
+				<source>Title:</source>
+			</trans-unit>
+			<trans-unit id="tx_testirreforeignfield_hotel.offers" resname="tx_testirreforeignfield_hotel.offers">
+				<source>Offers:</source>
+			</trans-unit>
+			<trans-unit id="tx_testirreforeignfield_offer.title" resname="tx_testirreforeignfield_offer.title">
+				<source>Title:</source>
+			</trans-unit>
+			<trans-unit id="tx_testirreforeignfield_offer.hotels" resname="tx_testirreforeignfield_offer.hotels">
+				<source>Hotels:</source>
+			</trans-unit>
+			<trans-unit id="tx_testirreforeignfield_offer.prices" resname="tx_testirreforeignfield_offer.prices">
+				<source>Prices:</source>
+			</trans-unit>
+
+			<trans-unit id="tx_testirreforeignfield_price.title" resname="tx_testirreforeignfield_price.title">
+				<source>Title:</source>
+			</trans-unit>
+			<trans-unit id="tx_testirreforeignfield_price.offers" resname="tx_testirreforeignfield_price.offers">
+				<source>Offers:</source>
+			</trans-unit>
+			<trans-unit id="tx_testirreforeignfield_price.price" resname="tx_testirreforeignfield_price.price">
+				<source>Price (EUR):</source>
+			</trans-unit>
+
+		</body>
+	</file>
+</xliff>
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Resources/Public/Icons/Extension.svg b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Resources/Public/Icons/Extension.svg
new file mode 100644
index 000000000000..bca7a17509c5
--- /dev/null
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Resources/Public/Icons/Extension.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><path fill="#FF8700" d="M0 0h64v64H0z"/><path fill="#FFF" d="M42.8 32.8c-3.6 0-8.1-10.1-8.1-15.1 0-2.3.9-2.7 3.2-2.7 5.5 0 11 .9 11 4-.1 6.2-4 13.8-6.1 13.8zM28.5 18.5c0 5 6.4 20.2 10.7 20.2.5 0 .9-.1 1.4-.2-3.8 6.1-8.4 10.6-11.2 10.6-5.9 0-14.3-17.9-14.3-25.7 0-1.2.3-2.2.7-2.8 2-2.5 8.4-4.4 13.7-5-.6.4-1 1-1 2.9z"/></svg>
\ No newline at end of file
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Resources/Public/Icons/icon_hotel.gif b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Resources/Public/Icons/icon_hotel.gif
new file mode 100644
index 0000000000000000000000000000000000000000..fa6b46c0059ca389227067121356b9751fe389cf
GIT binary patch
literal 117
zcmZ?wbhEHb6k-rySj51v>E?%HhmW;1wJ<O+{Qv(SNJ4<(PZmZ71{MY#5ErDDf!WGq
z)15CLI32Wkl@4WQGt4|zdLV&MDU&tBWL3_pxVL7PKgsMi-*9{T{3Yrk0@;TZf&??H
O<{zD0(&fXzU=09P#V3FO

literal 0
HcmV?d00001

diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Resources/Public/Icons/icon_offer.gif b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Resources/Public/Icons/icon_offer.gif
new file mode 100644
index 0000000000000000000000000000000000000000..a573eb3ac155d9c871f32027ccd2cd9f2b9abad6
GIT binary patch
literal 117
zcmZ?wbhEHb6k-rySj51v?dzUnhmW;1wJ<O+{Qv(SNJ4<(PZmZ71{MY#5ErDDf!WGq
z)15CLI32Wkl@4WQGt4|zdLV&MDU&tBWL3_pxVL7PKgsMi-*9{T{3Yrk0@;TZf&??H
O<{zD0(&fXzU=09H@h5Bm

literal 0
HcmV?d00001

diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Resources/Public/Icons/icon_price.gif b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Resources/Public/Icons/icon_price.gif
new file mode 100644
index 0000000000000000000000000000000000000000..8ab1559baf32510d2a63351fc7eedca012da1a40
GIT binary patch
literal 117
zcmZ?wbhEHb6k-rySj52afA8L7hmW;1wJ-qL|NjF?2vGdV!pOkD!k`1<g48lFTX}4{
z^W_7lgEp_yq0DTCna4^GB=9L^vSyg9%2^fn*6i{pnce0aZf~EzL_I_x`>;ZgV20KF
MqmxUzd>9z40akY>egFUf

literal 0
HcmV?d00001

diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/ext_emconf.php b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/ext_emconf.php
new file mode 100644
index 000000000000..ff1a3ddf449d
--- /dev/null
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/ext_emconf.php
@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+$EM_CONF[$_EXTKEY] = [
+    'title' => 'DataHandler Testing test_irre_foreignfield',
+    'description' => 'DataHandler Testing test_irre_foreignfield',
+    'category' => 'example',
+    'version' => '12.0.0',
+    'state' => 'beta',
+    'clearCacheOnLoad' => 0,
+    'author' => 'Anja Leichsenring',
+    'author_email' => 'aleichsenring@ab-softlab.de',
+    'author_company' => '',
+    'constraints' => [
+        'depends' => [
+            'typo3' => '12.0.0',
+            'workspaces' => '12.0.0',
+        ],
+        'conflicts' => [],
+        'suggests' => [],
+    ],
+];
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/ext_localconf.php b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/ext_localconf.php
new file mode 100644
index 000000000000..94ac69dda7a5
--- /dev/null
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/ext_localconf.php
@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+use TYPO3\CMS\Extbase\Utility\ExtensionUtility;
+use TYPO3\TestIrreForeignfield\Controller\ContentController;
+use TYPO3\TestIrreForeignfield\Controller\QueueController;
+
+defined('TYPO3') or die();
+
+ExtensionUtility::configurePlugin(
+    'TestIrreForeignfield',
+    'Test',
+    [
+        QueueController::class => 'index',
+        ContentController::class => 'list, show, new, create, edit, update, delete',
+    ],
+    [
+        ContentController::class => 'create, update, delete',
+    ]
+);
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/ext_tables.php b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/ext_tables.php
new file mode 100644
index 000000000000..cef8772cc989
--- /dev/null
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/ext_tables.php
@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
+
+defined('TYPO3') or die();
+
+ExtensionManagementUtility::allowTableOnStandardPages('tx_testirreforeignfield_hotel');
+ExtensionManagementUtility::allowTableOnStandardPages('tx_testirreforeignfield_offer');
+ExtensionManagementUtility::allowTableOnStandardPages('tx_testirreforeignfield_price');
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/ext_tables.sql b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/ext_tables.sql
new file mode 100644
index 000000000000..22b73e7c28fe
--- /dev/null
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/ext_tables.sql
@@ -0,0 +1,42 @@
+# 1nff: 1:n relations using foreign_field as pointer on child table
+
+CREATE TABLE tx_testirreforeignfield_hotel
+(
+  parentid int(11) DEFAULT '0' NOT NULL,
+  parenttable tinytext NOT NULL,
+  parentidentifier tinytext NOT NULL,
+  title tinytext NOT NULL,
+  offers int(11) DEFAULT '0' NOT NULL
+);
+
+CREATE TABLE tx_testirreforeignfield_offer
+(
+  parentid int(11) DEFAULT '0' NOT NULL,
+  parenttable tinytext NOT NULL,
+  parentidentifier tinytext NOT NULL,
+  title tinytext NOT NULL,
+  prices int(11) DEFAULT '0' NOT NULL
+);
+
+CREATE TABLE tx_testirreforeignfield_price
+(
+  parentid int(11) DEFAULT '0' NOT NULL,
+  parenttable tinytext NOT NULL,
+  parentidentifier tinytext NOT NULL,
+  title tinytext NOT NULL,
+  price varchar(255) DEFAULT '0.00' NOT NULL
+);
+
+#
+# Extend the pages table to have hotels with a 1:n relationship added there
+#
+CREATE TABLE pages
+(
+  tx_testirreforeignfield_hotels int(11) DEFAULT '0' NOT NULL
+);
+
+CREATE TABLE tt_content
+(
+  tx_testirreforeignfield_hotels int(11) DEFAULT '0' NOT NULL,
+  tx_testirreforeignfield_flexform mediumtext
+);
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Frontend/JsonRenderer.typoscript b/typo3/sysext/core/Tests/Functional/Fixtures/Frontend/JsonRenderer.typoscript
index 8157180ca4cd..179d0dd57f70 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Frontend/JsonRenderer.typoscript
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Frontend/JsonRenderer.typoscript
@@ -9,14 +9,11 @@ config {
 
 	watcher {
 		tableFields {
-			pages = uid,_PAGES_OVERLAY_UID,pid,sorting,title,tx_irretutorial_hotels
+			pages = uid,_PAGES_OVERLAY_UID,pid,sorting,title
 			sys_category = uid,_ORIG_uid,_LOCALIZED_UID,pid,sys_language_uid,title,parent,items,sys_language_uid
 			sys_file = uid,_ORIG_uid,_LOCALIZED_UID,pid,title,sys_language_uid
 			sys_file_reference = uid,_ORIG_uid,_LOCALIZED_UID,title,description,alternative,link,missing,identifier,file,pid,sys_language_uid,title,parent,items,sys_language_uid,uid_local,uid_foreign,tablenames,fieldname,table_local
-			tt_content = uid,_ORIG_uid,_LOCALIZED_UID,pid,sorting,sys_language_uid,header,categories,tx_irretutorial_1nff_hotels,tx_testdatahandler_categories,tx_testdatahandler_category
-			tx_irretutorial_1nff_hotel = uid,_ORIG_uid,_LOCALIZED_UID,pid,sorting,sys_language_uid,title,offers
-			tx_irretutorial_1nff_offer = uid,_ORIG_uid,_LOCALIZED_UID,pid,sorting,sys_language_uid,title,prices
-			tx_irretutorial_1nff_price = uid,_ORIG_uid,_LOCALIZED_UID,pid,sorting,sys_language_uid,title,price
+			tt_content = uid,_ORIG_uid,_LOCALIZED_UID,pid,sorting,sys_language_uid,header,categories,tx_testdatahandler_categories,tx_testdatahandler_category
 			tx_testdatahandler_element = uid,_ORIG_uid,_LOCALIZED_UID,pid,sorting,sys_language_uid,title
 		}
 	}
@@ -61,19 +58,6 @@ page {
 			renderObj < lib.watcherDataObject
 			renderObj.1.watcher.dataWrap = {register:watcher}|.__pages/pages:{field:uid}
 		}
-		15 = CONTENT
-		15 {
-			if.isTrue.field = tx_irretutorial_hotels
-			table = tx_irretutorial_1nff_hotel
-			select {
-				orderBy = sorting
-				where.field = uid
-				where.intval = 1
-				where.wrap = parenttable='pages' AND parentid=|
-			}
-			renderObj < lib.watcherDataObject
-			renderObj.1.watcher.dataWrap = {register:watcher}|.tx_irretutorial_hotels/tx_irretutorial_1nff_hotel:{field:uid}
-		}
 		20 = CONTENT
 		20 {
 			table = tt_content
@@ -101,49 +85,6 @@ page {
 					renderObj < lib.watcherDataObject
 					renderObj.1.watcher.dataWrap = {register:watcher}|.categories/sys_category:{field:uid}
 				}
-				20 = CONTENT
-				20 {
-					if.isTrue.field = tx_irretutorial_1nff_hotels
-					table = tx_irretutorial_1nff_hotel
-					select {
-						orderBy = sorting
-						where.field = uid
-						where.intval = 1
-						where.wrap = parenttable='tt_content' AND parentid=|
-					}
-					renderObj < lib.watcherDataObject
-					renderObj.1.watcher.dataWrap = {register:watcher}|.tx_irretutorial_1nff_hotels/tx_irretutorial_1nff_hotel:{field:uid}
-					renderObj {
-						10 = CONTENT
-						10 {
-							if.isTrue.field = offers
-							table = tx_irretutorial_1nff_offer
-							select {
-								orderBy = sorting
-								where.field = uid
-								where.intval = 1
-								where.wrap = parenttable='tx_irretutorial_1nff_hotel' AND parentid=|
-							}
-							renderObj < lib.watcherDataObject
-							renderObj.1.watcher.dataWrap = {register:watcher}|.offers/tx_irretutorial_1nff_offer:{field:uid}
-							renderObj {
-								10 = CONTENT
-								10 {
-									if.isTrue.field = prices
-									table = tx_irretutorial_1nff_price
-									select {
-										orderBy = sorting
-										where.field = uid
-										where.intval = 1
-										where.wrap = parenttable='tx_irretutorial_1nff_offer' AND parentid=|
-									}
-									renderObj < lib.watcherDataObject
-									renderObj.1.watcher.dataWrap = {register:watcher}|.prices/tx_irretutorial_1nff_price:{field:uid}
-								}
-							}
-						}
-					}
-				}
 				40 = FILES
 				40 {
 					if.isTrue.field = image
diff --git a/typo3/sysext/impexp/Tests/Functional/Export/IrreTutorialRecordsTest.php b/typo3/sysext/impexp/Tests/Functional/Export/IrreTutorialRecordsTest.php
index 0c639d830872..5a8a320f522e 100644
--- a/typo3/sysext/impexp/Tests/Functional/Export/IrreTutorialRecordsTest.php
+++ b/typo3/sysext/impexp/Tests/Functional/Export/IrreTutorialRecordsTest.php
@@ -29,6 +29,7 @@ class IrreTutorialRecordsTest extends AbstractImportExportTestCase
      */
     protected $testExtensionsToLoad = [
         'typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_csv',
+        'typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield',
         'typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial',
     ];
 
diff --git a/typo3/sysext/impexp/Tests/Functional/Fixtures/DatabaseAssertions/importIrreRecords.csv b/typo3/sysext/impexp/Tests/Functional/Fixtures/DatabaseAssertions/importIrreRecords.csv
index 0354e0cf9f43..832ba9d2d1fe 100644
--- a/typo3/sysext/impexp/Tests/Functional/Fixtures/DatabaseAssertions/importIrreRecords.csv
+++ b/typo3/sysext/impexp/Tests/Functional/Fixtures/DatabaseAssertions/importIrreRecords.csv
@@ -2,7 +2,7 @@
 ,"uid","pid","sorting","deleted","title",,,,,,,,
 ,1,0,256,0,"IRRE",,,,,,,,
 "tt_content",,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","header","categories","tx_irretutorial_1nff_hotels","tx_testirrecsv_hotels",,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","header","categories","tx_testirreforeignfield_hotels","tx_testirrecsv_hotels",,,
 ,1,1,256,0,0,0,"Test content",0,2,"1,2",,,
 "tx_testirrecsv_hotel",,,,,,,,,,,,,
 ,"uid","pid","cruser_id","sys_language_uid","l18n_parent","sorting","deleted","hidden","title","offers",,,
@@ -18,21 +18,21 @@
 ,1,1,1,0,0,256,0,0,"Price 1.1.1 (csv)",567.00,,,
 ,2,1,1,0,0,128,0,0,"Price 1.2.1 (csv)",90.00,,,
 ,3,1,1,0,0,64,0,0,"Price 2.2.1 (csv)",112.00,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,
 ,"uid","pid","cruser_id","sys_language_uid","l18n_parent","sorting","deleted","hidden","parentid","parenttable","parentidentifier","title","offers"
 ,1,1,1,0,0,2,0,0,1,"tt_content",1nff.hotels,"Hotel 2 (nff)",1
 ,2,1,1,0,0,1,0,0,1,"tt_content",1nff.hotels,"Hotel 1 (nff)",2
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,
 ,"uid","pid","cruser_id","sys_language_uid","l18n_parent","sorting","deleted","hidden","parentid","parenttable","parentidentifier","title","prices"
-,1,1,1,0,0,2,0,0,2,"tx_irretutorial_1nff_hotel",,"Offer 1.2 (nff)",1
-,2,1,1,0,0,1,0,0,1,"tx_irretutorial_1nff_hotel",,"Offer 2.1 (nff)",1
-,3,1,1,0,0,1,0,0,2,"tx_irretutorial_1nff_hotel",,"Offer 1.1 (nff)",2
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,
+,1,1,1,0,0,2,0,0,2,"tx_testirreforeignfield_hotel",,"Offer 1.2 (nff)",1
+,2,1,1,0,0,1,0,0,1,"tx_testirreforeignfield_hotel",,"Offer 2.1 (nff)",1
+,3,1,1,0,0,1,0,0,2,"tx_testirreforeignfield_hotel",,"Offer 1.1 (nff)",2
+"tx_testirreforeignfield_price",,,,,,,,,,,,,
 ,"uid","pid","cruser_id","sys_language_uid","l18n_parent","sorting","deleted","hidden","parentid","parenttable","parentidentifier","title","price"
-,1,1,1,0,0,2,0,0,3,"tx_irretutorial_1nff_offer",,"Price 1.1.2 (nff)",869.00
-,2,1,1,0,0,1,0,0,2,"tx_irretutorial_1nff_offer",,"Price 2.1.1 (nff)",5467567.00
-,3,1,1,0,0,1,0,0,1,"tx_irretutorial_1nff_offer",,"Price 1.2.1 (nff)",678.00
-,4,1,1,0,0,1,0,0,3,"tx_irretutorial_1nff_offer",,"Price 1.1.1 (nff)",4.00
+,1,1,1,0,0,2,0,0,3,"tx_testirreforeignfield_offer",,"Price 1.1.2 (nff)",869.00
+,2,1,1,0,0,1,0,0,2,"tx_testirreforeignfield_offer",,"Price 2.1.1 (nff)",5467567.00
+,3,1,1,0,0,1,0,0,1,"tx_testirreforeignfield_offer",,"Price 1.2.1 (nff)",678.00
+,4,1,1,0,0,1,0,0,3,"tx_testirreforeignfield_offer",,"Price 1.1.1 (nff)",4.00
 "tx_irretutorial_mnasym_hotel",,,,,,,,,,,,,
 ,"uid","pid","cruser_id","sys_language_uid","l18n_parent","sorting","deleted","hidden","title","offers",,,
 ,1,1,1,0,0,256,0,0,"Hotel 1 (m:n ASym)",2,,,
diff --git a/typo3/sysext/impexp/Tests/Functional/Fixtures/DatabaseImports/irre_tutorial.xml b/typo3/sysext/impexp/Tests/Functional/Fixtures/DatabaseImports/irre_tutorial.xml
index f3baa6cb70dc..9f1945cc1daa 100644
--- a/typo3/sysext/impexp/Tests/Functional/Fixtures/DatabaseImports/irre_tutorial.xml
+++ b/typo3/sysext/impexp/Tests/Functional/Fixtures/DatabaseImports/irre_tutorial.xml
@@ -16,9 +16,9 @@
 		<deleted>0</deleted>
 		<t3ver_oid>0</t3ver_oid>
 		<t3ver_wsid>0</t3ver_wsid>
-		<tx_irretutorial_1nff_hotels>2</tx_irretutorial_1nff_hotels>
+		<tx_testirreforeignfield_hotels>2</tx_testirreforeignfield_hotels>
 		<tx_testirrecsv_hotels>1,2</tx_testirrecsv_hotels>
-		<tx_irretutorial_flexform><![CDATA[<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+		<tx_testirreforeignfield_flexform><![CDATA[<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <T3FlexForms>
     <data>
         <sheet index="sDEF">
@@ -29,7 +29,7 @@
             </language>
         </sheet>
     </data>
-</T3FlexForms>]]></tx_irretutorial_flexform>
+</T3FlexForms>]]></tx_testirreforeignfield_flexform>
         <sorting>128</sorting>
 	</tt_content>
 	<tx_testirrecsv_hotel>
@@ -141,7 +141,7 @@
 		<title>Price 2.2.1 (csv)</title>
 		<price>112.00</price>
 	</tx_testirrecsv_price>
-	<tx_irretutorial_1nff_hotel>
+	<tx_testirreforeignfield_hotel>
 		<uid>1</uid>
 		<pid>1</pid>
 		<cruser_id>1</cruser_id>
@@ -157,8 +157,8 @@
 		<title>Hotel 1 (nff)</title>
 		<offers>2</offers>
         <sorting>128</sorting>
-	</tx_irretutorial_1nff_hotel>
-	<tx_irretutorial_1nff_hotel>
+	</tx_testirreforeignfield_hotel>
+	<tx_testirreforeignfield_hotel>
 		<uid>2</uid>
 		<pid>1</pid>
 		<cruser_id>1</cruser_id>
@@ -174,8 +174,8 @@
 		<title>Hotel 2 (nff)</title>
 		<offers>1</offers>
         <sorting>256</sorting>
-	</tx_irretutorial_1nff_hotel>
-	<tx_irretutorial_1nff_offer>
+	</tx_testirreforeignfield_hotel>
+	<tx_testirreforeignfield_offer>
 		<uid>1</uid>
 		<pid>1</pid>
 		<cruser_id>1</cruser_id>
@@ -186,13 +186,13 @@
 		<deleted>0</deleted>
 		<hidden>0</hidden>
 		<parentid>1</parentid>
-		<parenttable>tx_irretutorial_1nff_hotel</parenttable>
+		<parenttable>tx_testirreforeignfield_hotel</parenttable>
 		<parentidentifier></parentidentifier>
 		<title>Offer 1.1 (nff)</title>
 		<prices>2</prices>
         <sorting>128</sorting>
-	</tx_irretutorial_1nff_offer>
-	<tx_irretutorial_1nff_offer>
+	</tx_testirreforeignfield_offer>
+	<tx_testirreforeignfield_offer>
 		<uid>2</uid>
 		<pid>1</pid>
 		<cruser_id>1</cruser_id>
@@ -203,13 +203,13 @@
 		<deleted>0</deleted>
 		<hidden>0</hidden>
 		<parentid>1</parentid>
-		<parenttable>tx_irretutorial_1nff_hotel</parenttable>
+		<parenttable>tx_testirreforeignfield_hotel</parenttable>
 		<parentidentifier></parentidentifier>
 		<title>Offer 1.2 (nff)</title>
 		<prices>1</prices>
         <sorting>256</sorting>
-	</tx_irretutorial_1nff_offer>
-	<tx_irretutorial_1nff_offer>
+	</tx_testirreforeignfield_offer>
+	<tx_testirreforeignfield_offer>
 		<uid>3</uid>
 		<pid>1</pid>
 		<cruser_id>1</cruser_id>
@@ -220,13 +220,13 @@
 		<deleted>0</deleted>
 		<hidden>0</hidden>
 		<parentid>2</parentid>
-		<parenttable>tx_irretutorial_1nff_hotel</parenttable>
+		<parenttable>tx_testirreforeignfield_hotel</parenttable>
 		<parentidentifier></parentidentifier>
 		<title>Offer 2.1 (nff)</title>
 		<prices>1</prices>
         <sorting>512</sorting>
-	</tx_irretutorial_1nff_offer>
-	<tx_irretutorial_1nff_price>
+	</tx_testirreforeignfield_offer>
+	<tx_testirreforeignfield_price>
 		<uid>1</uid>
 		<pid>1</pid>
 		<cruser_id>1</cruser_id>
@@ -237,13 +237,13 @@
 		<deleted>0</deleted>
 		<hidden>0</hidden>
 		<parentid>1</parentid>
-		<parenttable>tx_irretutorial_1nff_offer</parenttable>
+		<parenttable>tx_testirreforeignfield_offer</parenttable>
 		<parentidentifier></parentidentifier>
 		<title>Price 1.1.1 (nff)</title>
 		<price>4.00</price>
         <sorting>128</sorting>
-	</tx_irretutorial_1nff_price>
-	<tx_irretutorial_1nff_price>
+	</tx_testirreforeignfield_price>
+	<tx_testirreforeignfield_price>
 		<uid>2</uid>
 		<pid>1</pid>
 		<cruser_id>1</cruser_id>
@@ -254,13 +254,13 @@
 		<deleted>0</deleted>
 		<hidden>0</hidden>
 		<parentid>1</parentid>
-		<parenttable>tx_irretutorial_1nff_offer</parenttable>
+		<parenttable>tx_testirreforeignfield_offer</parenttable>
 		<parentidentifier></parentidentifier>
 		<title>Price 1.1.2 (nff)</title>
 		<price>869.00</price>
         <sorting>256</sorting>
-	</tx_irretutorial_1nff_price>
-	<tx_irretutorial_1nff_price>
+	</tx_testirreforeignfield_price>
+	<tx_testirreforeignfield_price>
 		<uid>3</uid>
 		<pid>1</pid>
 		<cruser_id>1</cruser_id>
@@ -271,13 +271,13 @@
 		<deleted>0</deleted>
 		<hidden>0</hidden>
 		<parentid>2</parentid>
-		<parenttable>tx_irretutorial_1nff_offer</parenttable>
+		<parenttable>tx_testirreforeignfield_offer</parenttable>
 		<parentidentifier></parentidentifier>
 		<title>Price 1.2.1 (nff)</title>
 		<price>678.00</price>
         <sorting>512</sorting>
-	</tx_irretutorial_1nff_price>
-	<tx_irretutorial_1nff_price>
+	</tx_testirreforeignfield_price>
+	<tx_testirreforeignfield_price>
 		<uid>4</uid>
 		<pid>1</pid>
 		<cruser_id>1</cruser_id>
@@ -288,12 +288,12 @@
 		<deleted>0</deleted>
 		<hidden>0</hidden>
 		<parentid>3</parentid>
-		<parenttable>tx_irretutorial_1nff_offer</parenttable>
+		<parenttable>tx_testirreforeignfield_offer</parenttable>
 		<parentidentifier></parentidentifier>
 		<title>Price 2.1.1 (nff)</title>
 		<price>5467567.00</price>
         <sorting>1024</sorting>
-	</tx_irretutorial_1nff_price>
+	</tx_testirreforeignfield_price>
 	<tx_irretutorial_mnasym_hotel>
 		<uid>1</uid>
 		<pid>1</pid>
diff --git a/typo3/sysext/impexp/Tests/Functional/Fixtures/IrreRecordsIncludeFields.php b/typo3/sysext/impexp/Tests/Functional/Fixtures/IrreRecordsIncludeFields.php
index 3a536c7bda99..6da755d0c3a6 100644
--- a/typo3/sysext/impexp/Tests/Functional/Fixtures/IrreRecordsIncludeFields.php
+++ b/typo3/sysext/impexp/Tests/Functional/Fixtures/IrreRecordsIncludeFields.php
@@ -15,7 +15,7 @@ return [
         'deleted',
         'hidden',
         't3ver_oid',
-        'tx_irretutorial_1nff_hotels',
+        'tx_testirreforeignfield_hotels',
         'tx_testirrecsv_hotels',
     ],
     'tx_testirrecsv_hotel' => [
@@ -48,7 +48,7 @@ return [
         'title',
         'price',
     ],
-    'tx_irretutorial_1nff_hotel' => [
+    'tx_testirreforeignfield_hotel' => [
         'cruser_id',
         'sys_language_uid',
         'l18n_parent',
@@ -61,7 +61,7 @@ return [
         'title',
         'offers',
     ],
-    'tx_irretutorial_1nff_offer' => [
+    'tx_testirreforeignfield_offer' => [
         'cruser_id',
         'sys_language_uid',
         'l18n_parent',
@@ -74,7 +74,7 @@ return [
         'title',
         'prices',
     ],
-    'tx_irretutorial_1nff_price' => [
+    'tx_testirreforeignfield_price' => [
         'cruser_id',
         'sys_language_uid',
         'l18n_parent',
diff --git a/typo3/sysext/impexp/Tests/Functional/Fixtures/XmlExports/irre-records.xml b/typo3/sysext/impexp/Tests/Functional/Fixtures/XmlExports/irre-records.xml
index 360a334b5a6b..56161ef3ca27 100644
--- a/typo3/sysext/impexp/Tests/Functional/Fixtures/XmlExports/irre-records.xml
+++ b/typo3/sysext/impexp/Tests/Functional/Fixtures/XmlExports/irre-records.xml
@@ -37,13 +37,13 @@
 							<id>2</id>
 							<table>tx_testirrecsv_hotel</table>
 						</element>
-						<element index="tx_irretutorial_1nff_hotel:1" type="array">
+						<element index="tx_testirreforeignfield_hotel:1" type="array">
 							<id>1</id>
-							<table>tx_irretutorial_1nff_hotel</table>
+							<table>tx_testirreforeignfield_hotel</table>
 						</element>
-						<element index="tx_irretutorial_1nff_hotel:2" type="array">
+						<element index="tx_testirreforeignfield_hotel:2" type="array">
 							<id>2</id>
-							<table>tx_irretutorial_1nff_hotel</table>
+							<table>tx_testirreforeignfield_hotel</table>
 						</element>
 
 					</relations>
@@ -141,19 +141,19 @@
 					<softrefs type="array"></softrefs>
 				</rec>
 			</table>
-			<table index="tx_irretutorial_1nff_hotel" type="array">
+			<table index="tx_testirreforeignfield_hotel" type="array">
 				<rec index="1" type="array">
 					<uid>1</uid>
 					<pid>1</pid>
 					<title>Hotel 1 (nff)</title>
 					<relations index="rels" type="array">
-						<element index="tx_irretutorial_1nff_offer:1" type="array">
+						<element index="tx_testirreforeignfield_offer:1" type="array">
 							<id>1</id>
-							<table>tx_irretutorial_1nff_offer</table>
+							<table>tx_testirreforeignfield_offer</table>
 						</element>
-						<element index="tx_irretutorial_1nff_offer:2" type="array">
+						<element index="tx_testirreforeignfield_offer:2" type="array">
 							<id>2</id>
-							<table>tx_irretutorial_1nff_offer</table>
+							<table>tx_testirreforeignfield_offer</table>
 						</element>
 					</relations>
 					<softrefs type="array"></softrefs>
@@ -163,27 +163,27 @@
 					<pid>1</pid>
 					<title>Hotel 2 (nff)</title>
 					<relations index="rels" type="array">
-						<element index="tx_irretutorial_1nff_offer:3" type="array">
+						<element index="tx_testirreforeignfield_offer:3" type="array">
 							<id>3</id>
-							<table>tx_irretutorial_1nff_offer</table>
+							<table>tx_testirreforeignfield_offer</table>
 						</element>
 					</relations>
 					<softrefs type="array"></softrefs>
 				</rec>
 			</table>
-			<table index="tx_irretutorial_1nff_offer" type="array">
+			<table index="tx_testirreforeignfield_offer" type="array">
 				<rec index="1" type="array">
 					<uid>1</uid>
 					<pid>1</pid>
 					<title>Offer 1.1 (nff)</title>
 					<relations index="rels" type="array">
-						<element index="tx_irretutorial_1nff_price:1" type="array">
+						<element index="tx_testirreforeignfield_price:1" type="array">
 							<id>1</id>
-							<table>tx_irretutorial_1nff_price</table>
+							<table>tx_testirreforeignfield_price</table>
 						</element>
-						<element index="tx_irretutorial_1nff_price:2" type="array">
+						<element index="tx_testirreforeignfield_price:2" type="array">
 							<id>2</id>
-							<table>tx_irretutorial_1nff_price</table>
+							<table>tx_testirreforeignfield_price</table>
 						</element>
 					</relations>
 					<softrefs type="array"></softrefs>
@@ -193,9 +193,9 @@
 					<pid>1</pid>
 					<title>Offer 1.2 (nff)</title>
 					<relations index="rels" type="array">
-						<element index="tx_irretutorial_1nff_price:3" type="array">
+						<element index="tx_testirreforeignfield_price:3" type="array">
 							<id>3</id>
-							<table>tx_irretutorial_1nff_price</table>
+							<table>tx_testirreforeignfield_price</table>
 						</element>
 					</relations>
 					<softrefs type="array"></softrefs>
@@ -205,15 +205,15 @@
 					<pid>1</pid>
 					<title>Offer 2.1 (nff)</title>
 					<relations index="rels" type="array">
-						<element index="tx_irretutorial_1nff_price:4" type="array">
+						<element index="tx_testirreforeignfield_price:4" type="array">
 							<id>4</id>
-							<table>tx_irretutorial_1nff_price</table>
+							<table>tx_testirreforeignfield_price</table>
 						</element>
 					</relations>
 					<softrefs type="array"></softrefs>
 				</rec>
 			</table>
-			<table index="tx_irretutorial_1nff_price" type="array">
+			<table index="tx_testirreforeignfield_price" type="array">
 				<rec index="1" type="array">
 					<uid>1</uid>
 					<pid>1</pid>
@@ -623,16 +623,16 @@
 					<item index="2">1</item>
 					<item index="1">1</item>
 				</table>
-				<table index="tx_irretutorial_1nff_hotel" type="array">
+				<table index="tx_testirreforeignfield_hotel" type="array">
 					<item index="1">1</item>
 					<item index="2">1</item>
 				</table>
-				<table index="tx_irretutorial_1nff_offer" type="array">
+				<table index="tx_testirreforeignfield_offer" type="array">
 					<item index="1">1</item>
 					<item index="2">1</item>
 					<item index="3">1</item>
 				</table>
-				<table index="tx_irretutorial_1nff_price" type="array">
+				<table index="tx_testirreforeignfield_price" type="array">
 					<item index="1">1</item>
 					<item index="2">1</item>
 					<item index="3">1</item>
@@ -714,7 +714,7 @@
 				<field index="CType">text</field>
 				<field index="header">Test content</field>
 				<field index="tx_testirrecsv_hotels">1,2</field>
-				<field index="tx_irretutorial_1nff_hotels" type="integer">2</field>
+				<field index="tx_testirreforeignfield_hotels" type="integer">2</field>
 			</fieldlist>
 			<related index="rels" type="array">
 				<field index="tx_testirrecsv_hotels" type="array">
@@ -730,16 +730,16 @@
 						</element>
 					</relations>
 				</field>
-				<field index="tx_irretutorial_1nff_hotels" type="array">
+				<field index="tx_testirreforeignfield_hotels" type="array">
 					<type>db</type>
 					<relations index="itemArray" type="array">
 						<element index="0" type="array">
 							<id>1</id>
-							<table>tx_irretutorial_1nff_hotel</table>
+							<table>tx_testirreforeignfield_hotel</table>
 						</element>
 						<element index="1" type="array">
 							<id>2</id>
-							<table>tx_irretutorial_1nff_hotel</table>
+							<table>tx_testirreforeignfield_hotel</table>
 						</element>
 					</relations>
 				</field>
@@ -919,7 +919,7 @@
 			</fieldlist>
 			<related index="rels" type="array"></related>
 		</tablerow>
-		<tablerow index="tx_irretutorial_1nff_hotel:1" type="array">
+		<tablerow index="tx_testirreforeignfield_hotel:1" type="array">
 			<fieldlist index="data" type="array">
 				<field index="uid" type="integer">1</field>
 				<field index="pid" type="integer">1</field>
@@ -941,17 +941,17 @@
 					<relations index="itemArray" type="array">
 						<element index="0" type="array">
 							<id>1</id>
-							<table>tx_irretutorial_1nff_offer</table>
+							<table>tx_testirreforeignfield_offer</table>
 						</element>
 						<element index="1" type="array">
 							<id>2</id>
-							<table>tx_irretutorial_1nff_offer</table>
+							<table>tx_testirreforeignfield_offer</table>
 						</element>
 					</relations>
 				</field>
 			</related>
 		</tablerow>
-		<tablerow index="tx_irretutorial_1nff_hotel:2" type="array">
+		<tablerow index="tx_testirreforeignfield_hotel:2" type="array">
 			<fieldlist index="data" type="array">
 				<field index="uid" type="integer">2</field>
 				<field index="pid" type="integer">1</field>
@@ -973,13 +973,13 @@
 					<relations index="itemArray" type="array">
 						<element index="0" type="array">
 							<id>3</id>
-							<table>tx_irretutorial_1nff_offer</table>
+							<table>tx_testirreforeignfield_offer</table>
 						</element>
 					</relations>
 				</field>
 			</related>
 		</tablerow>
-		<tablerow index="tx_irretutorial_1nff_offer:1" type="array">
+		<tablerow index="tx_testirreforeignfield_offer:1" type="array">
 			<fieldlist index="data" type="array">
 				<field index="uid" type="integer">1</field>
 				<field index="pid" type="integer">1</field>
@@ -990,7 +990,7 @@
 				<field index="sys_language_uid" type="integer">0</field>
 				<field index="l18n_parent" type="integer">0</field>
 				<field index="parentid" type="integer">1</field>
-				<field index="parenttable">tx_irretutorial_1nff_hotel</field>
+				<field index="parenttable">tx_testirreforeignfield_hotel</field>
 				<field index="parentidentifier"></field>
 				<field index="title">Offer 1.1 (nff)</field>
 				<field index="prices" type="integer">2</field>
@@ -1001,17 +1001,17 @@
 					<relations index="itemArray" type="array">
 						<element index="0" type="array">
 							<id>1</id>
-							<table>tx_irretutorial_1nff_price</table>
+							<table>tx_testirreforeignfield_price</table>
 						</element>
 						<element index="1" type="array">
 							<id>2</id>
-							<table>tx_irretutorial_1nff_price</table>
+							<table>tx_testirreforeignfield_price</table>
 						</element>
 					</relations>
 				</field>
 			</related>
 		</tablerow>
-		<tablerow index="tx_irretutorial_1nff_offer:2" type="array">
+		<tablerow index="tx_testirreforeignfield_offer:2" type="array">
 			<fieldlist index="data" type="array">
 				<field index="uid" type="integer">2</field>
 				<field index="pid" type="integer">1</field>
@@ -1022,7 +1022,7 @@
 				<field index="sys_language_uid" type="integer">0</field>
 				<field index="l18n_parent" type="integer">0</field>
 				<field index="parentid" type="integer">1</field>
-				<field index="parenttable">tx_irretutorial_1nff_hotel</field>
+				<field index="parenttable">tx_testirreforeignfield_hotel</field>
 				<field index="parentidentifier"></field>
 				<field index="title">Offer 1.2 (nff)</field>
 				<field index="prices" type="integer">1</field>
@@ -1033,13 +1033,13 @@
 					<relations index="itemArray" type="array">
 						<element index="0" type="array">
 							<id>3</id>
-							<table>tx_irretutorial_1nff_price</table>
+							<table>tx_testirreforeignfield_price</table>
 						</element>
 					</relations>
 				</field>
 			</related>
 		</tablerow>
-		<tablerow index="tx_irretutorial_1nff_offer:3" type="array">
+		<tablerow index="tx_testirreforeignfield_offer:3" type="array">
 			<fieldlist index="data" type="array">
 				<field index="uid" type="integer">3</field>
 				<field index="pid" type="integer">1</field>
@@ -1050,7 +1050,7 @@
 				<field index="sys_language_uid" type="integer">0</field>
 				<field index="l18n_parent" type="integer">0</field>
 				<field index="parentid" type="integer">2</field>
-				<field index="parenttable">tx_irretutorial_1nff_hotel</field>
+				<field index="parenttable">tx_testirreforeignfield_hotel</field>
 				<field index="parentidentifier"></field>
 				<field index="title">Offer 2.1 (nff)</field>
 				<field index="prices" type="integer">1</field>
@@ -1061,13 +1061,13 @@
 					<relations index="itemArray" type="array">
 						<element index="0" type="array">
 							<id>4</id>
-							<table>tx_irretutorial_1nff_price</table>
+							<table>tx_testirreforeignfield_price</table>
 						</element>
 					</relations>
 				</field>
 			</related>
 		</tablerow>
-		<tablerow index="tx_irretutorial_1nff_price:1" type="array">
+		<tablerow index="tx_testirreforeignfield_price:1" type="array">
 			<fieldlist index="data" type="array">
 				<field index="uid" type="integer">1</field>
 				<field index="pid" type="integer">1</field>
@@ -1078,14 +1078,14 @@
 				<field index="sys_language_uid" type="integer">0</field>
 				<field index="l18n_parent" type="integer">0</field>
 				<field index="parentid" type="integer">1</field>
-				<field index="parenttable">tx_irretutorial_1nff_offer</field>
+				<field index="parenttable">tx_testirreforeignfield_offer</field>
 				<field index="parentidentifier"></field>
 				<field index="title">Price 1.1.1 (nff)</field>
 				<field index="price">4.00</field>
 			</fieldlist>
 			<related index="rels" type="array"></related>
 		</tablerow>
-		<tablerow index="tx_irretutorial_1nff_price:2" type="array">
+		<tablerow index="tx_testirreforeignfield_price:2" type="array">
 			<fieldlist index="data" type="array">
 				<field index="uid" type="integer">2</field>
 				<field index="pid" type="integer">1</field>
@@ -1096,14 +1096,14 @@
 				<field index="sys_language_uid" type="integer">0</field>
 				<field index="l18n_parent" type="integer">0</field>
 				<field index="parentid" type="integer">1</field>
-				<field index="parenttable">tx_irretutorial_1nff_offer</field>
+				<field index="parenttable">tx_testirreforeignfield_offer</field>
 				<field index="parentidentifier"></field>
 				<field index="title">Price 1.1.2 (nff)</field>
 				<field index="price">869.00</field>
 			</fieldlist>
 			<related index="rels" type="array"></related>
 		</tablerow>
-		<tablerow index="tx_irretutorial_1nff_price:3" type="array">
+		<tablerow index="tx_testirreforeignfield_price:3" type="array">
 			<fieldlist index="data" type="array">
 				<field index="uid" type="integer">3</field>
 				<field index="pid" type="integer">1</field>
@@ -1114,14 +1114,14 @@
 				<field index="sys_language_uid" type="integer">0</field>
 				<field index="l18n_parent" type="integer">0</field>
 				<field index="parentid" type="integer">2</field>
-				<field index="parenttable">tx_irretutorial_1nff_offer</field>
+				<field index="parenttable">tx_testirreforeignfield_offer</field>
 				<field index="parentidentifier"></field>
 				<field index="title">Price 1.2.1 (nff)</field>
 				<field index="price">678.00</field>
 			</fieldlist>
 			<related index="rels" type="array"></related>
 		</tablerow>
-		<tablerow index="tx_irretutorial_1nff_price:4" type="array">
+		<tablerow index="tx_testirreforeignfield_price:4" type="array">
 			<fieldlist index="data" type="array">
 				<field index="uid" type="integer">4</field>
 				<field index="pid" type="integer">1</field>
@@ -1132,7 +1132,7 @@
 				<field index="sys_language_uid" type="integer">0</field>
 				<field index="l18n_parent" type="integer">0</field>
 				<field index="parentid" type="integer">3</field>
-				<field index="parenttable">tx_irretutorial_1nff_offer</field>
+				<field index="parenttable">tx_testirreforeignfield_offer</field>
 				<field index="parentidentifier"></field>
 				<field index="title">Price 2.1.1 (nff)</field>
 				<field index="price">5467567.00</field>
diff --git a/typo3/sysext/impexp/Tests/Functional/Fixtures/XmlImports/irre-records.xml b/typo3/sysext/impexp/Tests/Functional/Fixtures/XmlImports/irre-records.xml
index 7fb4455c8a6c..629131ed5cc5 100644
--- a/typo3/sysext/impexp/Tests/Functional/Fixtures/XmlImports/irre-records.xml
+++ b/typo3/sysext/impexp/Tests/Functional/Fixtures/XmlImports/irre-records.xml
@@ -37,13 +37,13 @@
 							<id>2</id>
 							<table>tx_testirrecsv_hotel</table>
 						</element>
-						<element index="tx_irretutorial_1nff_hotel:1" type="array">
+						<element index="tx_testirreforeignfield_hotel:1" type="array">
 							<id>1</id>
-							<table>tx_irretutorial_1nff_hotel</table>
+							<table>tx_testirreforeignfield_hotel</table>
 						</element>
-						<element index="tx_irretutorial_1nff_hotel:2" type="array">
+						<element index="tx_testirreforeignfield_hotel:2" type="array">
 							<id>2</id>
-							<table>tx_irretutorial_1nff_hotel</table>
+							<table>tx_testirreforeignfield_hotel</table>
 						</element>
 					</relations>
 					<softrefs type="array"></softrefs>
@@ -140,19 +140,19 @@
 					<softrefs type="array"></softrefs>
 				</rec>
 			</table>
-			<table index="tx_irretutorial_1nff_hotel" type="array">
+			<table index="tx_testirreforeignfield_hotel" type="array">
 				<rec index="1" type="array">
 					<uid>1</uid>
 					<pid>1</pid>
 					<title>Hotel 1 (nff)</title>
 					<relations index="rels" type="array">
-						<element index="tx_irretutorial_1nff_offer:1" type="array">
+						<element index="tx_testirreforeignfield_offer:1" type="array">
 							<id>1</id>
-							<table>tx_irretutorial_1nff_offer</table>
+							<table>tx_testirreforeignfield_offer</table>
 						</element>
-						<element index="tx_irretutorial_1nff_offer:2" type="array">
+						<element index="tx_testirreforeignfield_offer:2" type="array">
 							<id>2</id>
-							<table>tx_irretutorial_1nff_offer</table>
+							<table>tx_testirreforeignfield_offer</table>
 						</element>
 					</relations>
 					<softrefs type="array"></softrefs>
@@ -162,27 +162,27 @@
 					<pid>1</pid>
 					<title>Hotel 2 (nff)</title>
 					<relations index="rels" type="array">
-						<element index="tx_irretutorial_1nff_offer:3" type="array">
+						<element index="tx_testirreforeignfield_offer:3" type="array">
 							<id>3</id>
-							<table>tx_irretutorial_1nff_offer</table>
+							<table>tx_testirreforeignfield_offer</table>
 						</element>
 					</relations>
 					<softrefs type="array"></softrefs>
 				</rec>
 			</table>
-			<table index="tx_irretutorial_1nff_offer" type="array">
+			<table index="tx_testirreforeignfield_offer" type="array">
 				<rec index="1" type="array">
 					<uid>1</uid>
 					<pid>1</pid>
 					<title>Offer 1.1 (nff)</title>
 					<relations index="rels" type="array">
-						<element index="tx_irretutorial_1nff_price:1" type="array">
+						<element index="tx_testirreforeignfield_price:1" type="array">
 							<id>1</id>
-							<table>tx_irretutorial_1nff_price</table>
+							<table>tx_testirreforeignfield_price</table>
 						</element>
-						<element index="tx_irretutorial_1nff_price:2" type="array">
+						<element index="tx_testirreforeignfield_price:2" type="array">
 							<id>2</id>
-							<table>tx_irretutorial_1nff_price</table>
+							<table>tx_testirreforeignfield_price</table>
 						</element>
 					</relations>
 					<softrefs type="array"></softrefs>
@@ -192,9 +192,9 @@
 					<pid>1</pid>
 					<title>Offer 2.1 (nff)</title>
 					<relations index="rels" type="array">
-						<element index="tx_irretutorial_1nff_price:4" type="array">
+						<element index="tx_testirreforeignfield_price:4" type="array">
 							<id>4</id>
-							<table>tx_irretutorial_1nff_price</table>
+							<table>tx_testirreforeignfield_price</table>
 						</element>
 					</relations>
 					<softrefs type="array"></softrefs>
@@ -204,15 +204,15 @@
 					<pid>1</pid>
 					<title>Offer 1.2 (nff)</title>
 					<relations index="rels" type="array">
-						<element index="tx_irretutorial_1nff_price:3" type="array">
+						<element index="tx_testirreforeignfield_price:3" type="array">
 							<id>3</id>
-							<table>tx_irretutorial_1nff_price</table>
+							<table>tx_testirreforeignfield_price</table>
 						</element>
 					</relations>
 					<softrefs type="array"></softrefs>
 				</rec>
 			</table>
-			<table index="tx_irretutorial_1nff_price" type="array">
+			<table index="tx_testirreforeignfield_price" type="array">
 				<rec index="1" type="array">
 					<uid>1</uid>
 					<pid>1</pid>
@@ -622,16 +622,16 @@
 					<item index="2">1</item>
 					<item index="1">1</item>
 				</table>
-				<table index="tx_irretutorial_1nff_hotel" type="array">
+				<table index="tx_testirreforeignfield_hotel" type="array">
 					<item index="1">1</item>
 					<item index="2">1</item>
 				</table>
-				<table index="tx_irretutorial_1nff_offer" type="array">
+				<table index="tx_testirreforeignfield_offer" type="array">
 					<item index="1">1</item>
 					<item index="3">1</item>
 					<item index="2">1</item>
 				</table>
-				<table index="tx_irretutorial_1nff_price" type="array">
+				<table index="tx_testirreforeignfield_price" type="array">
 					<item index="1">1</item>
 					<item index="3">1</item>
 					<item index="4">1</item>
@@ -713,7 +713,7 @@
 				<field index="CType">text</field>
 				<field index="header">Test content</field>
 				<field index="tx_testirrecsv_hotels">1,2</field>
-				<field index="tx_irretutorial_1nff_hotels" type="integer">2</field>
+				<field index="tx_testirreforeignfield_hotels" type="integer">2</field>
 			</fieldlist>
 			<related index="rels" type="array">
 				<field index="tx_testirrecsv_hotels" type="array">
@@ -729,16 +729,16 @@
 						</element>
 					</relations>
 				</field>
-				<field index="tx_irretutorial_1nff_hotels" type="array">
+				<field index="tx_testirreforeignfield_hotels" type="array">
 					<type>db</type>
 					<relations index="itemArray" type="array">
 						<element index="0" type="array">
 							<id>1</id>
-							<table>tx_irretutorial_1nff_hotel</table>
+							<table>tx_testirreforeignfield_hotel</table>
 						</element>
 						<element index="1" type="array">
 							<id>2</id>
-							<table>tx_irretutorial_1nff_hotel</table>
+							<table>tx_testirreforeignfield_hotel</table>
 						</element>
 					</relations>
 				</field>
@@ -918,7 +918,7 @@
 			</fieldlist>
 			<related index="rels" type="array"></related>
 		</tablerow>
-		<tablerow index="tx_irretutorial_1nff_hotel:1" type="array">
+		<tablerow index="tx_testirreforeignfield_hotel:1" type="array">
 			<fieldlist index="data" type="array">
 				<field index="uid" type="integer">1</field>
 				<field index="pid" type="integer">1</field>
@@ -940,17 +940,17 @@
 					<relations index="itemArray" type="array">
 						<element index="0" type="array">
 							<id>1</id>
-							<table>tx_irretutorial_1nff_offer</table>
+							<table>tx_testirreforeignfield_offer</table>
 						</element>
 						<element index="1" type="array">
 							<id>2</id>
-							<table>tx_irretutorial_1nff_offer</table>
+							<table>tx_testirreforeignfield_offer</table>
 						</element>
 					</relations>
 				</field>
 			</related>
 		</tablerow>
-		<tablerow index="tx_irretutorial_1nff_hotel:2" type="array">
+		<tablerow index="tx_testirreforeignfield_hotel:2" type="array">
 			<fieldlist index="data" type="array">
 				<field index="uid" type="integer">2</field>
 				<field index="pid" type="integer">1</field>
@@ -972,13 +972,13 @@
 					<relations index="itemArray" type="array">
 						<element index="0" type="array">
 							<id>3</id>
-							<table>tx_irretutorial_1nff_offer</table>
+							<table>tx_testirreforeignfield_offer</table>
 						</element>
 					</relations>
 				</field>
 			</related>
 		</tablerow>
-		<tablerow index="tx_irretutorial_1nff_offer:1" type="array">
+		<tablerow index="tx_testirreforeignfield_offer:1" type="array">
 			<fieldlist index="data" type="array">
 				<field index="uid" type="integer">1</field>
 				<field index="pid" type="integer">1</field>
@@ -989,7 +989,7 @@
 				<field index="sys_language_uid" type="integer">0</field>
 				<field index="l18n_parent" type="integer">0</field>
 				<field index="parentid" type="integer">1</field>
-				<field index="parenttable">tx_irretutorial_1nff_hotel</field>
+				<field index="parenttable">tx_testirreforeignfield_hotel</field>
 				<field index="parentidentifier"></field>
 				<field index="title">Offer 1.1 (nff)</field>
 				<field index="prices" type="integer">2</field>
@@ -1000,17 +1000,17 @@
 					<relations index="itemArray" type="array">
 						<element index="0" type="array">
 							<id>1</id>
-							<table>tx_irretutorial_1nff_price</table>
+							<table>tx_testirreforeignfield_price</table>
 						</element>
 						<element index="1" type="array">
 							<id>2</id>
-							<table>tx_irretutorial_1nff_price</table>
+							<table>tx_testirreforeignfield_price</table>
 						</element>
 					</relations>
 				</field>
 			</related>
 		</tablerow>
-		<tablerow index="tx_irretutorial_1nff_offer:3" type="array">
+		<tablerow index="tx_testirreforeignfield_offer:3" type="array">
 			<fieldlist index="data" type="array">
 				<field index="uid" type="integer">3</field>
 				<field index="pid" type="integer">1</field>
@@ -1021,7 +1021,7 @@
 				<field index="sys_language_uid" type="integer">0</field>
 				<field index="l18n_parent" type="integer">0</field>
 				<field index="parentid" type="integer">2</field>
-				<field index="parenttable">tx_irretutorial_1nff_hotel</field>
+				<field index="parenttable">tx_testirreforeignfield_hotel</field>
 				<field index="parentidentifier"></field>
 				<field index="title">Offer 2.1 (nff)</field>
 				<field index="prices" type="integer">1</field>
@@ -1032,13 +1032,13 @@
 					<relations index="itemArray" type="array">
 						<element index="0" type="array">
 							<id>4</id>
-							<table>tx_irretutorial_1nff_price</table>
+							<table>tx_testirreforeignfield_price</table>
 						</element>
 					</relations>
 				</field>
 			</related>
 		</tablerow>
-		<tablerow index="tx_irretutorial_1nff_offer:2" type="array">
+		<tablerow index="tx_testirreforeignfield_offer:2" type="array">
 			<fieldlist index="data" type="array">
 				<field index="uid" type="integer">2</field>
 				<field index="pid" type="integer">1</field>
@@ -1049,7 +1049,7 @@
 				<field index="sys_language_uid" type="integer">0</field>
 				<field index="l18n_parent" type="integer">0</field>
 				<field index="parentid" type="integer">1</field>
-				<field index="parenttable">tx_irretutorial_1nff_hotel</field>
+				<field index="parenttable">tx_testirreforeignfield_hotel</field>
 				<field index="parentidentifier"></field>
 				<field index="title">Offer 1.2 (nff)</field>
 				<field index="prices" type="integer">1</field>
@@ -1060,13 +1060,13 @@
 					<relations index="itemArray" type="array">
 						<element index="0" type="array">
 							<id>3</id>
-							<table>tx_irretutorial_1nff_price</table>
+							<table>tx_testirreforeignfield_price</table>
 						</element>
 					</relations>
 				</field>
 			</related>
 		</tablerow>
-		<tablerow index="tx_irretutorial_1nff_price:1" type="array">
+		<tablerow index="tx_testirreforeignfield_price:1" type="array">
 			<fieldlist index="data" type="array">
 				<field index="uid" type="integer">1</field>
 				<field index="pid" type="integer">1</field>
@@ -1077,14 +1077,14 @@
 				<field index="sys_language_uid" type="integer">0</field>
 				<field index="l18n_parent" type="integer">0</field>
 				<field index="parentid" type="integer">1</field>
-				<field index="parenttable">tx_irretutorial_1nff_offer</field>
+				<field index="parenttable">tx_testirreforeignfield_offer</field>
 				<field index="parentidentifier"></field>
 				<field index="title">Price 1.1.1 (nff)</field>
 				<field index="price">4.00</field>
 			</fieldlist>
 			<related index="rels" type="array"></related>
 		</tablerow>
-		<tablerow index="tx_irretutorial_1nff_price:3" type="array">
+		<tablerow index="tx_testirreforeignfield_price:3" type="array">
 			<fieldlist index="data" type="array">
 				<field index="uid" type="integer">3</field>
 				<field index="pid" type="integer">1</field>
@@ -1095,14 +1095,14 @@
 				<field index="sys_language_uid" type="integer">0</field>
 				<field index="l18n_parent" type="integer">0</field>
 				<field index="parentid" type="integer">2</field>
-				<field index="parenttable">tx_irretutorial_1nff_offer</field>
+				<field index="parenttable">tx_testirreforeignfield_offer</field>
 				<field index="parentidentifier"></field>
 				<field index="title">Price 1.2.1 (nff)</field>
 				<field index="price">678.00</field>
 			</fieldlist>
 			<related index="rels" type="array"></related>
 		</tablerow>
-		<tablerow index="tx_irretutorial_1nff_price:4" type="array">
+		<tablerow index="tx_testirreforeignfield_price:4" type="array">
 			<fieldlist index="data" type="array">
 				<field index="uid" type="integer">4</field>
 				<field index="pid" type="integer">1</field>
@@ -1113,14 +1113,14 @@
 				<field index="sys_language_uid" type="integer">0</field>
 				<field index="l18n_parent" type="integer">0</field>
 				<field index="parentid" type="integer">3</field>
-				<field index="parenttable">tx_irretutorial_1nff_offer</field>
+				<field index="parenttable">tx_testirreforeignfield_offer</field>
 				<field index="parentidentifier"></field>
 				<field index="title">Price 2.1.1 (nff)</field>
 				<field index="price">5467567.00</field>
 			</fieldlist>
 			<related index="rels" type="array"></related>
 		</tablerow>
-		<tablerow index="tx_irretutorial_1nff_price:2" type="array">
+		<tablerow index="tx_testirreforeignfield_price:2" type="array">
 			<fieldlist index="data" type="array">
 				<field index="uid" type="integer">2</field>
 				<field index="pid" type="integer">1</field>
@@ -1131,7 +1131,7 @@
 				<field index="sys_language_uid" type="integer">0</field>
 				<field index="l18n_parent" type="integer">0</field>
 				<field index="parentid" type="integer">1</field>
-				<field index="parenttable">tx_irretutorial_1nff_offer</field>
+				<field index="parenttable">tx_testirreforeignfield_offer</field>
 				<field index="parentidentifier"></field>
 				<field index="title">Price 1.1.2 (nff)</field>
 				<field index="price">869.00</field>
diff --git a/typo3/sysext/impexp/Tests/Functional/Import/IrreTutorialRecordsTest.php b/typo3/sysext/impexp/Tests/Functional/Import/IrreTutorialRecordsTest.php
index 33e82531649b..239f53af62c0 100644
--- a/typo3/sysext/impexp/Tests/Functional/Import/IrreTutorialRecordsTest.php
+++ b/typo3/sysext/impexp/Tests/Functional/Import/IrreTutorialRecordsTest.php
@@ -28,6 +28,7 @@ class IrreTutorialRecordsTest extends AbstractImportExportTestCase
      */
     protected $testExtensionsToLoad = [
         'typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_csv',
+        'typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield',
         'typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial',
     ];
 
diff --git a/typo3/sysext/impexp/Tests/Functional/ImportExportTest.php b/typo3/sysext/impexp/Tests/Functional/ImportExportTest.php
index b166cf9e14d7..bcc94e92cef0 100644
--- a/typo3/sysext/impexp/Tests/Functional/ImportExportTest.php
+++ b/typo3/sysext/impexp/Tests/Functional/ImportExportTest.php
@@ -28,6 +28,7 @@ class ImportExportTest extends AbstractImportExportTestCase
      */
     protected $testExtensionsToLoad = [
         'typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_csv',
+        'typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield',
         'typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial',
     ];
 
diff --git a/typo3/sysext/install/Tests/Functional/Updates/RowUpdater/Fixtures/WorkspaceNewPlaceholderRemovalIrreForeignFieldImport.csv b/typo3/sysext/install/Tests/Functional/Updates/RowUpdater/Fixtures/WorkspaceNewPlaceholderRemovalIrreForeignFieldImport.csv
index 253f5b9fa3cc..5c09978051fb 100644
--- a/typo3/sysext/install/Tests/Functional/Updates/RowUpdater/Fixtures/WorkspaceNewPlaceholderRemovalIrreForeignFieldImport.csv
+++ b/typo3/sysext/install/Tests/Functional/Updates/RowUpdater/Fixtures/WorkspaceNewPlaceholderRemovalIrreForeignFieldImport.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -18,14 +18,14 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
 ,299,91,256,0,0,0,1,1,0,0,"Regular Element #2",0,,,,,
 ,300,91,256,0,0,0,1,-1,0,299,"Regular Element #2",1,,,,,
 ,301,91,128,0,0,0,1,1,0,0,"Regular Element #1",0,,,,,
 ,302,91,128,0,0,0,1,-1,0,301,"Regular Element #1 Changed Header",2,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
 ,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
@@ -39,17 +39,17 @@
 ,11,91,0,0,0,0,1,-1,0,10,"Hotel #1",301,"tt_content",,2,,
 ,12,91,2,0,0,0,1,1,0,0,"Hotel #2",301,"tt_content",,0,,
 ,13,91,256,0,0,0,1,-1,0,12,"Hotel #2 Changed Title",301,"tt_content",,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,,,
-,9,91,513,0,0,0,1,1,0,0,"Offer #1.1",8,"tx_irretutorial_1nff_hotel",,,,
-,10,91,256,0,0,0,1,-1,0,9,"Offer #1.1",8,"tx_irretutorial_1nff_hotel",,,,
-,11,91,1,0,0,0,1,1,0,0,"Offer #1.1",10,"tx_irretutorial_1nff_hotel",,,,
-,12,91,0,0,0,0,1,-1,0,11,"Offer #1.1",10,"tx_irretutorial_1nff_hotel",,,,
-,13,91,2,0,0,0,1,1,0,0,"Offer #1.2",10,"tx_irretutorial_1nff_hotel",,,,
-,14,91,256,0,0,0,1,-1,0,13,"Offer #1.2 Changed Title",10,"tx_irretutorial_1nff_hotel",,,,
-,15,91,1,0,0,0,1,1,0,0,"Offer #2.1",12,"tx_irretutorial_1nff_hotel",,,,
-,16,91,0,0,0,0,1,-1,0,15,"Offer #2.1",12,"tx_irretutorial_1nff_hotel",,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,,,
+,9,91,513,0,0,0,1,1,0,0,"Offer #1.1",8,"tx_testirreforeignfield_hotel",,,,
+,10,91,256,0,0,0,1,-1,0,9,"Offer #1.1",8,"tx_testirreforeignfield_hotel",,,,
+,11,91,1,0,0,0,1,1,0,0,"Offer #1.1",10,"tx_testirreforeignfield_hotel",,,,
+,12,91,0,0,0,0,1,-1,0,11,"Offer #1.1",10,"tx_testirreforeignfield_hotel",,,,
+,13,91,2,0,0,0,1,1,0,0,"Offer #1.2",10,"tx_testirreforeignfield_hotel",,,,
+,14,91,256,0,0,0,1,-1,0,13,"Offer #1.2 Changed Title",10,"tx_testirreforeignfield_hotel",,,,
+,15,91,1,0,0,0,1,1,0,0,"Offer #2.1",12,"tx_testirreforeignfield_hotel",,,,
+,16,91,0,0,0,0,1,-1,0,15,"Offer #2.1",12,"tx_testirreforeignfield_hotel",,,,
diff --git a/typo3/sysext/install/Tests/Functional/Updates/RowUpdater/Fixtures/WorkspaceNewPlaceholderRemovalIrreForeignFieldResult.csv b/typo3/sysext/install/Tests/Functional/Updates/RowUpdater/Fixtures/WorkspaceNewPlaceholderRemovalIrreForeignFieldResult.csv
index 6bbdf4fe0331..2b1a2fa282f7 100644
--- a/typo3/sysext/install/Tests/Functional/Updates/RowUpdater/Fixtures/WorkspaceNewPlaceholderRemovalIrreForeignFieldResult.csv
+++ b/typo3/sysext/install/Tests/Functional/Updates/RowUpdater/Fixtures/WorkspaceNewPlaceholderRemovalIrreForeignFieldResult.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -18,14 +18,14 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
 ,299,91,256,0,0,0,1,1,0,0,"Regular Element #2",1,,,,,
 ,300,91,256,1,0,0,1,-1,0,299,"Regular Element #2",1,,,,,
 ,301,91,128,0,0,0,1,1,0,0,"Regular Element #1 Changed Header",2,,,,,
 ,302,91,128,1,0,0,1,-1,0,301,"Regular Element #1 Changed Header",2,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
 ,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2,,
@@ -39,17 +39,17 @@
 ,11,91,0,1,0,0,1,-1,0,10,"Hotel #1",301,"tt_content",,2,,
 ,12,91,256,0,0,0,1,1,0,0,"Hotel #2 Changed Title",301,"tt_content",,1,,
 ,13,91,256,1,0,0,1,-1,0,12,"Hotel #2 Changed Title",301,"tt_content",,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,,,
-,9,91,256,0,0,0,1,1,0,0,"Offer #1.1",8,"tx_irretutorial_1nff_hotel",,,,
-,10,91,256,1,0,0,1,-1,0,9,"Offer #1.1",8,"tx_irretutorial_1nff_hotel",,,,
-,11,91,0,0,0,0,1,1,0,0,"Offer #1.1",10,"tx_irretutorial_1nff_hotel",,,,
-,12,91,0,1,0,0,1,-1,0,11,"Offer #1.1",10,"tx_irretutorial_1nff_hotel",,,,
-,13,91,256,0,0,0,1,1,0,0,"Offer #1.2 Changed Title",10,"tx_irretutorial_1nff_hotel",,,,
-,14,91,256,1,0,0,1,-1,0,13,"Offer #1.2 Changed Title",10,"tx_irretutorial_1nff_hotel",,,,
-,15,91,0,0,0,0,1,1,0,0,"Offer #2.1",12,"tx_irretutorial_1nff_hotel",,,,
-,16,91,0,1,0,0,1,-1,0,15,"Offer #2.1",12,"tx_irretutorial_1nff_hotel",,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,,,
+,9,91,256,0,0,0,1,1,0,0,"Offer #1.1",8,"tx_testirreforeignfield_hotel",,,,
+,10,91,256,1,0,0,1,-1,0,9,"Offer #1.1",8,"tx_testirreforeignfield_hotel",,,,
+,11,91,0,0,0,0,1,1,0,0,"Offer #1.1",10,"tx_testirreforeignfield_hotel",,,,
+,12,91,0,1,0,0,1,-1,0,11,"Offer #1.1",10,"tx_testirreforeignfield_hotel",,,,
+,13,91,256,0,0,0,1,1,0,0,"Offer #1.2 Changed Title",10,"tx_testirreforeignfield_hotel",,,,
+,14,91,256,1,0,0,1,-1,0,13,"Offer #1.2 Changed Title",10,"tx_testirreforeignfield_hotel",,,,
+,15,91,0,0,0,0,1,1,0,0,"Offer #2.1",12,"tx_testirreforeignfield_hotel",,,,
+,16,91,0,1,0,0,1,-1,0,15,"Offer #2.1",12,"tx_testirreforeignfield_hotel",,,,
diff --git a/typo3/sysext/install/Tests/Functional/Updates/RowUpdater/WorkspaceNewPlaceholderRemovalTest.php b/typo3/sysext/install/Tests/Functional/Updates/RowUpdater/WorkspaceNewPlaceholderRemovalTest.php
index e6031f8bb87b..b6777839e2fa 100644
--- a/typo3/sysext/install/Tests/Functional/Updates/RowUpdater/WorkspaceNewPlaceholderRemovalTest.php
+++ b/typo3/sysext/install/Tests/Functional/Updates/RowUpdater/WorkspaceNewPlaceholderRemovalTest.php
@@ -40,8 +40,8 @@ class WorkspaceNewPlaceholderRemovalTest extends AbstractDataHandlerActionTestCa
      * @var array
      */
     protected $testExtensionsToLoad = [
+        'typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield',
         'typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_csv',
-        'typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial',
     ];
 
     /**
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/AbstractActionTestCase.php b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/AbstractActionTestCase.php
index 370d429b8575..b7946ec250eb 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/AbstractActionTestCase.php
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/AbstractActionTestCase.php
@@ -42,7 +42,7 @@ abstract class AbstractActionTestCase extends \TYPO3\CMS\Core\Tests\Functional\D
 
     public function changeHotelSortingWithOfferNotWorkspaceAware(): void
     {
-        $GLOBALS['TCA']['tx_irretutorial_1nff_offer']['ctrl']['versioningWS'] = false;
+        $GLOBALS['TCA']['tx_testirreforeignfield_offer']['ctrl']['versioningWS'] = false;
         $this->actionService->moveRecord(self::TABLE_Hotel, self::VALUE_HotelIdFirst, -self::VALUE_HotelIdSecond);
     }
 
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/DataSet/ImportDefault.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/DataSet/ImportDefault.csv
index f58c1f3a3057..4b4ff028c170 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/DataSet/ImportDefault.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/DataSet/ImportDefault.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,46 +16,46 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","image","tx_irretutorial_1nff_hotels",,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","image","tx_testirreforeignfield_hotels",,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",0,2,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",0,1,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","l18n_diffsource","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",
 ,2,89,1,0,0,0,,0,0,0,0,"Hotel #0",89,"pages",,0,
-,3,89,1,0,0,0,,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,
-,4,89,2,0,0,0,,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,
-,5,89,1,0,0,0,,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,
+,4,89,2,0,0,0,,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,
+,5,89,1,0,0,0,,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","l18n_diffsource","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",
-,5,89,1,0,0,0,,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,
-,6,89,2,0,0,0,,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,
-,7,89,1,0,0,0,,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,
-,8,89,1,0,0,0,,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,
+,6,89,2,0,0,0,,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,
+,7,89,1,0,0,0,,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,
+,8,89,1,0,0,0,,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","l18n_diffsource","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,
-,7,89,1,0,0,0,,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,
-,8,89,2,0,0,0,,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,
-,9,89,3,0,0,0,,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,
-,10,89,1,0,0,0,,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,
-,11,89,2,0,0,0,,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,
-,12,89,1,0,0,0,,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,
-,13,89,1,0,0,0,,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,
+,7,89,1,0,0,0,,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,
+,8,89,2,0,0,0,,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,
+,9,89,3,0,0,0,,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,
+,10,89,1,0,0,0,,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,
+,11,89,2,0,0,0,,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,
+,12,89,1,0,0,0,,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,
+,13,89,1,0,0,0,,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
 ,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/changeParentContentSorting.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/changeParentContentSorting.csv
index 5328e2554c78..1688231227b3 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/changeParentContentSorting.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/changeParentContentSorting.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,46 +16,27 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
 ,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
 ,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
 ,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
-"sys_refindex",,,,,,,,,,,,,,,,,
-,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
-,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/copyPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/copyPage.csv
index 5328e2554c78..69f215ebcebd 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/copyPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/copyPage.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,46 +16,46 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/copyPageWHotelBeforeParentContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/copyPageWHotelBeforeParentContent.csv
index 5328e2554c78..69f215ebcebd 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/copyPageWHotelBeforeParentContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/copyPageWHotelBeforeParentContent.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,46 +16,46 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/copyParentContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/copyParentContent.csv
index 5328e2554c78..69f215ebcebd 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/copyParentContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/copyParentContent.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,46 +16,46 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/copyParentContentToDifferentPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/copyParentContentToDifferentPage.csv
index 5328e2554c78..69f215ebcebd 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/copyParentContentToDifferentPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/copyParentContentToDifferentPage.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,46 +16,46 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/createNCopyParentContentNHotelNOfferChildren.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/createNCopyParentContentNHotelNOfferChildren.csv
index fc3225073f25..4d68aa002d0d 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/createNCopyParentContentNHotelNOfferChildren.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/createNCopyParentContentNHotelNOfferChildren.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,51 +16,51 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
 ,299,89,128,0,0,0,1,1,0,0,"Testing #1",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-,6,89,1,0,0,0,1,1,0,0,"Hotel #1",299,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+,6,89,1,0,0,0,1,1,0,0,"Hotel #1",299,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-,9,89,1,0,0,0,1,1,0,0,"Offer #1",6,"tx_irretutorial_1nff_hotel",,0,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+,9,89,1,0,0,0,1,1,0,0,"Offer #1",6,"tx_testirreforeignfield_hotel",,0,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"363e6e9c12f3293d38f01286992f7cec","tx_irretutorial_1nff_hotel",6,"offers",,,,0,1,"tx_irretutorial_1nff_offer",9,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"cecaae578e249856c5651f542af6c872","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,1,"tx_irretutorial_1nff_hotel",6,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
+,"f735c7fc6863a29d827ca201f60c8055","tt_content",299,"tx_testirreforeignfield_hotels",,,,0,1,"tx_testirreforeignfield_hotel",6,,,,,,
+,"c55a8f3d4437551b62ae5584e58a646e","tx_testirreforeignfield_hotel",6,"offers",,,,0,1,"tx_testirreforeignfield_offer",9,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/createNLocParentNHotelNOfferChildrenNDiscardLocParent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/createNLocParentNHotelNOfferChildrenNDiscardLocParent.csv
index ac704f9efd9f..456a56bef7f7 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/createNLocParentNHotelNOfferChildrenNDiscardLocParent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/createNLocParentNHotelNOfferChildrenNDiscardLocParent.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,51 +16,51 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
 ,299,89,128,0,0,0,1,1,0,0,"Testing #1",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,514,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-,6,89,1,0,0,0,1,1,0,0,"Hotel #1",299,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,514,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+,6,89,1,0,0,0,1,1,0,0,"Hotel #1",299,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,514,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-,9,89,1,0,0,0,1,1,0,0,"Offer #1",6,"tx_irretutorial_1nff_hotel",,0,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,514,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+,9,89,1,0,0,0,1,1,0,0,"Offer #1",6,"tx_testirreforeignfield_hotel",,0,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"363e6e9c12f3293d38f01286992f7cec","tx_irretutorial_1nff_hotel",6,"offers",,,,0,1,"tx_irretutorial_1nff_offer",9,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"cecaae578e249856c5651f542af6c872","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,1,"tx_irretutorial_1nff_hotel",6,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
+,"f735c7fc6863a29d827ca201f60c8055","tt_content",299,"tx_testirreforeignfield_hotels",,,,0,1,"tx_testirreforeignfield_hotel",6,,,,,,
+,"c55a8f3d4437551b62ae5584e58a646e","tx_testirreforeignfield_hotel",6,"offers",,,,0,1,"tx_testirreforeignfield_offer",9,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
index f51f1abcb723..cc84adf52780 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -17,47 +17,47 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,514,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,514,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,514,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,514,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
 ,"560d1e59437906ce8ecd07cbb8b61650","pages",91,"l10n_parent",,,,0,1,"pages",89,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/createParentContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/createParentContent.csv
index 0b2f23a9d70f..734bf12a05df 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/createParentContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/createParentContent.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,46 +16,46 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","l18n_diffsource","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",
 ,2,89,1,0,0,0,,0,0,0,0,"Hotel #0",89,"pages",,0,
-,3,89,1,0,0,0,,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,
-,4,89,2,0,0,0,,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,
-,5,89,1,0,0,0,,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,
+,4,89,2,0,0,0,,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,
+,5,89,1,0,0,0,,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","l18n_diffsource","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",
-,5,89,1,0,0,0,,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,
-,6,89,2,0,0,0,,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,
-,7,89,1,0,0,0,,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,
-,8,89,1,0,0,0,,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,
+,6,89,2,0,0,0,,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,
+,7,89,1,0,0,0,,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,
+,8,89,1,0,0,0,,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","l18n_diffsource","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,
-,7,89,1,0,0,0,,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,
-,8,89,2,0,0,0,,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,
-,9,89,3,0,0,0,,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,
-,10,89,1,0,0,0,,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,
-,11,89,2,0,0,0,,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,
-,12,89,1,0,0,0,,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,
-,13,89,1,0,0,0,,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,
+,7,89,1,0,0,0,,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,
+,8,89,2,0,0,0,,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,
+,9,89,3,0,0,0,,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,
+,10,89,1,0,0,0,,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,
+,11,89,2,0,0,0,,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,
+,12,89,1,0,0,0,,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,
+,13,89,1,0,0,0,,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/createParentContentNHotelNOfferChildren.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/createParentContentNHotelNOfferChildren.csv
index 5328e2554c78..69f215ebcebd 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/createParentContentNHotelNOfferChildren.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/createParentContentNHotelNOfferChildren.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,46 +16,46 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/deletePage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/deletePage.csv
index 5328e2554c78..69f215ebcebd 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/deletePage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/deletePage.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,46 +16,46 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/deleteParentContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/deleteParentContent.csv
index 5328e2554c78..69f215ebcebd 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/deleteParentContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/deleteParentContent.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,46 +16,46 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/localizeParentContentWAllChildren.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/localizeParentContentWAllChildren.csv
index 79db96931516..7e04ee2cc500 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/localizeParentContentWAllChildren.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/localizeParentContentWAllChildren.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -17,47 +17,47 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,514,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,514,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,514,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,514,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,514,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,515,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,514,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,514,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,515,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,514,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
 ,"560d1e59437906ce8ecd07cbb8b61650","pages",91,"l10n_parent",,,,0,1,"pages",89,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/modifyNDiscardNModifyParentWHotelChild.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/modifyNDiscardNModifyParentWHotelChild.csv
index 5328e2554c78..69f215ebcebd 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/modifyNDiscardNModifyParentWHotelChild.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/modifyNDiscardNModifyParentWHotelChild.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,46 +16,46 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/modifyOnlyHotelChild.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/modifyOnlyHotelChild.csv
index 5328e2554c78..69f215ebcebd 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/modifyOnlyHotelChild.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/modifyOnlyHotelChild.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,46 +16,46 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/modifyPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/modifyPage.csv
index 5328e2554c78..69f215ebcebd 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/modifyPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/modifyPage.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,46 +16,46 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/modifyParentContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/modifyParentContent.csv
index 5328e2554c78..69f215ebcebd 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/modifyParentContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/modifyParentContent.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,46 +16,46 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/modifyParentNAddHotelChild.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/modifyParentNAddHotelChild.csv
index 5328e2554c78..69f215ebcebd 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/modifyParentNAddHotelChild.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/modifyParentNAddHotelChild.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,46 +16,46 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/modifyParentNChangeHotelChildrenSorting.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/modifyParentNChangeHotelChildrenSorting.csv
index 5328e2554c78..69f215ebcebd 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/modifyParentNChangeHotelChildrenSorting.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/modifyParentNChangeHotelChildrenSorting.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,46 +16,46 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/modifyParentNDeleteHotelChild.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/modifyParentNDeleteHotelChild.csv
index 5328e2554c78..69f215ebcebd 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/modifyParentNDeleteHotelChild.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/modifyParentNDeleteHotelChild.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,46 +16,46 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/modifyParentNHotelChild.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/modifyParentNHotelChild.csv
index 5328e2554c78..69f215ebcebd 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/modifyParentNHotelChild.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/modifyParentNHotelChild.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,46 +16,46 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/moveParentContentToDifferentPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/moveParentContentToDifferentPage.csv
index 5328e2554c78..69f215ebcebd 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/moveParentContentToDifferentPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/moveParentContentToDifferentPage.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,46 +16,46 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/moveParentContentToDifferentPageNChangeSorting.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/moveParentContentToDifferentPageNChangeSorting.csv
index 5328e2554c78..69f215ebcebd 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/moveParentContentToDifferentPageNChangeSorting.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/moveParentContentToDifferentPageNChangeSorting.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,46 +16,46 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/moveParentContentToDifferentPageTwice.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/moveParentContentToDifferentPageTwice.csv
index 5328e2554c78..69f215ebcebd 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/moveParentContentToDifferentPageTwice.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Discard/DataSet/moveParentContentToDifferentPageTwice.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,46 +16,46 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/changeHotelSortingWithOfferNotWorkspaceAware.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/changeHotelSortingWithOfferNotWorkspaceAware.csv
index 637f8f42b94e..c3a0d495c53c 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/changeHotelSortingWithOfferNotWorkspaceAware.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/changeHotelSortingWithOfferNotWorkspaceAware.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,49 +16,49 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-,6,89,258,0,0,0,1,4,0,3,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+,6,89,258,0,0,0,1,4,0,3,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"7f5bc4bc63cf4e1479fb3e67f3793fe0","tx_irretutorial_1nff_hotel",6,"offers",,,,0,1,"tx_irretutorial_1nff_offer",5,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
-,"f0b2055f6077d17142969133eb7b3327","tx_irretutorial_1nff_hotel",6,"offers",,,,1,1,"tx_irretutorial_1nff_offer",6,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
+,"53f18d3a6a18cf9c16faa923d9f8216e","tx_testirreforeignfield_hotel",6,"offers",,,,0,1,"tx_testirreforeignfield_offer",5,,,,,,
+,"db0d8d1a17aa1713ef9fe40281bcf5ea","tx_testirreforeignfield_hotel",6,"offers",,,,1,1,"tx_testirreforeignfield_offer",6,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/changeParentContentSorting.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/changeParentContentSorting.csv
index f47e302eabce..09f0c4556ab7 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/changeParentContentSorting.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/changeParentContentSorting.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,69 +16,69 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
 ,299,89,768,0,0,0,1,4,0,297,"Regular Element #1",2,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-,6,89,1,0,0,0,1,0,0,3,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,7,89,2,0,0,0,1,0,0,4,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+,6,89,1,0,0,0,1,0,0,3,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,7,89,2,0,0,0,1,0,0,4,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-,9,89,1,0,0,0,1,0,0,5,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,10,89,2,0,0,0,1,0,0,6,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,11,89,1,0,0,0,1,0,0,7,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+,9,89,1,0,0,0,1,0,0,5,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,10,89,2,0,0,0,1,0,0,6,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,11,89,1,0,0,0,1,0,0,7,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
-,14,89,1,0,0,0,1,0,0,7,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,15,89,2,0,0,0,1,0,0,8,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,16,89,3,0,0,0,1,0,0,9,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,17,89,1,0,0,0,1,0,0,10,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,18,89,2,0,0,0,1,0,0,11,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,19,89,1,0,0,0,1,0,0,12,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
+,14,89,1,0,0,0,1,0,0,7,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,15,89,2,0,0,0,1,0,0,8,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,16,89,3,0,0,0,1,0,0,9,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,17,89,1,0,0,0,1,0,0,10,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,18,89,2,0,0,0,1,0,0,11,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,19,89,1,0,0,0,1,0,0,12,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"15b4763f9e142d9bc3ffc29c8e1b9874","tx_irretutorial_1nff_offer",9,"prices",,,,1,1,"tx_irretutorial_1nff_price",15,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"2b3ec50aa698b6d70ace8e3772263387","tx_irretutorial_1nff_hotel",7,"offers",,,,0,1,"tx_irretutorial_1nff_offer",11,,,,,,
-,"363e6e9c12f3293d38f01286992f7cec","tx_irretutorial_1nff_hotel",6,"offers",,,,0,1,"tx_irretutorial_1nff_offer",9,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"49e1dbed3a73511411ef4d2b5d0a1c7b","tx_irretutorial_1nff_offer",10,"prices",,,,0,1,"tx_irretutorial_1nff_price",17,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"6e88a10780f54735e223fcd3110d1248","tt_content",299,"tx_irretutorial_1nff_hotels",,,,1,1,"tx_irretutorial_1nff_hotel",7,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"799d002fd079ca160e6db0d6d3c2273f","tx_irretutorial_1nff_offer",10,"prices",,,,1,1,"tx_irretutorial_1nff_price",18,,,,,,
-,"8241802c77fe733045d90f9645f71e90","tx_irretutorial_1nff_offer",9,"prices",,,,0,1,"tx_irretutorial_1nff_price",14,,,,,,
-,"afcae32edf12d45a8357ca90cbb92548","tx_irretutorial_1nff_offer",11,"prices",,,,0,1,"tx_irretutorial_1nff_price",19,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"cecaae578e249856c5651f542af6c872","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,1,"tx_irretutorial_1nff_hotel",6,,,,,,
-,"e2dcc00c7a033a6b8d61ea91540c2342","tx_irretutorial_1nff_hotel",6,"offers",,,,1,1,"tx_irretutorial_1nff_offer",10,,,,,,
-,"ee63e2149d0d656c2a8704f51a16a67a","tx_irretutorial_1nff_offer",9,"prices",,,,2,1,"tx_irretutorial_1nff_price",16,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
+,"b3df9eac6d6c2ebddd3d3df8203bda92","tx_testirreforeignfield_offer",9,"prices",,,,0,1,"tx_testirreforeignfield_price",14,,,,,,
+,"b488190412ad71c1067619282306600a","tx_testirreforeignfield_offer",9,"prices",,,,1,1,"tx_testirreforeignfield_price",15,,,,,,
+,"15067fb440a562d18b2c00ae82a701f3","tx_testirreforeignfield_offer",9,"prices",,,,2,1,"tx_testirreforeignfield_price",16,,,,,,
+,"9cf838775310d90125a953c5e25ab815","tx_testirreforeignfield_offer",10,"prices",,,,0,1,"tx_testirreforeignfield_price",17,,,,,,
+,"2539b1f00daf65e7831446818aead3f0","tx_testirreforeignfield_offer",10,"prices",,,,1,1,"tx_testirreforeignfield_price",18,,,,,,
+,"ff4a495b29082752c4759a689b5fd3a0","tx_testirreforeignfield_offer",11,"prices",,,,0,1,"tx_testirreforeignfield_price",19,,,,,,
+,"c55a8f3d4437551b62ae5584e58a646e","tx_testirreforeignfield_hotel",6,"offers",,,,0,1,"tx_testirreforeignfield_offer",9,,,,,,
+,"5c5bcdcbbb7d6e744cb08c32f924af7b","tx_testirreforeignfield_hotel",6,"offers",,,,1,1,"tx_testirreforeignfield_offer",10,,,,,,
+,"3eba86662c983d80b7f24d75debb7316","tx_testirreforeignfield_hotel",7,"offers",,,,0,1,"tx_testirreforeignfield_offer",11,,,,,,
+,"f735c7fc6863a29d827ca201f60c8055","tt_content",299,"tx_testirreforeignfield_hotels",,,,0,1,"tx_testirreforeignfield_hotel",6,,,,,,
+,"f2c79ecd14664f7df03cf217762039cc","tt_content",299,"tx_testirreforeignfield_hotels",,,,1,1,"tx_testirreforeignfield_hotel",7,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyPage.csv
index 5722e522dbf3..024db49d0f95 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyPage.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -17,78 +17,78 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
 ,299,91,256,0,0,0,1,1,0,0,"Regular Element #2",1,,,,,
 ,300,91,128,0,0,0,1,1,0,0,"Regular Element #1",2,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
 ,6,91,1,0,0,0,1,1,0,0,"Hotel #0",91,"pages",,0,,
-,7,91,513,0,0,0,1,1,0,0,"Hotel #1",299,"tt_content",1nff.hotels,1,,
-,8,91,1,0,0,0,1,1,0,0,"Hotel #1",300,"tt_content",1nff.hotels,2,,
-,9,91,2,0,0,0,1,1,0,0,"Hotel #2",300,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,7,91,513,0,0,0,1,1,0,0,"Hotel #1",299,"tt_content","1nff.hotels",1,,
+,8,91,1,0,0,0,1,1,0,0,"Hotel #1",300,"tt_content","1nff.hotels",2,,
+,9,91,2,0,0,0,1,1,0,0,"Hotel #2",300,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-,9,91,513,0,0,0,1,1,0,0,"Offer #1.1",7,"tx_irretutorial_1nff_hotel",,1,,
-,10,91,1,0,0,0,1,1,0,0,"Offer #1.1",8,"tx_irretutorial_1nff_hotel",,3,,
-,11,91,2,0,0,0,1,1,0,0,"Offer #1.2",8,"tx_irretutorial_1nff_hotel",,2,,
-,12,91,1,0,0,0,1,1,0,0,"Offer #2.1",9,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+,9,91,513,0,0,0,1,1,0,0,"Offer #1.1",7,"tx_testirreforeignfield_hotel",,1,,
+,10,91,1,0,0,0,1,1,0,0,"Offer #1.1",8,"tx_testirreforeignfield_hotel",,3,,
+,11,91,2,0,0,0,1,1,0,0,"Offer #1.2",8,"tx_testirreforeignfield_hotel",,2,,
+,12,91,1,0,0,0,1,1,0,0,"Offer #2.1",9,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
-,14,91,1025,0,0,0,1,1,0,0,"Price #1.1.1",9,"tx_irretutorial_1nff_offer",,,,
-,15,91,513,0,0,0,1,1,0,0,"Price #1.1.1",10,"tx_irretutorial_1nff_offer",,,,
-,16,91,514,0,0,0,1,1,0,0,"Price #1.1.2",10,"tx_irretutorial_1nff_offer",,,,
-,17,91,515,0,0,0,1,1,0,0,"Price #1.1.3",10,"tx_irretutorial_1nff_offer",,,,
-,18,91,1,0,0,0,1,1,0,0,"Price #1.2.1",11,"tx_irretutorial_1nff_offer",,,,
-,19,91,2,0,0,0,1,1,0,0,"Price #1.2.2",11,"tx_irretutorial_1nff_offer",,,,
-,20,91,1,0,0,0,1,1,0,0,"Price #2.1.1",12,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
+,14,91,1025,0,0,0,1,1,0,0,"Price #1.1.1",9,"tx_testirreforeignfield_offer",,,,
+,15,91,513,0,0,0,1,1,0,0,"Price #1.1.1",10,"tx_testirreforeignfield_offer",,,,
+,16,91,514,0,0,0,1,1,0,0,"Price #1.1.2",10,"tx_testirreforeignfield_offer",,,,
+,17,91,515,0,0,0,1,1,0,0,"Price #1.1.3",10,"tx_testirreforeignfield_offer",,,,
+,18,91,1,0,0,0,1,1,0,0,"Price #1.2.1",11,"tx_testirreforeignfield_offer",,,,
+,19,91,2,0,0,0,1,1,0,0,"Price #1.2.2",11,"tx_testirreforeignfield_offer",,,,
+,20,91,1,0,0,0,1,1,0,0,"Price #2.1.1",12,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"054faee34565a031b01d0403ffab9129","pages",91,"tx_irretutorial_hotels",,,,0,1,"tx_irretutorial_1nff_hotel",6,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"12033446477256d5ae39b7260733e9c2","tx_irretutorial_1nff_hotel",7,"offers",,,,0,1,"tx_irretutorial_1nff_offer",9,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"32350c07befb507bed0b85fd425b209f","tx_irretutorial_1nff_hotel",9,"offers",,,,0,1,"tx_irretutorial_1nff_offer",12,,,,,,
-,"374b21d2b565c62fd61f70c96ae8e442","tx_irretutorial_1nff_offer",10,"prices",,,,1,1,"tx_irretutorial_1nff_price",16,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"5c68c10e57e80b58dd6ba4bf7bcc0450","tt_content",300,"tx_irretutorial_1nff_hotels",,,,0,1,"tx_irretutorial_1nff_hotel",8,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"6e7bb714735f170fc7f4e34040a93f93","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,1,"tx_irretutorial_1nff_hotel",7,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"823042ee688a7e9c4c7bd13b061d008e","tx_irretutorial_1nff_offer",11,"prices",,,,1,1,"tx_irretutorial_1nff_price",19,,,,,,
-,"8241802c77fe733045d90f9645f71e90","tx_irretutorial_1nff_offer",9,"prices",,,,0,1,"tx_irretutorial_1nff_price",14,,,,,,
-,"86b1b7a176e42e978a50efa62e8facb3","tx_irretutorial_1nff_hotel",8,"offers",,,,0,1,"tx_irretutorial_1nff_offer",10,,,,,,
-,"8bf909b565a10884915fc7dee7d5b3a4","tx_irretutorial_1nff_offer",10,"prices",,,,2,1,"tx_irretutorial_1nff_price",17,,,,,,
-,"910d64e88eadabcdd5498d090bfd573a","tx_irretutorial_1nff_hotel",8,"offers",,,,1,1,"tx_irretutorial_1nff_offer",11,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"c9e28b853afa114f191ad1b8dea94ac2","tt_content",300,"tx_irretutorial_1nff_hotels",,,,1,1,"tx_irretutorial_1nff_hotel",9,,,,,,
-,"d63c3b226e2006da0552591bfaee5584","tx_irretutorial_1nff_offer",10,"prices",,,,0,1,"tx_irretutorial_1nff_price",15,,,,,,
-,"db7640f450d6d62a25160fc22b2243c3","tx_irretutorial_1nff_offer",12,"prices",,,,0,1,"tx_irretutorial_1nff_price",20,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
-,"ff00d10d329912955830c95378930f49","tx_irretutorial_1nff_offer",11,"prices",,,,0,1,"tx_irretutorial_1nff_price",18,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
+,"43b0c0c8fb0f94190a722358a8383f20","tx_testirreforeignfield_hotel",7,"offers",,,,0,1,"tx_testirreforeignfield_offer",9,,,,,,
+,"4161a01dfc2d11e3423a851724600a0e","tx_testirreforeignfield_hotel",8,"offers",,,,0,1,"tx_testirreforeignfield_offer",10,,,,,,
+,"f3e2c7af7573433bae92842258ffc5d2","tx_testirreforeignfield_hotel",8,"offers",,,,1,1,"tx_testirreforeignfield_offer",11,,,,,,
+,"efb28a2f7cbe1081b0c5e67e8f15eafb","tx_testirreforeignfield_hotel",9,"offers",,,,0,1,"tx_testirreforeignfield_offer",12,,,,,,
+,"0ee6b3979e14b296d28a23dc9ed72daa","pages",91,"tx_testirreforeignfield_hotels",,,,0,1,"tx_testirreforeignfield_hotel",6,,,,,,
+,"b3df9eac6d6c2ebddd3d3df8203bda92","tx_testirreforeignfield_offer",9,"prices",,,,0,1,"tx_testirreforeignfield_price",14,,,,,,
+,"fc0dcd8ba72847dee96ad49c3e32528b","tx_testirreforeignfield_offer",10,"prices",,,,0,1,"tx_testirreforeignfield_price",15,,,,,,
+,"17eb5363d0abae01948acb185095e9b1","tx_testirreforeignfield_offer",10,"prices",,,,1,1,"tx_testirreforeignfield_price",16,,,,,,
+,"998f8c75cc20e2f89c2d934909ae717a","tx_testirreforeignfield_offer",10,"prices",,,,2,1,"tx_testirreforeignfield_price",17,,,,,,
+,"7c915073657e4f8c108001bba06add0a","tx_testirreforeignfield_offer",11,"prices",,,,0,1,"tx_testirreforeignfield_price",18,,,,,,
+,"1880d440901a96c46862dd5192f98ac5","tx_testirreforeignfield_offer",11,"prices",,,,1,1,"tx_testirreforeignfield_price",19,,,,,,
+,"bcf4e2c0e4499a633ba77bcdfdd1735b","tx_testirreforeignfield_offer",12,"prices",,,,0,1,"tx_testirreforeignfield_price",20,,,,,,
+,"00f612cda942350248f0a184dd669a0d","tt_content",299,"tx_testirreforeignfield_hotels",,,,0,1,"tx_testirreforeignfield_hotel",7,,,,,,
+,"07f48e2922ba495f82e94645935d1f11","tt_content",300,"tx_testirreforeignfield_hotels",,,,0,1,"tx_testirreforeignfield_hotel",8,,,,,,
+,"7b7e0738601919c0d4b8f681fad9418e","tt_content",300,"tx_testirreforeignfield_hotels",,,,1,1,"tx_testirreforeignfield_hotel",9,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyPageWHotelBeforeParentContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyPageWHotelBeforeParentContent.csv
index 4dab237084f0..da70b7ae29ac 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyPageWHotelBeforeParentContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyPageWHotelBeforeParentContent.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -17,78 +17,78 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
 ,299,91,256,0,0,0,1,1,0,0,"Regular Element #2",1,,,,,
 ,300,91,128,0,0,0,1,1,0,0,"Regular Element #1",2,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
 ,6,91,1,0,0,0,1,1,0,0,"Hotel #0",91,"pages",,0,,
-,7,91,2,0,0,0,1,1,0,0,"Hotel #2",300,"tt_content",1nff.hotels,1,,
-,8,91,1,0,0,0,1,1,0,0,"Hotel #1",299,"tt_content",1nff.hotels,1,,
-,9,91,1,0,0,0,1,1,0,0,"Hotel #1",300,"tt_content",1nff.hotels,2,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,7,91,2,0,0,0,1,1,0,0,"Hotel #2",300,"tt_content","1nff.hotels",1,,
+,8,91,1,0,0,0,1,1,0,0,"Hotel #1",299,"tt_content","1nff.hotels",1,,
+,9,91,1,0,0,0,1,1,0,0,"Hotel #1",300,"tt_content","1nff.hotels",2,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-,9,91,513,0,0,0,1,1,0,0,"Offer #2.1",7,"tx_irretutorial_1nff_hotel",,1,,
-,10,91,513,0,0,0,1,1,0,0,"Offer #1.1",8,"tx_irretutorial_1nff_hotel",,1,,
-,11,91,1,0,0,0,1,1,0,0,"Offer #1.1",9,"tx_irretutorial_1nff_hotel",,3,,
-,12,91,2,0,0,0,1,1,0,0,"Offer #1.2",9,"tx_irretutorial_1nff_hotel",,2,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+,9,91,513,0,0,0,1,1,0,0,"Offer #2.1",7,"tx_testirreforeignfield_hotel",,1,,
+,10,91,513,0,0,0,1,1,0,0,"Offer #1.1",8,"tx_testirreforeignfield_hotel",,1,,
+,11,91,1,0,0,0,1,1,0,0,"Offer #1.1",9,"tx_testirreforeignfield_hotel",,3,,
+,12,91,2,0,0,0,1,1,0,0,"Offer #1.2",9,"tx_testirreforeignfield_hotel",,2,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
-,14,91,1025,0,0,0,1,1,0,0,"Price #2.1.1",9,"tx_irretutorial_1nff_offer",,,,
-,15,91,1025,0,0,0,1,1,0,0,"Price #1.1.1",10,"tx_irretutorial_1nff_offer",,,,
-,16,91,513,0,0,0,1,1,0,0,"Price #1.1.1",11,"tx_irretutorial_1nff_offer",,,,
-,17,91,514,0,0,0,1,1,0,0,"Price #1.1.2",11,"tx_irretutorial_1nff_offer",,,,
-,18,91,515,0,0,0,1,1,0,0,"Price #1.1.3",11,"tx_irretutorial_1nff_offer",,,,
-,19,91,1,0,0,0,1,1,0,0,"Price #1.2.1",12,"tx_irretutorial_1nff_offer",,,,
-,20,91,2,0,0,0,1,1,0,0,"Price #1.2.2",12,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
+,14,91,1025,0,0,0,1,1,0,0,"Price #2.1.1",9,"tx_testirreforeignfield_offer",,,,
+,15,91,1025,0,0,0,1,1,0,0,"Price #1.1.1",10,"tx_testirreforeignfield_offer",,,,
+,16,91,513,0,0,0,1,1,0,0,"Price #1.1.1",11,"tx_testirreforeignfield_offer",,,,
+,17,91,514,0,0,0,1,1,0,0,"Price #1.1.2",11,"tx_testirreforeignfield_offer",,,,
+,18,91,515,0,0,0,1,1,0,0,"Price #1.1.3",11,"tx_testirreforeignfield_offer",,,,
+,19,91,1,0,0,0,1,1,0,0,"Price #1.2.1",12,"tx_testirreforeignfield_offer",,,,
+,20,91,2,0,0,0,1,1,0,0,"Price #1.2.2",12,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"054faee34565a031b01d0403ffab9129","pages",91,"tx_irretutorial_hotels",,,,0,1,"tx_irretutorial_1nff_hotel",6,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"12033446477256d5ae39b7260733e9c2","tx_irretutorial_1nff_hotel",7,"offers",,,,0,1,"tx_irretutorial_1nff_offer",9,,,,,,
-,"19316f8165bee1a9a1656053716a4591","tx_irretutorial_1nff_offer",11,"prices",,,,2,1,"tx_irretutorial_1nff_price",18,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"47817aecc940139634b65e0084536bef","tx_irretutorial_1nff_hotel",9,"offers",,,,0,1,"tx_irretutorial_1nff_offer",11,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"5ebdbdc14095942bdee68ca4a214e5b4","tx_irretutorial_1nff_offer",11,"prices",,,,0,1,"tx_irretutorial_1nff_price",16,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"7917ad1021af49c5deb3e8cb9c9eafa4","tx_irretutorial_1nff_offer",12,"prices",,,,1,1,"tx_irretutorial_1nff_price",20,,,,,,
-,"7a6cc3b7a4cf4f285850f3446d1eca4d","tt_content",300,"tx_irretutorial_1nff_hotels",,,,0,1,"tx_irretutorial_1nff_hotel",9,,,,,,
-,"8241802c77fe733045d90f9645f71e90","tx_irretutorial_1nff_offer",9,"prices",,,,0,1,"tx_irretutorial_1nff_price",14,,,,,,
-,"86b1b7a176e42e978a50efa62e8facb3","tx_irretutorial_1nff_hotel",8,"offers",,,,0,1,"tx_irretutorial_1nff_offer",10,,,,,,
-,"a81d5ef8c2d4f22353dd255a3a133edd","tx_irretutorial_1nff_offer",12,"prices",,,,0,1,"tx_irretutorial_1nff_price",19,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b5cf046d38c9a159fb8e61b2f4dc636d","tx_irretutorial_1nff_offer",11,"prices",,,,1,1,"tx_irretutorial_1nff_price",17,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"bc21687ea64515ecbe0731a07e061ea3","tx_irretutorial_1nff_hotel",9,"offers",,,,1,1,"tx_irretutorial_1nff_offer",12,,,,,,
-,"d63c3b226e2006da0552591bfaee5584","tx_irretutorial_1nff_offer",10,"prices",,,,0,1,"tx_irretutorial_1nff_price",15,,,,,,
-,"e7ddc723267891dd4d41055a516fab8c","tt_content",300,"tx_irretutorial_1nff_hotels",,,,1,1,"tx_irretutorial_1nff_hotel",7,,,,,,
-,"e89811f41b6bf21b40669ee49e3775ff","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,1,"tx_irretutorial_1nff_hotel",8,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
+,"43b0c0c8fb0f94190a722358a8383f20","tx_testirreforeignfield_hotel",7,"offers",,,,0,1,"tx_testirreforeignfield_offer",9,,,,,,
+,"4161a01dfc2d11e3423a851724600a0e","tx_testirreforeignfield_hotel",8,"offers",,,,0,1,"tx_testirreforeignfield_offer",10,,,,,,
+,"00adeafc34db11687cc89ddb66a8bfb1","tx_testirreforeignfield_hotel",9,"offers",,,,0,1,"tx_testirreforeignfield_offer",11,,,,,,
+,"857f7538feca1c22de8840e341a8aed1","tx_testirreforeignfield_hotel",9,"offers",,,,1,1,"tx_testirreforeignfield_offer",12,,,,,,
+,"0ee6b3979e14b296d28a23dc9ed72daa","pages",91,"tx_testirreforeignfield_hotels",,,,0,1,"tx_testirreforeignfield_hotel",6,,,,,,
+,"b3df9eac6d6c2ebddd3d3df8203bda92","tx_testirreforeignfield_offer",9,"prices",,,,0,1,"tx_testirreforeignfield_price",14,,,,,,
+,"fc0dcd8ba72847dee96ad49c3e32528b","tx_testirreforeignfield_offer",10,"prices",,,,0,1,"tx_testirreforeignfield_price",15,,,,,,
+,"918a4055a254fb5ba1d39231af0044bc","tx_testirreforeignfield_offer",11,"prices",,,,0,1,"tx_testirreforeignfield_price",16,,,,,,
+,"aa2ac4177c8dbbf3982d838a94787181","tx_testirreforeignfield_offer",11,"prices",,,,1,1,"tx_testirreforeignfield_price",17,,,,,,
+,"7b17c125f54b18b0254f71ab0fddbae6","tx_testirreforeignfield_offer",11,"prices",,,,2,1,"tx_testirreforeignfield_price",18,,,,,,
+,"67fc47b6bf82082228e5d3c3aace0c75","tx_testirreforeignfield_offer",12,"prices",,,,0,1,"tx_testirreforeignfield_price",19,,,,,,
+,"69a7a7590af68b127274b7365640afc6","tx_testirreforeignfield_offer",12,"prices",,,,1,1,"tx_testirreforeignfield_price",20,,,,,,
+,"cc48afda111e80d825eab368d914bcd4","tt_content",299,"tx_testirreforeignfield_hotels",,,,0,1,"tx_testirreforeignfield_hotel",8,,,,,,
+,"cfcd245439425823dc283fe6b9e22363","tt_content",300,"tx_testirreforeignfield_hotels",,,,0,1,"tx_testirreforeignfield_hotel",9,,,,,,
+,"4d1b568b704abc6727e2822f2f025949","tt_content",300,"tx_testirreforeignfield_hotels",,,,1,1,"tx_testirreforeignfield_hotel",7,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyParentContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyParentContent.csv
index b55ba1707563..a2ad91b3f2de 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyParentContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyParentContent.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,53 +16,53 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
 ,299,89,128,0,0,0,1,1,0,0,"Regular Element #2 (copy 1)",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-,6,89,1,0,0,0,1,1,0,0,"Hotel #1",299,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+,6,89,1,0,0,0,1,1,0,0,"Hotel #1",299,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-,9,89,1,0,0,0,1,1,0,0,"Offer #1.1",6,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+,9,89,1,0,0,0,1,1,0,0,"Offer #1.1",6,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
-,14,89,1,0,0,0,1,1,0,0,"Price #1.1.1",9,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
+,14,89,1,0,0,0,1,1,0,0,"Price #1.1.1",9,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"363e6e9c12f3293d38f01286992f7cec","tx_irretutorial_1nff_hotel",6,"offers",,,,0,1,"tx_irretutorial_1nff_offer",9,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"8241802c77fe733045d90f9645f71e90","tx_irretutorial_1nff_offer",9,"prices",,,,0,1,"tx_irretutorial_1nff_price",14,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"cecaae578e249856c5651f542af6c872","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,1,"tx_irretutorial_1nff_hotel",6,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
+,"b3df9eac6d6c2ebddd3d3df8203bda92","tx_testirreforeignfield_offer",9,"prices",,,,0,1,"tx_testirreforeignfield_price",14,,,,,,
+,"c55a8f3d4437551b62ae5584e58a646e","tx_testirreforeignfield_hotel",6,"offers",,,,0,1,"tx_testirreforeignfield_offer",9,,,,,,
+,"f735c7fc6863a29d827ca201f60c8055","tt_content",299,"tx_testirreforeignfield_hotels",,,,0,1,"tx_testirreforeignfield_hotel",6,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyParentContentToDifferentPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyParentContentToDifferentPage.csv
index f2a41298daf4..946c2e4f3819 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyParentContentToDifferentPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyParentContentToDifferentPage.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,53 +16,53 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
 ,299,90,256,0,0,0,1,1,0,0,"Regular Element #2",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-,6,90,1,0,0,0,1,1,0,0,"Hotel #1",299,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+,6,90,1,0,0,0,1,1,0,0,"Hotel #1",299,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-,9,90,1,0,0,0,1,1,0,0,"Offer #1.1",6,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+,9,90,1,0,0,0,1,1,0,0,"Offer #1.1",6,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
-,14,90,1,0,0,0,1,1,0,0,"Price #1.1.1",9,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
+,14,90,1,0,0,0,1,1,0,0,"Price #1.1.1",9,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"363e6e9c12f3293d38f01286992f7cec","tx_irretutorial_1nff_hotel",6,"offers",,,,0,1,"tx_irretutorial_1nff_offer",9,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"8241802c77fe733045d90f9645f71e90","tx_irretutorial_1nff_offer",9,"prices",,,,0,1,"tx_irretutorial_1nff_price",14,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"cecaae578e249856c5651f542af6c872","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,1,"tx_irretutorial_1nff_hotel",6,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
+,"b3df9eac6d6c2ebddd3d3df8203bda92","tx_testirreforeignfield_offer",9,"prices",,,,0,1,"tx_testirreforeignfield_price",14,,,,,,
+,"c55a8f3d4437551b62ae5584e58a646e","tx_testirreforeignfield_hotel",6,"offers",,,,0,1,"tx_testirreforeignfield_offer",9,,,,,,
+,"f735c7fc6863a29d827ca201f60c8055","tt_content",299,"tx_testirreforeignfield_hotels",,,,0,1,"tx_testirreforeignfield_hotel",6,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNCopyParentContentNHotelNOfferChildren.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNCopyParentContentNHotelNOfferChildren.csv
index fa5b06027269..ecd75d494687 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNCopyParentContentNHotelNOfferChildren.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNCopyParentContentNHotelNOfferChildren.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,56 +16,56 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
 ,299,89,128,0,0,0,1,1,0,0,"Testing #1",1,,,,,
 ,300,89,64,0,0,0,1,1,0,0,"Testing #1 (copy 1)",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-,6,89,1,0,0,0,1,1,0,0,"Hotel #1",299,"tt_content",1nff.hotels,1,,
-,7,89,1,0,0,0,1,1,0,0,"Hotel #1",300,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+,6,89,1,0,0,0,1,1,0,0,"Hotel #1",299,"tt_content","1nff.hotels",1,,
+,7,89,1,0,0,0,1,1,0,0,"Hotel #1",300,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-,9,89,1,0,0,0,1,1,0,0,"Offer #1",6,"tx_irretutorial_1nff_hotel",,0,,
-,10,89,1,0,0,0,1,1,0,0,"Offer #1",7,"tx_irretutorial_1nff_hotel",,0,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+,9,89,1,0,0,0,1,1,0,0,"Offer #1",6,"tx_testirreforeignfield_hotel",,0,,
+,10,89,1,0,0,0,1,1,0,0,"Offer #1",7,"tx_testirreforeignfield_hotel",,0,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"01b23f18fe3584b1e2b406cc4f8a627d","tx_irretutorial_1nff_hotel",7,"offers",,,,0,1,"tx_irretutorial_1nff_offer",10,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"363e6e9c12f3293d38f01286992f7cec","tx_irretutorial_1nff_hotel",6,"offers",,,,0,1,"tx_irretutorial_1nff_offer",9,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"9bd5048c24347f5517c03b938f6c3ac9","tt_content",300,"tx_irretutorial_1nff_hotels",,,,0,1,"tx_irretutorial_1nff_hotel",7,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"cecaae578e249856c5651f542af6c872","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,1,"tx_irretutorial_1nff_hotel",6,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
+,"f735c7fc6863a29d827ca201f60c8055","tt_content",299,"tx_testirreforeignfield_hotels",,,,0,1,"tx_testirreforeignfield_hotel",6,,,,,,
+,"c55a8f3d4437551b62ae5584e58a646e","tx_testirreforeignfield_hotel",6,"offers",,,,0,1,"tx_testirreforeignfield_offer",9,,,,,,
+,"4846336301497dd4ce940f042420fc55","tx_testirreforeignfield_hotel",7,"offers",,,,0,1,"tx_testirreforeignfield_offer",10,,,,,,
+,"3e385490e1a1e9c88454ca8ead46b622","tt_content",300,"tx_testirreforeignfield_hotels",,,,0,1,"tx_testirreforeignfield_hotel",7,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
index 9d7180806f61..6089fb48d854 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -17,60 +17,60 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
 ,299,89,128,0,0,0,1,1,0,0,"Testing #1",1,,,,,
 ,300,89,192,0,1,299,1,1,0,0,"[Translate to Dansk:] Testing #1",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,514,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-,6,89,1,0,0,0,1,1,0,0,"Hotel #1",299,"tt_content",1nff.hotels,1,,
-,7,89,1,0,1,6,1,1,0,0,"[Translate to Dansk:] Hotel #1",300,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,514,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+,6,89,1,0,0,0,1,1,0,0,"Hotel #1",299,"tt_content","1nff.hotels",1,,
+,7,89,1,0,1,6,1,1,0,0,"[Translate to Dansk:] Hotel #1",300,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,514,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-,9,89,1,0,0,0,1,1,0,0,"Offer #1",6,"tx_irretutorial_1nff_hotel",,0,,
-,10,89,1,0,1,9,1,1,0,0,"[Translate to Dansk:] Offer #1",7,"tx_irretutorial_1nff_hotel",,0,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,514,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+,9,89,1,0,0,0,1,1,0,0,"Offer #1",6,"tx_testirreforeignfield_hotel",,0,,
+,10,89,1,0,1,9,1,1,0,0,"[Translate to Dansk:] Offer #1",7,"tx_testirreforeignfield_hotel",,0,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"01b23f18fe3584b1e2b406cc4f8a627d","tx_irretutorial_1nff_hotel",7,"offers",,,,0,1,"tx_irretutorial_1nff_offer",10,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1d9069b3e1d717848ec7e6f4265cb13c","tx_irretutorial_1nff_offer",10,"l18n_parent",,,,0,1,"tx_irretutorial_1nff_offer",9,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"363e6e9c12f3293d38f01286992f7cec","tx_irretutorial_1nff_hotel",6,"offers",,,,0,1,"tx_irretutorial_1nff_offer",9,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
 ,"560d1e59437906ce8ecd07cbb8b61650","pages",91,"l10n_parent",,,,0,1,"pages",89,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
+,"f735c7fc6863a29d827ca201f60c8055","tt_content",299,"tx_testirreforeignfield_hotels",,,,0,1,"tx_testirreforeignfield_hotel",6,,,,,,
+,"c55a8f3d4437551b62ae5584e58a646e","tx_testirreforeignfield_hotel",6,"offers",,,,0,1,"tx_testirreforeignfield_offer",9,,,,,,
+,"ed045cdd8d7a2f95e9f85017126bdcca","tx_testirreforeignfield_offer",10,"l18n_parent",,,,0,1,"tx_testirreforeignfield_offer",9,,,,,,
+,"ad24094147b253fea8663560b9f13eab","tx_testirreforeignfield_hotel",7,"l18n_parent",,,,0,1,"tx_testirreforeignfield_hotel",6,,,,,,
+,"4846336301497dd4ce940f042420fc55","tx_testirreforeignfield_hotel",7,"offers",,,,0,1,"tx_testirreforeignfield_offer",10,,,,,,
 ,"7582c96a875797f3e5718474fa53203d","tt_content",300,"l18n_parent",,,,0,1,"tt_content",299,,,,,,
-,"9bd5048c24347f5517c03b938f6c3ac9","tt_content",300,"tx_irretutorial_1nff_hotels",,,,0,1,"tx_irretutorial_1nff_hotel",7,,,,,,
-,"a3f812d1ccd98d01b5bccd3e7d004abe","tx_irretutorial_1nff_hotel",7,"l18n_parent",,,,0,1,"tx_irretutorial_1nff_hotel",6,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"cecaae578e249856c5651f542af6c872","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,1,"tx_irretutorial_1nff_hotel",6,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"3e385490e1a1e9c88454ca8ead46b622","tt_content",300,"tx_testirreforeignfield_hotels",,,,0,1,"tx_testirreforeignfield_hotel",7,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNLocalizeParentContentNHotelNOfferChildrenWOSortBy.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNLocalizeParentContentNHotelNOfferChildrenWOSortBy.csv
index 108f11e1947b..caa65b339ca3 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNLocalizeParentContentNHotelNOfferChildrenWOSortBy.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createNLocalizeParentContentNHotelNOfferChildrenWOSortBy.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -17,60 +17,60 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
 ,299,89,128,0,0,0,1,1,0,0,"Testing #1",1,,,,,
 ,300,89,192,0,1,299,1,1,0,0,"[Translate to Dansk:] Testing #1",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-,6,89,0,0,0,0,1,1,0,0,"Hotel #1",299,"tt_content",1nff.hotels,1,,
-,7,89,0,0,1,6,1,1,0,0,"[Translate to Dansk:] Hotel #1",300,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+,6,89,0,0,0,0,1,1,0,0,"Hotel #1",299,"tt_content","1nff.hotels",1,,
+,7,89,0,0,1,6,1,1,0,0,"[Translate to Dansk:] Hotel #1",300,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,514,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-,9,89,1,0,0,0,1,1,0,0,"Offer #1",6,"tx_irretutorial_1nff_hotel",,0,,
-,10,89,1,0,1,9,1,1,0,0,"[Translate to Dansk:] Offer #1",7,"tx_irretutorial_1nff_hotel",,0,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,514,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+,9,89,1,0,0,0,1,1,0,0,"Offer #1",6,"tx_testirreforeignfield_hotel",,0,,
+,10,89,1,0,1,9,1,1,0,0,"[Translate to Dansk:] Offer #1",7,"tx_testirreforeignfield_hotel",,0,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"01b23f18fe3584b1e2b406cc4f8a627d","tx_irretutorial_1nff_hotel",7,"offers",,,,0,1,"tx_irretutorial_1nff_offer",10,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1d9069b3e1d717848ec7e6f4265cb13c","tx_irretutorial_1nff_offer",10,"l18n_parent",,,,0,1,"tx_irretutorial_1nff_offer",9,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"363e6e9c12f3293d38f01286992f7cec","tx_irretutorial_1nff_hotel",6,"offers",,,,0,1,"tx_irretutorial_1nff_offer",9,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
 ,"560d1e59437906ce8ecd07cbb8b61650","pages",91,"l10n_parent",,,,0,1,"pages",89,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
+,"f735c7fc6863a29d827ca201f60c8055","tt_content",299,"tx_testirreforeignfield_hotels",,,,0,1,"tx_testirreforeignfield_hotel",6,,,,,,
+,"c55a8f3d4437551b62ae5584e58a646e","tx_testirreforeignfield_hotel",6,"offers",,,,0,1,"tx_testirreforeignfield_offer",9,,,,,,
+,"ed045cdd8d7a2f95e9f85017126bdcca","tx_testirreforeignfield_offer",10,"l18n_parent",,,,0,1,"tx_testirreforeignfield_offer",9,,,,,,
+,"ad24094147b253fea8663560b9f13eab","tx_testirreforeignfield_hotel",7,"l18n_parent",,,,0,1,"tx_testirreforeignfield_hotel",6,,,,,,
+,"4846336301497dd4ce940f042420fc55","tx_testirreforeignfield_hotel",7,"offers",,,,0,1,"tx_testirreforeignfield_offer",10,,,,,,
 ,"7582c96a875797f3e5718474fa53203d","tt_content",300,"l18n_parent",,,,0,1,"tt_content",299,,,,,,
-,"9bd5048c24347f5517c03b938f6c3ac9","tt_content",300,"tx_irretutorial_1nff_hotels",,,,0,1,"tx_irretutorial_1nff_hotel",7,,,,,,
-,"a3f812d1ccd98d01b5bccd3e7d004abe","tx_irretutorial_1nff_hotel",7,"l18n_parent",,,,0,1,"tx_irretutorial_1nff_hotel",6,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"cecaae578e249856c5651f542af6c872","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,1,"tx_irretutorial_1nff_hotel",6,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"3e385490e1a1e9c88454ca8ead46b622","tt_content",300,"tx_testirreforeignfield_hotels",,,,0,1,"tx_testirreforeignfield_hotel",7,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createParentContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createParentContent.csv
index f193a35dbfa1..b75ae418ecdc 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createParentContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createParentContent.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,47 +16,47 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
 ,299,89,128,0,0,0,1,1,0,0,"Testing #1",0,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","l18n_diffsource","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",
 ,2,89,1,0,0,0,,0,0,0,0,"Hotel #0",89,"pages",,0,
-,3,89,1,0,0,0,,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,
-,4,89,2,0,0,0,,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,
-,5,89,1,0,0,0,,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,
+,4,89,2,0,0,0,,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,
+,5,89,1,0,0,0,,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","l18n_diffsource","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",
-,5,89,1,0,0,0,,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,
-,6,89,2,0,0,0,,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,
-,7,89,1,0,0,0,,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,
-,8,89,1,0,0,0,,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,
+,6,89,2,0,0,0,,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,
+,7,89,1,0,0,0,,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,
+,8,89,1,0,0,0,,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","l18n_diffsource","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,
-,7,89,1,0,0,0,,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,
-,8,89,2,0,0,0,,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,
-,9,89,3,0,0,0,,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,
-,10,89,1,0,0,0,,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,
-,11,89,2,0,0,0,,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,
-,12,89,1,0,0,0,,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,
-,13,89,1,0,0,0,,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,
+,7,89,1,0,0,0,,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,
+,8,89,2,0,0,0,,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,
+,9,89,3,0,0,0,,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,
+,10,89,1,0,0,0,,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,
+,11,89,2,0,0,0,,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,
+,12,89,1,0,0,0,,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,
+,13,89,1,0,0,0,,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createParentContentNHotelNOfferChildren.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createParentContentNHotelNOfferChildren.csv
index fc3225073f25..4d68aa002d0d 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createParentContentNHotelNOfferChildren.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/createParentContentNHotelNOfferChildren.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,51 +16,51 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
 ,299,89,128,0,0,0,1,1,0,0,"Testing #1",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-,6,89,1,0,0,0,1,1,0,0,"Hotel #1",299,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+,6,89,1,0,0,0,1,1,0,0,"Hotel #1",299,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-,9,89,1,0,0,0,1,1,0,0,"Offer #1",6,"tx_irretutorial_1nff_hotel",,0,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+,9,89,1,0,0,0,1,1,0,0,"Offer #1",6,"tx_testirreforeignfield_hotel",,0,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"363e6e9c12f3293d38f01286992f7cec","tx_irretutorial_1nff_hotel",6,"offers",,,,0,1,"tx_irretutorial_1nff_offer",9,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"cecaae578e249856c5651f542af6c872","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,1,"tx_irretutorial_1nff_hotel",6,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
+,"f735c7fc6863a29d827ca201f60c8055","tt_content",299,"tx_testirreforeignfield_hotels",,,,0,1,"tx_testirreforeignfield_hotel",6,,,,,,
+,"c55a8f3d4437551b62ae5584e58a646e","tx_testirreforeignfield_hotel",6,"offers",,,,0,1,"tx_testirreforeignfield_offer",9,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/deletePage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/deletePage.csv
index ff4e5e4c6035..2781c22b28b3 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/deletePage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/deletePage.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -17,48 +17,48 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
 ,6,89,1,0,0,0,1,2,0,2,"Hotel #0",89,"pages",,0,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"054faee34565a031b01d0403ffab9129","pages",91,"tx_irretutorial_hotels",,,,0,1,"tx_irretutorial_1nff_hotel",6,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
+,"0ee6b3979e14b296d28a23dc9ed72daa","pages",91,"tx_testirreforeignfield_hotels",,,,0,1,"tx_testirreforeignfield_hotel",6,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/deleteParentContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/deleteParentContent.csv
index 2ed0fb9cf1c6..1aca6b597cb2 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/deleteParentContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/deleteParentContent.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,53 +16,53 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
 ,299,89,512,0,0,0,1,2,0,298,"Regular Element #2",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-,6,89,1,0,0,0,1,2,0,5,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+,6,89,1,0,0,0,1,2,0,5,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-,9,89,1,0,0,0,1,2,0,8,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+,9,89,1,0,0,0,1,2,0,8,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
-,14,89,1,0,0,0,1,2,0,13,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
+,14,89,1,0,0,0,1,2,0,13,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"363e6e9c12f3293d38f01286992f7cec","tx_irretutorial_1nff_hotel",6,"offers",,,,0,1,"tx_irretutorial_1nff_offer",9,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"8241802c77fe733045d90f9645f71e90","tx_irretutorial_1nff_offer",9,"prices",,,,0,1,"tx_irretutorial_1nff_price",14,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"cecaae578e249856c5651f542af6c872","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,1,"tx_irretutorial_1nff_hotel",6,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
+,"b3df9eac6d6c2ebddd3d3df8203bda92","tx_testirreforeignfield_offer",9,"prices",,,,0,1,"tx_testirreforeignfield_price",14,,,,,,
+,"c55a8f3d4437551b62ae5584e58a646e","tx_testirreforeignfield_hotel",6,"offers",,,,0,1,"tx_testirreforeignfield_offer",9,,,,,,
+,"f735c7fc6863a29d827ca201f60c8055","tt_content",299,"tx_testirreforeignfield_hotels",,,,0,1,"tx_testirreforeignfield_hotel",6,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/inlineLocalizeSynchronizeLocalizeMissing.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/inlineLocalizeSynchronizeLocalizeMissing.csv
index 304f72fae7e9..e2de3a3e14fd 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/inlineLocalizeSynchronizeLocalizeMissing.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/inlineLocalizeSynchronizeLocalizeMissing.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","l10n_source","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,
+,"uid","pid","sorting","deleted","sys_language_uid","l10n_parent","l10n_source","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,
 ,1,0,256,0,0,0,0,0,0,0,0,0,"FunctionalTest",0,,
 ,88,1,256,0,0,0,0,0,0,0,0,0,"DataHandlerTest",0,,
 ,89,88,256,0,0,0,0,0,0,0,0,0,"Relations",1,,
@@ -10,82 +10,82 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",2,,,
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",1,,,
 ,299,89,384,0,1,297,297,1,1,0,0,"[Translate to Dansk:] Regular Element #1",2,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers"
 ,2,89,1,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
-,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2
-,4,89,1026,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1
-,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1
-,7,89,1,0,1,4,4,1,1,0,0,"[Translate to Dansk:] Hotel #2",299,"tt_content",1nff.hotels,1
-,8,89,2,0,1,3,3,1,1,0,0,"[Translate to Dansk:] Hotel #1",299,"tt_content",1nff.hotels,2
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2
+,4,89,1026,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1
+,5,89,1,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1
+,7,89,1,0,1,4,4,1,1,0,0,"[Translate to Dansk:] Hotel #2",299,"tt_content","1nff.hotels",1
+,8,89,2,0,1,3,3,1,1,0,0,"[Translate to Dansk:] Hotel #1",299,"tt_content","1nff.hotels",2
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices"
-,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3
-,6,89,1538,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2
-,7,89,1,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1
-,8,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1
-,11,89,1,0,1,7,7,1,1,0,0,"[Translate to Dansk:] Offer #2.1",7,"tx_irretutorial_1nff_hotel",,1
-,12,89,1,0,1,5,5,1,1,0,0,"[Translate to Dansk:] Offer #1.1",8,"tx_irretutorial_1nff_hotel",,3
-,13,89,2,0,1,6,6,1,1,0,0,"[Translate to Dansk:] Offer #1.2",8,"tx_irretutorial_1nff_hotel",,2
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3
+,6,89,1538,0,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2
+,7,89,1,0,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1
+,8,89,1,0,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1
+,11,89,1,0,1,7,7,1,1,0,0,"[Translate to Dansk:] Offer #2.1",7,"tx_testirreforeignfield_hotel",,1
+,12,89,1,0,1,5,5,1,1,0,0,"[Translate to Dansk:] Offer #1.1",8,"tx_testirreforeignfield_hotel",,3
+,13,89,2,0,1,6,6,1,1,0,0,"[Translate to Dansk:] Offer #1.2",8,"tx_testirreforeignfield_hotel",,2
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",
-,7,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,
-,8,89,2562,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,
-,9,89,4611,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,
-,10,89,1,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,
-,11,89,2562,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,
-,12,89,1,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
-,13,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
-,19,89,1,0,1,12,12,1,1,0,0,"[Translate to Dansk:] Price #2.1.1",11,"tx_irretutorial_1nff_offer",,
-,20,89,1,0,1,7,7,1,1,0,0,"[Translate to Dansk:] Price #1.1.1",12,"tx_irretutorial_1nff_offer",,
-,21,89,514,0,1,8,8,1,1,0,0,"[Translate to Dansk:] Price #1.1.2",12,"tx_irretutorial_1nff_offer",,
-,22,89,515,0,1,9,9,1,1,0,0,"[Translate to Dansk:] Price #1.1.3",12,"tx_irretutorial_1nff_offer",,
-,23,89,1,0,1,10,10,1,1,0,0,"[Translate to Dansk:] Price #1.2.1",13,"tx_irretutorial_1nff_offer",,
-,24,89,2,0,1,11,11,1,1,0,0,"[Translate to Dansk:] Price #1.2.2",13,"tx_irretutorial_1nff_offer",,
+,7,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,
+,8,89,2562,0,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,
+,9,89,4611,0,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,
+,10,89,1,0,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,
+,11,89,2562,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,
+,12,89,1,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,
+,13,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,
+,19,89,1,0,1,12,12,1,1,0,0,"[Translate to Dansk:] Price #2.1.1",11,"tx_testirreforeignfield_offer",,
+,20,89,1,0,1,7,7,1,1,0,0,"[Translate to Dansk:] Price #1.1.1",12,"tx_testirreforeignfield_offer",,
+,21,89,514,0,1,8,8,1,1,0,0,"[Translate to Dansk:] Price #1.1.2",12,"tx_testirreforeignfield_offer",,
+,22,89,515,0,1,9,9,1,1,0,0,"[Translate to Dansk:] Price #1.1.3",12,"tx_testirreforeignfield_offer",,
+,23,89,1,0,1,10,10,1,1,0,0,"[Translate to Dansk:] Price #1.2.1",13,"tx_testirreforeignfield_offer",,
+,24,89,2,0,1,11,11,1,1,0,0,"[Translate to Dansk:] Price #1.2.2",13,"tx_testirreforeignfield_offer",,
 "sys_refindex",,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,
 ,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,
 ,"560d1e59437906ce8ecd07cbb8b61650","pages",91,"l10n_parent",,,,0,1,"pages",89,,,,,
-,"4ff402214a4fb2611a1d19641004528e","tx_irretutorial_1nff_price",19,"l18n_parent",,,,0,1,"tx_irretutorial_1nff_price",12,,,,,
-,"2c93883c31ebbabf2a9ef94a4f92bead","tx_irretutorial_1nff_offer",11,"l18n_parent",,,,0,1,"tx_irretutorial_1nff_offer",7,,,,,
-,"afcae32edf12d45a8357ca90cbb92548","tx_irretutorial_1nff_offer",11,"prices",,,,0,1,"tx_irretutorial_1nff_price",19,,,,,
-,"ac2d5485ba7acc3ebb64e981b8298eab","tx_irretutorial_1nff_hotel",7,"l18n_parent",,,,0,1,"tx_irretutorial_1nff_hotel",4,,,,,
-,"2b3ec50aa698b6d70ace8e3772263387","tx_irretutorial_1nff_hotel",7,"offers",,,,0,1,"tx_irretutorial_1nff_offer",11,,,,,
+,"05587ec5abb51f8796a79694ec16b75f","tx_testirreforeignfield_price",19,"l18n_parent",,,,0,1,"tx_testirreforeignfield_price",12,,,,,
+,"70ccff17d3336cdebdaee32f461c2c1f","tx_testirreforeignfield_offer",11,"l18n_parent",,,,0,1,"tx_testirreforeignfield_offer",7,,,,,
+,"ff4a495b29082752c4759a689b5fd3a0","tx_testirreforeignfield_offer",11,"prices",,,,0,1,"tx_testirreforeignfield_price",19,,,,,
+,"f2a2ead8c0f56e5ddfe87aa89f397c15","tx_testirreforeignfield_hotel",7,"l18n_parent",,,,0,1,"tx_testirreforeignfield_hotel",4,,,,,
+,"3eba86662c983d80b7f24d75debb7316","tx_testirreforeignfield_hotel",7,"offers",,,,0,1,"tx_testirreforeignfield_offer",11,,,,,
 ,"c0637754d82530636864b3af11866293","tt_content",299,"l18n_parent",,,,0,1,"tt_content",297,,,,,
-,"541c85012150ce8e02596922ee023be4","tx_irretutorial_1nff_price",20,"l18n_parent",,,,0,1,"tx_irretutorial_1nff_price",7,,,,,
-,"cff5ec4af7918466497185178ae35665","tx_irretutorial_1nff_price",21,"l18n_parent",,,,0,1,"tx_irretutorial_1nff_price",8,,,,,
-,"d1c51ca3710e6b5251991752af722556","tx_irretutorial_1nff_price",22,"l18n_parent",,,,0,1,"tx_irretutorial_1nff_price",9,,,,,
-,"fafee0dd60fc9903b3e71194dd09b0a4","tx_irretutorial_1nff_price",23,"l18n_parent",,,,0,1,"tx_irretutorial_1nff_price",10,,,,,
-,"cb893dc6cab49ab31e690b569b74e242","tx_irretutorial_1nff_price",24,"l18n_parent",,,,0,1,"tx_irretutorial_1nff_price",11,,,,,
-,"973ab2483bc93faef0643ed5c10ee632","tx_irretutorial_1nff_offer",12,"l18n_parent",,,,0,1,"tx_irretutorial_1nff_offer",5,,,,,
-,"db7640f450d6d62a25160fc22b2243c3","tx_irretutorial_1nff_offer",12,"prices",,,,0,1,"tx_irretutorial_1nff_price",20,,,,,
-,"05ddc3110cdca100cb758f8264902728","tx_irretutorial_1nff_offer",12,"prices",,,,1,1,"tx_irretutorial_1nff_price",21,,,,,
-,"faf02d7a3abfe657a57f6e9d77324d80","tx_irretutorial_1nff_offer",12,"prices",,,,2,1,"tx_irretutorial_1nff_price",22,,,,,
-,"925734cef5343e42062d0cf8f4772b3f","tx_irretutorial_1nff_offer",13,"l18n_parent",,,,0,1,"tx_irretutorial_1nff_offer",6,,,,,
-,"3807cd23dbaf3ed5843ced2248f72365","tx_irretutorial_1nff_offer",13,"prices",,,,0,1,"tx_irretutorial_1nff_price",23,,,,,
-,"d5898074b967543f9bfef8b7d7386c52","tx_irretutorial_1nff_offer",13,"prices",,,,1,1,"tx_irretutorial_1nff_price",24,,,,,
-,"99c7988615ed98fe7aaf06c3b4e5ef69","tx_irretutorial_1nff_hotel",8,"l18n_parent",,,,0,1,"tx_irretutorial_1nff_hotel",3,,,,,
-,"e11925b7a26077e8208f39a43b007b16","tx_irretutorial_1nff_hotel",8,"offers",,,,0,1,"tx_irretutorial_1nff_offer",12,,,,,
-,"adf4f4d63276bc995676cfc16510054e","tx_irretutorial_1nff_hotel",8,"offers",,,,1,1,"tx_irretutorial_1nff_offer",13,,,,,
-,"6e7bb714735f170fc7f4e34040a93f93","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,1,"tx_irretutorial_1nff_hotel",7,,,,,
-,"b40925fec4fd236b87546a57788513ef","tt_content",299,"tx_irretutorial_1nff_hotels",,,,1,1,"tx_irretutorial_1nff_hotel",8,,,,,
+,"e6a02c5918135c9bf746f4cdd1761011","tx_testirreforeignfield_price",20,"l18n_parent",,,,0,1,"tx_testirreforeignfield_price",7,,,,,
+,"96d7e5cd69e20ee1d123022c3e1f4563","tx_testirreforeignfield_price",21,"l18n_parent",,,,0,1,"tx_testirreforeignfield_price",8,,,,,
+,"cc8537e5f583ee5d1c7b00843cc6db98","tx_testirreforeignfield_price",22,"l18n_parent",,,,0,1,"tx_testirreforeignfield_price",9,,,,,
+,"ca322abc2ba855a82d68a45a15daa907","tx_testirreforeignfield_price",23,"l18n_parent",,,,0,1,"tx_testirreforeignfield_price",10,,,,,
+,"21773aeec72c602029121e1cf3316147","tx_testirreforeignfield_price",24,"l18n_parent",,,,0,1,"tx_testirreforeignfield_price",11,,,,,
+,"10bef080fe7031757ac2f3b5cfdf938e","tx_testirreforeignfield_offer",12,"l18n_parent",,,,0,1,"tx_testirreforeignfield_offer",5,,,,,
+,"bcf4e2c0e4499a633ba77bcdfdd1735b","tx_testirreforeignfield_offer",12,"prices",,,,0,1,"tx_testirreforeignfield_price",20,,,,,
+,"83a3d082887b94189d5e58f6e8990f69","tx_testirreforeignfield_offer",12,"prices",,,,1,1,"tx_testirreforeignfield_price",21,,,,,
+,"2f67e38290d0b4ded4ce11ce665cda1f","tx_testirreforeignfield_offer",12,"prices",,,,2,1,"tx_testirreforeignfield_price",22,,,,,
+,"5fc677496d26514e70b63aefe0380160","tx_testirreforeignfield_offer",13,"l18n_parent",,,,0,1,"tx_testirreforeignfield_offer",6,,,,,
+,"e0c600c7f4a375be3c3a3867e1cb594d","tx_testirreforeignfield_offer",13,"prices",,,,0,1,"tx_testirreforeignfield_price",23,,,,,
+,"7c74720c2083cdc0620b9bb71f4b0692","tx_testirreforeignfield_offer",13,"prices",,,,1,1,"tx_testirreforeignfield_price",24,,,,,
+,"4a6ce187e8de879bb445d6a90dac9f39","tx_testirreforeignfield_hotel",8,"l18n_parent",,,,0,1,"tx_testirreforeignfield_hotel",3,,,,,
+,"dfefdbe882ec8599debbe322258dc743","tx_testirreforeignfield_hotel",8,"offers",,,,0,1,"tx_testirreforeignfield_offer",12,,,,,
+,"8b6b46c001348f035b4828bc92423f6f","tx_testirreforeignfield_hotel",8,"offers",,,,1,1,"tx_testirreforeignfield_offer",13,,,,,
+,"00f612cda942350248f0a184dd669a0d","tt_content",299,"tx_testirreforeignfield_hotels",,,,0,1,"tx_testirreforeignfield_hotel",7,,,,,
+,"fbf098fd83643529440d409d56c13954","tt_content",299,"tx_testirreforeignfield_hotels",,,,1,1,"tx_testirreforeignfield_hotel",8,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeParentContentWAllChildren.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeParentContentWAllChildren.csv
index 8b2cb2cb8c0d..0913811b308a 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeParentContentWAllChildren.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeParentContentWAllChildren.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -17,58 +17,58 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
 ,299,89,768,0,1,298,1,1,0,0,"[Translate to Dansk:] Regular Element #2",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,514,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-,6,89,1,0,1,5,1,1,0,0,"[Translate to Dansk:] Hotel #1",299,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,514,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+,6,89,1,0,1,5,1,1,0,0,"[Translate to Dansk:] Hotel #1",299,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,514,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-,9,89,1,0,1,8,1,1,0,0,"[Translate to Dansk:] Offer #1.1",6,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,514,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+,9,89,1,0,1,8,1,1,0,0,"[Translate to Dansk:] Offer #1.1",6,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,514,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,515,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,514,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
-,14,89,1,0,1,13,1,1,0,0,"[Translate to Dansk:] Price #1.1.1",9,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,514,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,515,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,514,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
+,14,89,1,0,1,13,1,1,0,0,"[Translate to Dansk:] Price #1.1.1",9,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"363e6e9c12f3293d38f01286992f7cec","tx_irretutorial_1nff_hotel",6,"offers",,,,0,1,"tx_irretutorial_1nff_offer",9,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
 ,"560d1e59437906ce8ecd07cbb8b61650","pages",91,"l10n_parent",,,,0,1,"pages",89,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"6e383727a415ed98cb8ae97c4b5e79c9","tx_irretutorial_1nff_price",14,"l18n_parent",,,,0,1,"tx_irretutorial_1nff_price",13,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"8241802c77fe733045d90f9645f71e90","tx_irretutorial_1nff_offer",9,"prices",,,,0,1,"tx_irretutorial_1nff_price",14,,,,,,
-,"a68265bc2cb22cc9b657b472edfecdcf","tx_irretutorial_1nff_hotel",6,"l18n_parent",,,,0,1,"tx_irretutorial_1nff_hotel",5,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"cecaae578e249856c5651f542af6c872","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,1,"tx_irretutorial_1nff_hotel",6,,,,,,
+,"e76eaa1f30b1caf0ebfe307dbab3b8c8","tx_testirreforeignfield_price",14,"l18n_parent",,,,0,1,"tx_testirreforeignfield_price",13,,,,,,
+,"14639c3134821f8f62c15a7ae9be0604","tx_testirreforeignfield_offer",9,"l18n_parent",,,,0,1,"tx_testirreforeignfield_offer",8,,,,,,
+,"b3df9eac6d6c2ebddd3d3df8203bda92","tx_testirreforeignfield_offer",9,"prices",,,,0,1,"tx_testirreforeignfield_price",14,,,,,,
+,"32a99fcf4a3791866986e1b952d5817f","tx_testirreforeignfield_hotel",6,"l18n_parent",,,,0,1,"tx_testirreforeignfield_hotel",5,,,,,,
+,"c55a8f3d4437551b62ae5584e58a646e","tx_testirreforeignfield_hotel",6,"offers",,,,0,1,"tx_testirreforeignfield_offer",9,,,,,,
 ,"e4afda9b67d6ad42e03f5c797250235d","tt_content",299,"l18n_parent",,,,0,1,"tt_content",298,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
-,"ffe9a8f88937c514d978845069a00389","tx_irretutorial_1nff_offer",9,"l18n_parent",,,,0,1,"tx_irretutorial_1nff_offer",8,,,,,,
+,"f735c7fc6863a29d827ca201f60c8055","tt_content",299,"tx_testirreforeignfield_hotels",,,,0,1,"tx_testirreforeignfield_hotel",6,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyNDiscardNModifyParentWHotelChild.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyNDiscardNModifyParentWHotelChild.csv
index 48f290a5e5df..da151bb46c8b 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyNDiscardNModifyParentWHotelChild.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyNDiscardNModifyParentWHotelChild.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,69 +16,69 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
 ,300,89,256,0,0,0,1,0,0,297,"Testing #2",2,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-,8,89,1,0,0,0,1,0,0,3,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,9,89,2,0,0,0,1,0,0,4,"Testing #2",297,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+,8,89,1,0,0,0,1,0,0,3,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,9,89,2,0,0,0,1,0,0,4,"Testing #2",297,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-,12,89,1,0,0,0,1,0,0,5,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,13,89,2,0,0,0,1,0,0,6,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,14,89,1,0,0,0,1,0,0,7,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+,12,89,1,0,0,0,1,0,0,5,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,13,89,2,0,0,0,1,0,0,6,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,14,89,1,0,0,0,1,0,0,7,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
-,20,89,1,0,0,0,1,0,0,7,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,21,89,2,0,0,0,1,0,0,8,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,22,89,3,0,0,0,1,0,0,9,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,23,89,1,0,0,0,1,0,0,10,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,24,89,2,0,0,0,1,0,0,11,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,25,89,1,0,0,0,1,0,0,12,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
+,20,89,1,0,0,0,1,0,0,7,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,21,89,2,0,0,0,1,0,0,8,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,22,89,3,0,0,0,1,0,0,9,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,23,89,1,0,0,0,1,0,0,10,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,24,89,2,0,0,0,1,0,0,11,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,25,89,1,0,0,0,1,0,0,12,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"05ddc3110cdca100cb758f8264902728","tx_irretutorial_1nff_offer",12,"prices",,,,1,1,"tx_irretutorial_1nff_price",21,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"3807cd23dbaf3ed5843ced2248f72365","tx_irretutorial_1nff_offer",13,"prices",,,,0,1,"tx_irretutorial_1nff_price",23,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"55537a2dcf9020c6fd28c726fbf627df","tx_irretutorial_1nff_offer",14,"prices",,,,0,1,"tx_irretutorial_1nff_price",25,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"5c68c10e57e80b58dd6ba4bf7bcc0450","tt_content",300,"tx_irretutorial_1nff_hotels",,,,0,1,"tx_irretutorial_1nff_hotel",8,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"83e3b9be75b59c551b085366d600b2d7","tx_irretutorial_1nff_hotel",9,"offers",,,,0,1,"tx_irretutorial_1nff_offer",14,,,,,,
-,"adf4f4d63276bc995676cfc16510054e","tx_irretutorial_1nff_hotel",8,"offers",,,,1,1,"tx_irretutorial_1nff_offer",13,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"c9e28b853afa114f191ad1b8dea94ac2","tt_content",300,"tx_irretutorial_1nff_hotels",,,,1,1,"tx_irretutorial_1nff_hotel",9,,,,,,
-,"d5898074b967543f9bfef8b7d7386c52","tx_irretutorial_1nff_offer",13,"prices",,,,1,1,"tx_irretutorial_1nff_price",24,,,,,,
-,"db7640f450d6d62a25160fc22b2243c3","tx_irretutorial_1nff_offer",12,"prices",,,,0,1,"tx_irretutorial_1nff_price",20,,,,,,
-,"e11925b7a26077e8208f39a43b007b16","tx_irretutorial_1nff_hotel",8,"offers",,,,0,1,"tx_irretutorial_1nff_offer",12,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
-,"faf02d7a3abfe657a57f6e9d77324d80","tx_irretutorial_1nff_offer",12,"prices",,,,2,1,"tx_irretutorial_1nff_price",22,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
+,"bcf4e2c0e4499a633ba77bcdfdd1735b","tx_testirreforeignfield_offer",12,"prices",,,,0,1,"tx_testirreforeignfield_price",20,,,,,,
+,"83a3d082887b94189d5e58f6e8990f69","tx_testirreforeignfield_offer",12,"prices",,,,1,1,"tx_testirreforeignfield_price",21,,,,,,
+,"2f67e38290d0b4ded4ce11ce665cda1f","tx_testirreforeignfield_offer",12,"prices",,,,2,1,"tx_testirreforeignfield_price",22,,,,,,
+,"e0c600c7f4a375be3c3a3867e1cb594d","tx_testirreforeignfield_offer",13,"prices",,,,0,1,"tx_testirreforeignfield_price",23,,,,,,
+,"7c74720c2083cdc0620b9bb71f4b0692","tx_testirreforeignfield_offer",13,"prices",,,,1,1,"tx_testirreforeignfield_price",24,,,,,,
+,"8a7339f8d156dd81152b9c7a5fd7a633","tx_testirreforeignfield_offer",14,"prices",,,,0,1,"tx_testirreforeignfield_price",25,,,,,,
+,"dfefdbe882ec8599debbe322258dc743","tx_testirreforeignfield_hotel",8,"offers",,,,0,1,"tx_testirreforeignfield_offer",12,,,,,,
+,"8b6b46c001348f035b4828bc92423f6f","tx_testirreforeignfield_hotel",8,"offers",,,,1,1,"tx_testirreforeignfield_offer",13,,,,,,
+,"acfcb1017253e820845c77e953363a0f","tx_testirreforeignfield_hotel",9,"offers",,,,0,1,"tx_testirreforeignfield_offer",14,,,,,,
+,"07f48e2922ba495f82e94645935d1f11","tt_content",300,"tx_testirreforeignfield_hotels",,,,0,1,"tx_testirreforeignfield_hotel",8,,,,,,
+,"7b7e0738601919c0d4b8f681fad9418e","tt_content",300,"tx_testirreforeignfield_hotels",,,,1,1,"tx_testirreforeignfield_hotel",9,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyOnlyHotelChild.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyOnlyHotelChild.csv
index cc8432235d1f..5209bc4e0cf2 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyOnlyHotelChild.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyOnlyHotelChild.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,51 +16,51 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-,6,89,2,0,0,0,1,0,0,4,"Testing #1",297,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+,6,89,2,0,0,0,1,0,0,4,"Testing #1",297,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-,9,89,1,0,0,0,1,0,0,7,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+,9,89,1,0,0,0,1,0,0,7,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
-,14,89,1,0,0,0,1,0,0,12,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
+,14,89,1,0,0,0,1,0,0,12,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"363e6e9c12f3293d38f01286992f7cec","tx_irretutorial_1nff_hotel",6,"offers",,,,0,1,"tx_irretutorial_1nff_offer",9,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"8241802c77fe733045d90f9645f71e90","tx_irretutorial_1nff_offer",9,"prices",,,,0,1,"tx_irretutorial_1nff_price",14,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
+,"b3df9eac6d6c2ebddd3d3df8203bda92","tx_testirreforeignfield_offer",9,"prices",,,,0,1,"tx_testirreforeignfield_price",14,,,,,,
+,"c55a8f3d4437551b62ae5584e58a646e","tx_testirreforeignfield_hotel",6,"offers",,,,0,1,"tx_testirreforeignfield_offer",9,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyPage.csv
index 3534d4d7d251..cc82c18082b9 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyPage.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -17,48 +17,48 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
 ,6,89,1,0,0,0,1,0,0,2,"Hotel #0",89,"pages",,0,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"054faee34565a031b01d0403ffab9129","pages",91,"tx_irretutorial_hotels",,,,0,1,"tx_irretutorial_1nff_hotel",6,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
+,"0ee6b3979e14b296d28a23dc9ed72daa","pages",91,"tx_testirreforeignfield_hotels",,,,0,1,"tx_testirreforeignfield_hotel",6,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentContent.csv
index 8888b9e2b94e..652185650c95 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentContent.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,53 +16,53 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
 ,299,89,512,0,0,0,1,0,0,298,"Testing #1",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-,6,89,1,0,0,0,1,0,0,5,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+,6,89,1,0,0,0,1,0,0,5,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-,9,89,1,0,0,0,1,0,0,8,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+,9,89,1,0,0,0,1,0,0,8,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
-,14,89,1,0,0,0,1,0,0,13,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
+,14,89,1,0,0,0,1,0,0,13,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"363e6e9c12f3293d38f01286992f7cec","tx_irretutorial_1nff_hotel",6,"offers",,,,0,1,"tx_irretutorial_1nff_offer",9,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"8241802c77fe733045d90f9645f71e90","tx_irretutorial_1nff_offer",9,"prices",,,,0,1,"tx_irretutorial_1nff_price",14,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"cecaae578e249856c5651f542af6c872","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,1,"tx_irretutorial_1nff_hotel",6,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
+,"b3df9eac6d6c2ebddd3d3df8203bda92","tx_testirreforeignfield_offer",9,"prices",,,,0,1,"tx_testirreforeignfield_price",14,,,,,,
+,"c55a8f3d4437551b62ae5584e58a646e","tx_testirreforeignfield_hotel",6,"offers",,,,0,1,"tx_testirreforeignfield_offer",9,,,,,,
+,"f735c7fc6863a29d827ca201f60c8055","tt_content",299,"tx_testirreforeignfield_hotels",,,,0,1,"tx_testirreforeignfield_hotel",6,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNAddHotelChild.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNAddHotelChild.csv
index 9b69744ecd28..8cf6f6d9d722 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNAddHotelChild.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNAddHotelChild.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,55 +16,55 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
 ,299,89,512,0,0,0,1,0,0,298,"Regular Element #2",2,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-,6,89,1,0,0,0,1,0,0,5,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-,7,89,2,0,0,0,1,1,0,0,"Hotel #2",298,"tt_content",1nff.hotels,0,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+,6,89,1,0,0,0,1,0,0,5,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+,7,89,2,0,0,0,1,1,0,0,"Hotel #2",298,"tt_content","1nff.hotels",0,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-,9,89,1,0,0,0,1,0,0,8,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+,9,89,1,0,0,0,1,0,0,8,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
-,14,89,1,0,0,0,1,0,0,13,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
+,14,89,1,0,0,0,1,0,0,13,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"363e6e9c12f3293d38f01286992f7cec","tx_irretutorial_1nff_hotel",6,"offers",,,,0,1,"tx_irretutorial_1nff_offer",9,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"6e88a10780f54735e223fcd3110d1248","tt_content",299,"tx_irretutorial_1nff_hotels",,,,1,1,"tx_irretutorial_1nff_hotel",7,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"8241802c77fe733045d90f9645f71e90","tx_irretutorial_1nff_offer",9,"prices",,,,0,1,"tx_irretutorial_1nff_price",14,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"cecaae578e249856c5651f542af6c872","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,1,"tx_irretutorial_1nff_hotel",6,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
+,"b3df9eac6d6c2ebddd3d3df8203bda92","tx_testirreforeignfield_offer",9,"prices",,,,0,1,"tx_testirreforeignfield_price",14,,,,,,
+,"c55a8f3d4437551b62ae5584e58a646e","tx_testirreforeignfield_hotel",6,"offers",,,,0,1,"tx_testirreforeignfield_offer",9,,,,,,
+,"f735c7fc6863a29d827ca201f60c8055","tt_content",299,"tx_testirreforeignfield_hotels",,,,0,1,"tx_testirreforeignfield_hotel",6,,,,,,
+,"f2c79ecd14664f7df03cf217762039cc","tt_content",299,"tx_testirreforeignfield_hotels",,,,1,1,"tx_testirreforeignfield_hotel",7,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNChangeHotelChildrenSorting.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNChangeHotelChildrenSorting.csv
index 0ff2cbab0fbf..8a9d0a1d8f50 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNChangeHotelChildrenSorting.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNChangeHotelChildrenSorting.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,69 +16,69 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
 ,299,89,256,0,0,0,1,0,0,297,"Regular Element #1",2,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-,6,89,2,0,0,0,1,0,0,3,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,7,89,1,0,0,0,1,0,0,4,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+,6,89,2,0,0,0,1,0,0,3,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,7,89,1,0,0,0,1,0,0,4,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-,9,89,1,0,0,0,1,0,0,5,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,10,89,2,0,0,0,1,0,0,6,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,11,89,1,0,0,0,1,0,0,7,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+,9,89,1,0,0,0,1,0,0,5,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,10,89,2,0,0,0,1,0,0,6,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,11,89,1,0,0,0,1,0,0,7,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
-,14,89,1,0,0,0,1,0,0,7,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,15,89,2,0,0,0,1,0,0,8,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,16,89,3,0,0,0,1,0,0,9,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,17,89,1,0,0,0,1,0,0,10,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,18,89,2,0,0,0,1,0,0,11,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,19,89,1,0,0,0,1,0,0,12,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
+,14,89,1,0,0,0,1,0,0,7,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,15,89,2,0,0,0,1,0,0,8,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,16,89,3,0,0,0,1,0,0,9,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,17,89,1,0,0,0,1,0,0,10,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,18,89,2,0,0,0,1,0,0,11,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,19,89,1,0,0,0,1,0,0,12,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"15b4763f9e142d9bc3ffc29c8e1b9874","tx_irretutorial_1nff_offer",9,"prices",,,,1,1,"tx_irretutorial_1nff_price",15,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"2b3ec50aa698b6d70ace8e3772263387","tx_irretutorial_1nff_hotel",7,"offers",,,,0,1,"tx_irretutorial_1nff_offer",11,,,,,,
-,"363e6e9c12f3293d38f01286992f7cec","tx_irretutorial_1nff_hotel",6,"offers",,,,0,1,"tx_irretutorial_1nff_offer",9,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"49e1dbed3a73511411ef4d2b5d0a1c7b","tx_irretutorial_1nff_offer",10,"prices",,,,0,1,"tx_irretutorial_1nff_price",17,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"6e7bb714735f170fc7f4e34040a93f93","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,1,"tx_irretutorial_1nff_hotel",7,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"799d002fd079ca160e6db0d6d3c2273f","tx_irretutorial_1nff_offer",10,"prices",,,,1,1,"tx_irretutorial_1nff_price",18,,,,,,
-,"8241802c77fe733045d90f9645f71e90","tx_irretutorial_1nff_offer",9,"prices",,,,0,1,"tx_irretutorial_1nff_price",14,,,,,,
-,"9afafe2a4ee98c5dcebf736ec24dbc5f","tt_content",299,"tx_irretutorial_1nff_hotels",,,,1,1,"tx_irretutorial_1nff_hotel",6,,,,,,
-,"afcae32edf12d45a8357ca90cbb92548","tx_irretutorial_1nff_offer",11,"prices",,,,0,1,"tx_irretutorial_1nff_price",19,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"e2dcc00c7a033a6b8d61ea91540c2342","tx_irretutorial_1nff_hotel",6,"offers",,,,1,1,"tx_irretutorial_1nff_offer",10,,,,,,
-,"ee63e2149d0d656c2a8704f51a16a67a","tx_irretutorial_1nff_offer",9,"prices",,,,2,1,"tx_irretutorial_1nff_price",16,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
+,"b3df9eac6d6c2ebddd3d3df8203bda92","tx_testirreforeignfield_offer",9,"prices",,,,0,1,"tx_testirreforeignfield_price",14,,,,,,
+,"b488190412ad71c1067619282306600a","tx_testirreforeignfield_offer",9,"prices",,,,1,1,"tx_testirreforeignfield_price",15,,,,,,
+,"15067fb440a562d18b2c00ae82a701f3","tx_testirreforeignfield_offer",9,"prices",,,,2,1,"tx_testirreforeignfield_price",16,,,,,,
+,"9cf838775310d90125a953c5e25ab815","tx_testirreforeignfield_offer",10,"prices",,,,0,1,"tx_testirreforeignfield_price",17,,,,,,
+,"2539b1f00daf65e7831446818aead3f0","tx_testirreforeignfield_offer",10,"prices",,,,1,1,"tx_testirreforeignfield_price",18,,,,,,
+,"ff4a495b29082752c4759a689b5fd3a0","tx_testirreforeignfield_offer",11,"prices",,,,0,1,"tx_testirreforeignfield_price",19,,,,,,
+,"c55a8f3d4437551b62ae5584e58a646e","tx_testirreforeignfield_hotel",6,"offers",,,,0,1,"tx_testirreforeignfield_offer",9,,,,,,
+,"5c5bcdcbbb7d6e744cb08c32f924af7b","tx_testirreforeignfield_hotel",6,"offers",,,,1,1,"tx_testirreforeignfield_offer",10,,,,,,
+,"3eba86662c983d80b7f24d75debb7316","tx_testirreforeignfield_hotel",7,"offers",,,,0,1,"tx_testirreforeignfield_offer",11,,,,,,
+,"00f612cda942350248f0a184dd669a0d","tt_content",299,"tx_testirreforeignfield_hotels",,,,0,1,"tx_testirreforeignfield_hotel",7,,,,,,
+,"34fa138cf1c65eaa489d59a065b7b303","tt_content",299,"tx_testirreforeignfield_hotels",,,,1,1,"tx_testirreforeignfield_hotel",6,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNDeleteHotelChild.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNDeleteHotelChild.csv
index 8ab0a7c2d701..4971ffabba36 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNDeleteHotelChild.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNDeleteHotelChild.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,69 +16,69 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
 ,299,89,256,0,0,0,1,0,0,297,"Regular Element #1",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-,6,89,1,0,0,0,1,0,0,3,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,7,89,2,0,0,0,1,2,0,4,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+,6,89,1,0,0,0,1,0,0,3,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,7,89,2,0,0,0,1,2,0,4,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-,9,89,1,0,0,0,1,0,0,5,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,10,89,2,0,0,0,1,0,0,6,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,11,89,1,0,0,0,1,2,0,7,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+,9,89,1,0,0,0,1,0,0,5,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,10,89,2,0,0,0,1,0,0,6,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,11,89,1,0,0,0,1,2,0,7,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
-,14,89,1,0,0,0,1,0,0,7,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,15,89,2,0,0,0,1,0,0,8,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,16,89,3,0,0,0,1,0,0,9,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,17,89,1,0,0,0,1,0,0,10,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,18,89,2,0,0,0,1,0,0,11,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,19,89,1,0,0,0,1,2,0,12,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
+,14,89,1,0,0,0,1,0,0,7,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,15,89,2,0,0,0,1,0,0,8,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,16,89,3,0,0,0,1,0,0,9,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,17,89,1,0,0,0,1,0,0,10,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,18,89,2,0,0,0,1,0,0,11,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,19,89,1,0,0,0,1,2,0,12,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"15b4763f9e142d9bc3ffc29c8e1b9874","tx_irretutorial_1nff_offer",9,"prices",,,,1,1,"tx_irretutorial_1nff_price",15,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"2b3ec50aa698b6d70ace8e3772263387","tx_irretutorial_1nff_hotel",7,"offers",,,,0,1,"tx_irretutorial_1nff_offer",11,,,,,,
-,"363e6e9c12f3293d38f01286992f7cec","tx_irretutorial_1nff_hotel",6,"offers",,,,0,1,"tx_irretutorial_1nff_offer",9,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"49e1dbed3a73511411ef4d2b5d0a1c7b","tx_irretutorial_1nff_offer",10,"prices",,,,0,1,"tx_irretutorial_1nff_price",17,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"6e88a10780f54735e223fcd3110d1248","tt_content",299,"tx_irretutorial_1nff_hotels",,,,1,1,"tx_irretutorial_1nff_hotel",7,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"799d002fd079ca160e6db0d6d3c2273f","tx_irretutorial_1nff_offer",10,"prices",,,,1,1,"tx_irretutorial_1nff_price",18,,,,,,
-,"8241802c77fe733045d90f9645f71e90","tx_irretutorial_1nff_offer",9,"prices",,,,0,1,"tx_irretutorial_1nff_price",14,,,,,,
-,"afcae32edf12d45a8357ca90cbb92548","tx_irretutorial_1nff_offer",11,"prices",,,,0,1,"tx_irretutorial_1nff_price",19,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"cecaae578e249856c5651f542af6c872","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,1,"tx_irretutorial_1nff_hotel",6,,,,,,
-,"e2dcc00c7a033a6b8d61ea91540c2342","tx_irretutorial_1nff_hotel",6,"offers",,,,1,1,"tx_irretutorial_1nff_offer",10,,,,,,
-,"ee63e2149d0d656c2a8704f51a16a67a","tx_irretutorial_1nff_offer",9,"prices",,,,2,1,"tx_irretutorial_1nff_price",16,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
+,"b3df9eac6d6c2ebddd3d3df8203bda92","tx_testirreforeignfield_offer",9,"prices",,,,0,1,"tx_testirreforeignfield_price",14,,,,,,
+,"b488190412ad71c1067619282306600a","tx_testirreforeignfield_offer",9,"prices",,,,1,1,"tx_testirreforeignfield_price",15,,,,,,
+,"15067fb440a562d18b2c00ae82a701f3","tx_testirreforeignfield_offer",9,"prices",,,,2,1,"tx_testirreforeignfield_price",16,,,,,,
+,"9cf838775310d90125a953c5e25ab815","tx_testirreforeignfield_offer",10,"prices",,,,0,1,"tx_testirreforeignfield_price",17,,,,,,
+,"2539b1f00daf65e7831446818aead3f0","tx_testirreforeignfield_offer",10,"prices",,,,1,1,"tx_testirreforeignfield_price",18,,,,,,
+,"c55a8f3d4437551b62ae5584e58a646e","tx_testirreforeignfield_hotel",6,"offers",,,,0,1,"tx_testirreforeignfield_offer",9,,,,,,
+,"5c5bcdcbbb7d6e744cb08c32f924af7b","tx_testirreforeignfield_hotel",6,"offers",,,,1,1,"tx_testirreforeignfield_offer",10,,,,,,
+,"f735c7fc6863a29d827ca201f60c8055","tt_content",299,"tx_testirreforeignfield_hotels",,,,0,1,"tx_testirreforeignfield_hotel",6,,,,,,
+,"ff4a495b29082752c4759a689b5fd3a0","tx_testirreforeignfield_offer",11,"prices",,,,0,1,"tx_testirreforeignfield_price",19,,,,,,
+,"3eba86662c983d80b7f24d75debb7316","tx_testirreforeignfield_hotel",7,"offers",,,,0,1,"tx_testirreforeignfield_offer",11,,,,,,
+,"f2c79ecd14664f7df03cf217762039cc","tt_content",299,"tx_testirreforeignfield_hotels",,,,1,1,"tx_testirreforeignfield_hotel",7,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNHotelChild.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNHotelChild.csv
index bae18528f49e..5c67880e4bda 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNHotelChild.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/modifyParentNHotelChild.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,69 +16,69 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
 ,299,89,256,0,0,0,1,0,0,297,"Regular Element #1",2,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-,6,89,1,0,0,0,1,0,0,3,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,7,89,2,0,0,0,1,0,0,4,"Testing #1",297,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+,6,89,1,0,0,0,1,0,0,3,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,7,89,2,0,0,0,1,0,0,4,"Testing #1",297,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-,9,89,1,0,0,0,1,0,0,5,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,10,89,2,0,0,0,1,0,0,6,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,11,89,1,0,0,0,1,0,0,7,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+,9,89,1,0,0,0,1,0,0,5,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,10,89,2,0,0,0,1,0,0,6,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,11,89,1,0,0,0,1,0,0,7,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
-,14,89,1,0,0,0,1,0,0,7,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,15,89,2,0,0,0,1,0,0,8,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,16,89,3,0,0,0,1,0,0,9,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,17,89,1,0,0,0,1,0,0,10,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,18,89,2,0,0,0,1,0,0,11,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,19,89,1,0,0,0,1,0,0,12,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
+,14,89,1,0,0,0,1,0,0,7,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,15,89,2,0,0,0,1,0,0,8,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,16,89,3,0,0,0,1,0,0,9,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,17,89,1,0,0,0,1,0,0,10,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,18,89,2,0,0,0,1,0,0,11,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,19,89,1,0,0,0,1,0,0,12,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"15b4763f9e142d9bc3ffc29c8e1b9874","tx_irretutorial_1nff_offer",9,"prices",,,,1,1,"tx_irretutorial_1nff_price",15,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"2b3ec50aa698b6d70ace8e3772263387","tx_irretutorial_1nff_hotel",7,"offers",,,,0,1,"tx_irretutorial_1nff_offer",11,,,,,,
-,"363e6e9c12f3293d38f01286992f7cec","tx_irretutorial_1nff_hotel",6,"offers",,,,0,1,"tx_irretutorial_1nff_offer",9,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"49e1dbed3a73511411ef4d2b5d0a1c7b","tx_irretutorial_1nff_offer",10,"prices",,,,0,1,"tx_irretutorial_1nff_price",17,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"6e88a10780f54735e223fcd3110d1248","tt_content",299,"tx_irretutorial_1nff_hotels",,,,1,1,"tx_irretutorial_1nff_hotel",7,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"799d002fd079ca160e6db0d6d3c2273f","tx_irretutorial_1nff_offer",10,"prices",,,,1,1,"tx_irretutorial_1nff_price",18,,,,,,
-,"8241802c77fe733045d90f9645f71e90","tx_irretutorial_1nff_offer",9,"prices",,,,0,1,"tx_irretutorial_1nff_price",14,,,,,,
-,"afcae32edf12d45a8357ca90cbb92548","tx_irretutorial_1nff_offer",11,"prices",,,,0,1,"tx_irretutorial_1nff_price",19,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"cecaae578e249856c5651f542af6c872","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,1,"tx_irretutorial_1nff_hotel",6,,,,,,
-,"e2dcc00c7a033a6b8d61ea91540c2342","tx_irretutorial_1nff_hotel",6,"offers",,,,1,1,"tx_irretutorial_1nff_offer",10,,,,,,
-,"ee63e2149d0d656c2a8704f51a16a67a","tx_irretutorial_1nff_offer",9,"prices",,,,2,1,"tx_irretutorial_1nff_price",16,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
+,"b3df9eac6d6c2ebddd3d3df8203bda92","tx_testirreforeignfield_offer",9,"prices",,,,0,1,"tx_testirreforeignfield_price",14,,,,,,
+,"b488190412ad71c1067619282306600a","tx_testirreforeignfield_offer",9,"prices",,,,1,1,"tx_testirreforeignfield_price",15,,,,,,
+,"15067fb440a562d18b2c00ae82a701f3","tx_testirreforeignfield_offer",9,"prices",,,,2,1,"tx_testirreforeignfield_price",16,,,,,,
+,"9cf838775310d90125a953c5e25ab815","tx_testirreforeignfield_offer",10,"prices",,,,0,1,"tx_testirreforeignfield_price",17,,,,,,
+,"2539b1f00daf65e7831446818aead3f0","tx_testirreforeignfield_offer",10,"prices",,,,1,1,"tx_testirreforeignfield_price",18,,,,,,
+,"ff4a495b29082752c4759a689b5fd3a0","tx_testirreforeignfield_offer",11,"prices",,,,0,1,"tx_testirreforeignfield_price",19,,,,,,
+,"c55a8f3d4437551b62ae5584e58a646e","tx_testirreforeignfield_hotel",6,"offers",,,,0,1,"tx_testirreforeignfield_offer",9,,,,,,
+,"5c5bcdcbbb7d6e744cb08c32f924af7b","tx_testirreforeignfield_hotel",6,"offers",,,,1,1,"tx_testirreforeignfield_offer",10,,,,,,
+,"3eba86662c983d80b7f24d75debb7316","tx_testirreforeignfield_hotel",7,"offers",,,,0,1,"tx_testirreforeignfield_offer",11,,,,,,
+,"f735c7fc6863a29d827ca201f60c8055","tt_content",299,"tx_testirreforeignfield_hotels",,,,0,1,"tx_testirreforeignfield_hotel",6,,,,,,
+,"f2c79ecd14664f7df03cf217762039cc","tt_content",299,"tx_testirreforeignfield_hotels",,,,1,1,"tx_testirreforeignfield_hotel",7,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/moveParentContentToDifferentPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/moveParentContentToDifferentPage.csv
index d76023e0df18..ab3b1af44bc5 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/moveParentContentToDifferentPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/moveParentContentToDifferentPage.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,53 +16,53 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
 ,299,90,256,0,0,0,1,4,0,298,"Regular Element #2",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-,6,90,256,0,0,0,1,4,0,5,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+,6,90,256,0,0,0,1,4,0,5,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-,9,90,256,0,0,0,1,4,0,8,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+,9,90,256,0,0,0,1,4,0,8,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
-,14,90,256,0,0,0,1,4,0,13,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
+,14,90,256,0,0,0,1,4,0,13,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"363e6e9c12f3293d38f01286992f7cec","tx_irretutorial_1nff_hotel",6,"offers",,,,0,1,"tx_irretutorial_1nff_offer",9,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"8241802c77fe733045d90f9645f71e90","tx_irretutorial_1nff_offer",9,"prices",,,,0,1,"tx_irretutorial_1nff_price",14,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"cecaae578e249856c5651f542af6c872","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,1,"tx_irretutorial_1nff_hotel",6,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
+,"b3df9eac6d6c2ebddd3d3df8203bda92","tx_testirreforeignfield_offer",9,"prices",,,,0,1,"tx_testirreforeignfield_price",14,,,,,,
+,"c55a8f3d4437551b62ae5584e58a646e","tx_testirreforeignfield_hotel",6,"offers",,,,0,1,"tx_testirreforeignfield_offer",9,,,,,,
+,"f735c7fc6863a29d827ca201f60c8055","tt_content",299,"tx_testirreforeignfield_hotels",,,,0,1,"tx_testirreforeignfield_hotel",6,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/moveParentContentToDifferentPageNChangeSorting.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/moveParentContentToDifferentPageNChangeSorting.csv
index b3c0b6f09642..e3f3db3e278d 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/moveParentContentToDifferentPageNChangeSorting.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/moveParentContentToDifferentPageNChangeSorting.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,76 +16,76 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
 ,299,90,256,0,0,0,1,4,0,298,"Regular Element #2",1,,,,,
 ,300,90,512,0,0,0,1,4,0,297,"Regular Element #1",2,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-,6,90,256,0,0,0,1,4,0,5,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-,7,90,64,0,0,0,1,4,0,3,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,8,90,128,0,0,0,1,4,0,4,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+,6,90,256,0,0,0,1,4,0,5,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+,7,90,64,0,0,0,1,4,0,3,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,8,90,128,0,0,0,1,4,0,4,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-,9,90,256,0,0,0,1,4,0,8,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-,10,90,16,0,0,0,1,4,0,5,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,11,90,8,0,0,0,1,4,0,6,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,12,90,128,0,0,0,1,4,0,7,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+,9,90,256,0,0,0,1,4,0,8,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+,10,90,16,0,0,0,1,4,0,5,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,11,90,8,0,0,0,1,4,0,6,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,12,90,128,0,0,0,1,4,0,7,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
-,14,90,256,0,0,0,1,4,0,13,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
-,15,90,8,0,0,0,1,4,0,7,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,16,90,4,0,0,0,1,4,0,8,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,17,90,2,0,0,0,1,4,0,9,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,18,90,256,0,0,0,1,4,0,10,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,19,90,0,0,0,0,1,4,0,11,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,20,90,128,0,0,0,1,4,0,12,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
+,14,90,256,0,0,0,1,4,0,13,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
+,15,90,8,0,0,0,1,4,0,7,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,16,90,4,0,0,0,1,4,0,8,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,17,90,2,0,0,0,1,4,0,9,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,18,90,256,0,0,0,1,4,0,10,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,19,90,0,0,0,0,1,4,0,11,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,20,90,128,0,0,0,1,4,0,12,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
-,"23bf37df343e620baea404a2a2b68a72","tx_irretutorial_1nff_hotel",7,"offers",,,,1,1,"tx_irretutorial_1nff_offer",10,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"2b3ec50aa698b6d70ace8e3772263387","tx_irretutorial_1nff_hotel",7,"offers",,,,0,1,"tx_irretutorial_1nff_offer",11,,,,,,
-,"363e6e9c12f3293d38f01286992f7cec","tx_irretutorial_1nff_hotel",6,"offers",,,,0,1,"tx_irretutorial_1nff_offer",9,,,,,,
-,"374b21d2b565c62fd61f70c96ae8e442","tx_irretutorial_1nff_offer",10,"prices",,,,1,1,"tx_irretutorial_1nff_price",16,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"46228b49d4e6c63991eeeb038f96e64d","tt_content",300,"tx_irretutorial_1nff_hotels",,,,1,1,"tx_irretutorial_1nff_hotel",8,,,,,,
-,"49e1dbed3a73511411ef4d2b5d0a1c7b","tx_irretutorial_1nff_offer",10,"prices",,,,0,1,"tx_irretutorial_1nff_price",17,,,,,,
-,"4a44c210cf7fe6b50a0d9ab009c0f968","tx_irretutorial_1nff_offer",11,"prices",,,,1,1,"tx_irretutorial_1nff_price",18,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"6b446af85b91be7261d3cead326a119d","tx_irretutorial_1nff_offer",10,"prices",,,,2,1,"tx_irretutorial_1nff_price",15,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"8241802c77fe733045d90f9645f71e90","tx_irretutorial_1nff_offer",9,"prices",,,,0,1,"tx_irretutorial_1nff_price",14,,,,,,
-,"9bd5048c24347f5517c03b938f6c3ac9","tt_content",300,"tx_irretutorial_1nff_hotels",,,,0,1,"tx_irretutorial_1nff_hotel",7,,,,,,
-,"afcae32edf12d45a8357ca90cbb92548","tx_irretutorial_1nff_offer",11,"prices",,,,0,1,"tx_irretutorial_1nff_price",19,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"cecaae578e249856c5651f542af6c872","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,1,"tx_irretutorial_1nff_hotel",6,,,,,,
-,"db7640f450d6d62a25160fc22b2243c3","tx_irretutorial_1nff_offer",12,"prices",,,,0,1,"tx_irretutorial_1nff_price",20,,,,,,
-,"e11925b7a26077e8208f39a43b007b16","tx_irretutorial_1nff_hotel",8,"offers",,,,0,1,"tx_irretutorial_1nff_offer",12,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
+,"b3df9eac6d6c2ebddd3d3df8203bda92","tx_testirreforeignfield_offer",9,"prices",,,,0,1,"tx_testirreforeignfield_price",14,,,,,,
+,"c55a8f3d4437551b62ae5584e58a646e","tx_testirreforeignfield_hotel",6,"offers",,,,0,1,"tx_testirreforeignfield_offer",9,,,,,,
+,"f735c7fc6863a29d827ca201f60c8055","tt_content",299,"tx_testirreforeignfield_hotels",,,,0,1,"tx_testirreforeignfield_hotel",6,,,,,,
+,"9cf838775310d90125a953c5e25ab815","tx_testirreforeignfield_offer",10,"prices",,,,0,1,"tx_testirreforeignfield_price",17,,,,,,
+,"17eb5363d0abae01948acb185095e9b1","tx_testirreforeignfield_offer",10,"prices",,,,1,1,"tx_testirreforeignfield_price",16,,,,,,
+,"c965e2b5a889d0b559d3c6243c89bc2b","tx_testirreforeignfield_offer",10,"prices",,,,2,1,"tx_testirreforeignfield_price",15,,,,,,
+,"ff4a495b29082752c4759a689b5fd3a0","tx_testirreforeignfield_offer",11,"prices",,,,0,1,"tx_testirreforeignfield_price",19,,,,,,
+,"c2ae14619ad5db03a2e7c3b3a6469405","tx_testirreforeignfield_offer",11,"prices",,,,1,1,"tx_testirreforeignfield_price",18,,,,,,
+,"bcf4e2c0e4499a633ba77bcdfdd1735b","tx_testirreforeignfield_offer",12,"prices",,,,0,1,"tx_testirreforeignfield_price",20,,,,,,
+,"3eba86662c983d80b7f24d75debb7316","tx_testirreforeignfield_hotel",7,"offers",,,,0,1,"tx_testirreforeignfield_offer",11,,,,,,
+,"9341f4ceb174ab578db1164f921366b9","tx_testirreforeignfield_hotel",7,"offers",,,,1,1,"tx_testirreforeignfield_offer",10,,,,,,
+,"dfefdbe882ec8599debbe322258dc743","tx_testirreforeignfield_hotel",8,"offers",,,,0,1,"tx_testirreforeignfield_offer",12,,,,,,
+,"3e385490e1a1e9c88454ca8ead46b622","tt_content",300,"tx_testirreforeignfield_hotels",,,,0,1,"tx_testirreforeignfield_hotel",7,,,,,,
+,"1923bc9b756d0c408f44d85983f465c5","tt_content",300,"tx_testirreforeignfield_hotels",,,,1,1,"tx_testirreforeignfield_hotel",8,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/moveParentContentToDifferentPageTwice.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/moveParentContentToDifferentPageTwice.csv
index ead245f1d825..3ca9add8429c 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/moveParentContentToDifferentPageTwice.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/moveParentContentToDifferentPageTwice.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,53 +16,53 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
 ,299,1,256,0,0,0,1,4,0,298,"Regular Element #2",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-,6,1,256,0,0,0,1,4,0,5,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+,6,1,256,0,0,0,1,4,0,5,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-,9,1,256,0,0,0,1,4,0,8,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+,9,1,256,0,0,0,1,4,0,8,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
-,14,1,256,0,0,0,1,4,0,13,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
+,14,1,256,0,0,0,1,4,0,13,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"363e6e9c12f3293d38f01286992f7cec","tx_irretutorial_1nff_hotel",6,"offers",,,,0,1,"tx_irretutorial_1nff_offer",9,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"8241802c77fe733045d90f9645f71e90","tx_irretutorial_1nff_offer",9,"prices",,,,0,1,"tx_irretutorial_1nff_price",14,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"cecaae578e249856c5651f542af6c872","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,1,"tx_irretutorial_1nff_hotel",6,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
+,"b3df9eac6d6c2ebddd3d3df8203bda92","tx_testirreforeignfield_offer",9,"prices",,,,0,1,"tx_testirreforeignfield_price",14,,,,,,
+,"c55a8f3d4437551b62ae5584e58a646e","tx_testirreforeignfield_hotel",6,"offers",,,,0,1,"tx_testirreforeignfield_offer",9,,,,,,
+,"f735c7fc6863a29d827ca201f60c8055","tt_content",299,"tx_testirreforeignfield_hotels",,,,0,1,"tx_testirreforeignfield_hotel",6,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/changeParentContentSorting.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/changeParentContentSorting.csv
index ddeac7ffe35f..cbcd5809d1dc 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/changeParentContentSorting.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/changeParentContentSorting.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,46 +16,46 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,768,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/copyPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/copyPage.csv
index f11ed46c79e4..b6ae230984f9 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/copyPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/copyPage.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -17,78 +17,78 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
 ,299,91,256,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
 ,300,91,128,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
 ,6,91,1,0,0,0,0,0,0,0,"Hotel #0",91,"pages",,0,,
-,7,91,513,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content",1nff.hotels,1,,
-,8,91,1,0,0,0,0,0,0,0,"Hotel #1",300,"tt_content",1nff.hotels,2,,
-,9,91,2,0,0,0,0,0,0,0,"Hotel #2",300,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,7,91,513,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content","1nff.hotels",1,,
+,8,91,1,0,0,0,0,0,0,0,"Hotel #1",300,"tt_content","1nff.hotels",2,,
+,9,91,2,0,0,0,0,0,0,0,"Hotel #2",300,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-,9,91,513,0,0,0,0,0,0,0,"Offer #1.1",7,"tx_irretutorial_1nff_hotel",,1,,
-,10,91,1,0,0,0,0,0,0,0,"Offer #1.1",8,"tx_irretutorial_1nff_hotel",,3,,
-,11,91,2,0,0,0,0,0,0,0,"Offer #1.2",8,"tx_irretutorial_1nff_hotel",,2,,
-,12,91,1,0,0,0,0,0,0,0,"Offer #2.1",9,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+,9,91,513,0,0,0,0,0,0,0,"Offer #1.1",7,"tx_testirreforeignfield_hotel",,1,,
+,10,91,1,0,0,0,0,0,0,0,"Offer #1.1",8,"tx_testirreforeignfield_hotel",,3,,
+,11,91,2,0,0,0,0,0,0,0,"Offer #1.2",8,"tx_testirreforeignfield_hotel",,2,,
+,12,91,1,0,0,0,0,0,0,0,"Offer #2.1",9,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
-,14,91,1025,0,0,0,0,0,0,0,"Price #1.1.1",9,"tx_irretutorial_1nff_offer",,,,
-,15,91,513,0,0,0,0,0,0,0,"Price #1.1.1",10,"tx_irretutorial_1nff_offer",,,,
-,16,91,514,0,0,0,0,0,0,0,"Price #1.1.2",10,"tx_irretutorial_1nff_offer",,,,
-,17,91,515,0,0,0,0,0,0,0,"Price #1.1.3",10,"tx_irretutorial_1nff_offer",,,,
-,18,91,1,0,0,0,0,0,0,0,"Price #1.2.1",11,"tx_irretutorial_1nff_offer",,,,
-,19,91,2,0,0,0,0,0,0,0,"Price #1.2.2",11,"tx_irretutorial_1nff_offer",,,,
-,20,91,1,0,0,0,0,0,0,0,"Price #2.1.1",12,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
+,14,91,1025,0,0,0,0,0,0,0,"Price #1.1.1",9,"tx_testirreforeignfield_offer",,,,
+,15,91,513,0,0,0,0,0,0,0,"Price #1.1.1",10,"tx_testirreforeignfield_offer",,,,
+,16,91,514,0,0,0,0,0,0,0,"Price #1.1.2",10,"tx_testirreforeignfield_offer",,,,
+,17,91,515,0,0,0,0,0,0,0,"Price #1.1.3",10,"tx_testirreforeignfield_offer",,,,
+,18,91,1,0,0,0,0,0,0,0,"Price #1.2.1",11,"tx_testirreforeignfield_offer",,,,
+,19,91,2,0,0,0,0,0,0,0,"Price #1.2.2",11,"tx_testirreforeignfield_offer",,,,
+,20,91,1,0,0,0,0,0,0,0,"Price #2.1.1",12,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"266accee962e071564b66166bb002874","pages",91,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",6,,,,,,
-,"277fb6f278dc9c056e0f3164f5e1778e","tx_irretutorial_1nff_offer",10,"prices",,,,0,0,"tx_irretutorial_1nff_price",15,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"3995c1d3a93d3ab38867852371e720e1","tx_irretutorial_1nff_hotel",9,"offers",,,,0,0,"tx_irretutorial_1nff_offer",12,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"494d75b7b111aa689d15a5c4108ddd0d","tx_irretutorial_1nff_offer",11,"prices",,,,0,0,"tx_irretutorial_1nff_price",18,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"67250ca82106f786e14f2b90f5a5da7d","tt_content",300,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",8,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"7adf68410be27466611b7e3e97ee6aa6","tx_irretutorial_1nff_offer",11,"prices",,,,1,0,"tx_irretutorial_1nff_price",19,,,,,,
-,"8383c20f5ece68a05f4e73423ceb4f69","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",7,,,,,,
-,"8c2094cd97152334826cfac5852aa42a","tx_irretutorial_1nff_offer",12,"prices",,,,0,0,"tx_irretutorial_1nff_price",20,,,,,,
-,"92e2c9f4ee5e5b6c608d2c980bc4d78f","tx_irretutorial_1nff_hotel",7,"offers",,,,0,0,"tx_irretutorial_1nff_offer",9,,,,,,
-,"a5c771c375921fe4bfb06c5027fbdd51","tx_irretutorial_1nff_offer",10,"prices",,,,1,0,"tx_irretutorial_1nff_price",16,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b58f0a6489ee99de86faac0511db39ba","tt_content",300,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",9,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"cefb86725658b810bea751e1ac3648a3","tx_irretutorial_1nff_offer",10,"prices",,,,2,0,"tx_irretutorial_1nff_price",17,,,,,,
-,"d0754983bfe2639c6388e918c5c3c243","tx_irretutorial_1nff_offer",9,"prices",,,,0,0,"tx_irretutorial_1nff_price",14,,,,,,
-,"e5fa041e279d04dab69ade17128a9243","tx_irretutorial_1nff_hotel",8,"offers",,,,1,0,"tx_irretutorial_1nff_offer",11,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
-,"efcb05dc035086f96053ec60f68186b6","tx_irretutorial_1nff_hotel",8,"offers",,,,0,0,"tx_irretutorial_1nff_offer",10,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
+,"3a3ac66303c3333d24712b1f0dbae733","tt_content",299,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",7,,,,,,
+,"acbf104c3fcdb85a80b6f1c62213f1b2","tt_content",300,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",8,,,,,,
+,"694641347c205cba5f6284af4983e210","tt_content",300,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",9,,,,,,
+,"c5bf340feb4639d5d8f687186b805902","tx_testirreforeignfield_hotel",7,"offers",,,,0,0,"tx_testirreforeignfield_offer",9,,,,,,
+,"55682ad5fbb3cd4af94822337cdecddf","tx_testirreforeignfield_hotel",8,"offers",,,,0,0,"tx_testirreforeignfield_offer",10,,,,,,
+,"67b4d111498f9949044f6ad1b5f954e0","tx_testirreforeignfield_hotel",8,"offers",,,,1,0,"tx_testirreforeignfield_offer",11,,,,,,
+,"caea1dd8a2d11243f920cf60ad54a65b","tx_testirreforeignfield_hotel",9,"offers",,,,0,0,"tx_testirreforeignfield_offer",12,,,,,,
+,"35f57ab5ca24a48eaa8bcb96cbb3157a","tx_testirreforeignfield_offer",9,"prices",,,,0,0,"tx_testirreforeignfield_price",14,,,,,,
+,"0b8d08bb967f60d9231811f97c47151d","tx_testirreforeignfield_offer",10,"prices",,,,0,0,"tx_testirreforeignfield_price",15,,,,,,
+,"e5702e604310bb04bd9291394bd7b560","tx_testirreforeignfield_offer",10,"prices",,,,1,0,"tx_testirreforeignfield_price",16,,,,,,
+,"ffbd17bd4d58ee80e875b5cdd30ab3cf","tx_testirreforeignfield_offer",10,"prices",,,,2,0,"tx_testirreforeignfield_price",17,,,,,,
+,"ca9d3af43d483d6d235eae7946e91476","tx_testirreforeignfield_offer",11,"prices",,,,0,0,"tx_testirreforeignfield_price",18,,,,,,
+,"14dd08b537108dba2bb1fd3f783a5364","tx_testirreforeignfield_offer",11,"prices",,,,1,0,"tx_testirreforeignfield_price",19,,,,,,
+,"7b83a005a2ce92576cdca33948fcac83","tx_testirreforeignfield_offer",12,"prices",,,,0,0,"tx_testirreforeignfield_price",20,,,,,,
+,"f8ab061425b734a86ef5e35ad4a51fe7","pages",91,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",6,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/copyPageWHotelBeforeParentContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/copyPageWHotelBeforeParentContent.csv
index 90a9ddd59923..449756fc2027 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/copyPageWHotelBeforeParentContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/copyPageWHotelBeforeParentContent.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -17,78 +17,78 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
 ,299,91,256,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
 ,300,91,128,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
 ,6,91,1,0,0,0,0,0,0,0,"Hotel #0",91,"pages",,0,,
-,7,91,2,0,0,0,0,0,0,0,"Hotel #2",300,"tt_content",1nff.hotels,1,,
-,8,91,1,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content",1nff.hotels,1,,
-,9,91,1,0,0,0,0,0,0,0,"Hotel #1",300,"tt_content",1nff.hotels,2,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,7,91,2,0,0,0,0,0,0,0,"Hotel #2",300,"tt_content","1nff.hotels",1,,
+,8,91,1,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content","1nff.hotels",1,,
+,9,91,1,0,0,0,0,0,0,0,"Hotel #1",300,"tt_content","1nff.hotels",2,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-,9,91,513,0,0,0,0,0,0,0,"Offer #2.1",7,"tx_irretutorial_1nff_hotel",,1,,
-,10,91,513,0,0,0,0,0,0,0,"Offer #1.1",8,"tx_irretutorial_1nff_hotel",,1,,
-,11,91,1,0,0,0,0,0,0,0,"Offer #1.1",9,"tx_irretutorial_1nff_hotel",,3,,
-,12,91,2,0,0,0,0,0,0,0,"Offer #1.2",9,"tx_irretutorial_1nff_hotel",,2,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+,9,91,513,0,0,0,0,0,0,0,"Offer #2.1",7,"tx_testirreforeignfield_hotel",,1,,
+,10,91,513,0,0,0,0,0,0,0,"Offer #1.1",8,"tx_testirreforeignfield_hotel",,1,,
+,11,91,1,0,0,0,0,0,0,0,"Offer #1.1",9,"tx_testirreforeignfield_hotel",,3,,
+,12,91,2,0,0,0,0,0,0,0,"Offer #1.2",9,"tx_testirreforeignfield_hotel",,2,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
-,14,91,1025,0,0,0,0,0,0,0,"Price #2.1.1",9,"tx_irretutorial_1nff_offer",,,,
-,15,91,1025,0,0,0,0,0,0,0,"Price #1.1.1",10,"tx_irretutorial_1nff_offer",,,,
-,16,91,513,0,0,0,0,0,0,0,"Price #1.1.1",11,"tx_irretutorial_1nff_offer",,,,
-,17,91,514,0,0,0,0,0,0,0,"Price #1.1.2",11,"tx_irretutorial_1nff_offer",,,,
-,18,91,515,0,0,0,0,0,0,0,"Price #1.1.3",11,"tx_irretutorial_1nff_offer",,,,
-,19,91,1,0,0,0,0,0,0,0,"Price #1.2.1",12,"tx_irretutorial_1nff_offer",,,,
-,20,91,2,0,0,0,0,0,0,0,"Price #1.2.2",12,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
+,14,91,1025,0,0,0,0,0,0,0,"Price #2.1.1",9,"tx_testirreforeignfield_offer",,,,
+,15,91,1025,0,0,0,0,0,0,0,"Price #1.1.1",10,"tx_testirreforeignfield_offer",,,,
+,16,91,513,0,0,0,0,0,0,0,"Price #1.1.1",11,"tx_testirreforeignfield_offer",,,,
+,17,91,514,0,0,0,0,0,0,0,"Price #1.1.2",11,"tx_testirreforeignfield_offer",,,,
+,18,91,515,0,0,0,0,0,0,0,"Price #1.1.3",11,"tx_testirreforeignfield_offer",,,,
+,19,91,1,0,0,0,0,0,0,0,"Price #1.2.1",12,"tx_testirreforeignfield_offer",,,,
+,20,91,2,0,0,0,0,0,0,0,"Price #1.2.2",12,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0287e2b2358f2147cb04e4fb99de0177","tx_irretutorial_1nff_offer",11,"prices",,,,2,0,"tx_irretutorial_1nff_price",18,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"266accee962e071564b66166bb002874","pages",91,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",6,,,,,,
-,"277fb6f278dc9c056e0f3164f5e1778e","tx_irretutorial_1nff_offer",10,"prices",,,,0,0,"tx_irretutorial_1nff_price",15,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"2f2735c4a73595aab6529ef3707cb7f7","tx_irretutorial_1nff_offer",12,"prices",,,,0,0,"tx_irretutorial_1nff_price",19,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"3e90e7e724dd19e513c0c77537e839b4","tx_irretutorial_1nff_offer",11,"prices",,,,0,0,"tx_irretutorial_1nff_price",16,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4b1ccfa85b39745dff0411669a3aeb3d","tx_irretutorial_1nff_hotel",9,"offers",,,,1,0,"tx_irretutorial_1nff_offer",12,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"5a46903a1a99f3fd2e8291773be81ede","tx_irretutorial_1nff_offer",12,"prices",,,,1,0,"tx_irretutorial_1nff_price",20,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"8b05d52ad547d77bf8849a29bb3250ec","tt_content",300,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",7,,,,,,
-,"8db06fba0cca9fab411ce74e5714f130","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",8,,,,,,
-,"92e2c9f4ee5e5b6c608d2c980bc4d78f","tx_irretutorial_1nff_hotel",7,"offers",,,,0,0,"tx_irretutorial_1nff_offer",9,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"cf0d8528c173dcf0a7234125c40eb55e","tx_irretutorial_1nff_hotel",9,"offers",,,,0,0,"tx_irretutorial_1nff_offer",11,,,,,,
-,"d0754983bfe2639c6388e918c5c3c243","tx_irretutorial_1nff_offer",9,"prices",,,,0,0,"tx_irretutorial_1nff_price",14,,,,,,
-,"df7ed731cbc1c55ae79e4062e820c1ef","tx_irretutorial_1nff_offer",11,"prices",,,,1,0,"tx_irretutorial_1nff_price",17,,,,,,
-,"e18495622afd6ab187bff503a828ab76","tt_content",300,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",9,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
-,"efcb05dc035086f96053ec60f68186b6","tx_irretutorial_1nff_hotel",8,"offers",,,,0,0,"tx_irretutorial_1nff_offer",10,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
+,"2bfc9f92dab0d028a88b306e234655b0","tt_content",299,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",8,,,,,,
+,"a1c199aed25931c7cef60e0c6a823754","tt_content",300,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",9,,,,,,
+,"aa0aa0a7f964cebd105633b45f7aae1f","tt_content",300,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",7,,,,,,
+,"55682ad5fbb3cd4af94822337cdecddf","tx_testirreforeignfield_hotel",8,"offers",,,,0,0,"tx_testirreforeignfield_offer",10,,,,,,
+,"f446b28bf394621f555a351e502c2af9","tx_testirreforeignfield_hotel",9,"offers",,,,0,0,"tx_testirreforeignfield_offer",11,,,,,,
+,"b0751056ffc84e267082cc2a40f83526","tx_testirreforeignfield_hotel",9,"offers",,,,1,0,"tx_testirreforeignfield_offer",12,,,,,,
+,"c5bf340feb4639d5d8f687186b805902","tx_testirreforeignfield_hotel",7,"offers",,,,0,0,"tx_testirreforeignfield_offer",9,,,,,,
+,"0b8d08bb967f60d9231811f97c47151d","tx_testirreforeignfield_offer",10,"prices",,,,0,0,"tx_testirreforeignfield_price",15,,,,,,
+,"93cf9871381a2435ac586d6a83b801ea","tx_testirreforeignfield_offer",11,"prices",,,,0,0,"tx_testirreforeignfield_price",16,,,,,,
+,"83b07d829d4644ced152f2e9864e60a8","tx_testirreforeignfield_offer",11,"prices",,,,1,0,"tx_testirreforeignfield_price",17,,,,,,
+,"63b348bb5e945c73040c5ef9dfccaf41","tx_testirreforeignfield_offer",11,"prices",,,,2,0,"tx_testirreforeignfield_price",18,,,,,,
+,"1c9c86aa9a280f8a8ee4c6a1e805d32d","tx_testirreforeignfield_offer",12,"prices",,,,0,0,"tx_testirreforeignfield_price",19,,,,,,
+,"a0e38dc3b2ac949896282c27ef082142","tx_testirreforeignfield_offer",12,"prices",,,,1,0,"tx_testirreforeignfield_price",20,,,,,,
+,"35f57ab5ca24a48eaa8bcb96cbb3157a","tx_testirreforeignfield_offer",9,"prices",,,,0,0,"tx_testirreforeignfield_price",14,,,,,,
+,"f8ab061425b734a86ef5e35ad4a51fe7","pages",91,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",6,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/copyParentContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/copyParentContent.csv
index 0bf85c412ad9..64414bb4efb7 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/copyParentContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/copyParentContent.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,53 +16,53 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
 ,299,89,128,0,0,0,0,0,0,0,"Regular Element #2 (copy 1)",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-,6,89,1,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+,6,89,1,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-,9,89,1,0,0,0,0,0,0,0,"Offer #1.1",6,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+,9,89,1,0,0,0,0,0,0,0,"Offer #1.1",6,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
-,14,89,1,0,0,0,0,0,0,0,"Price #1.1.1",9,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
+,14,89,1,0,0,0,0,0,0,0,"Price #1.1.1",9,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"c5384f6e9469c07c2e90bca873d93cc1","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",6,,,,,,
-,"d0754983bfe2639c6388e918c5c3c243","tx_irretutorial_1nff_offer",9,"prices",,,,0,0,"tx_irretutorial_1nff_price",14,,,,,,
-,"ec78ae01c0f6099f374b80d6740c1e7d","tx_irretutorial_1nff_hotel",6,"offers",,,,0,0,"tx_irretutorial_1nff_offer",9,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
+,"0e39ecf7ad8b072a1b1fac05ac2dfd4c","tt_content",299,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",6,,,,,,
+,"77c47e123fc813a6b465fb99ab716357","tx_testirreforeignfield_hotel",6,"offers",,,,0,0,"tx_testirreforeignfield_offer",9,,,,,,
+,"35f57ab5ca24a48eaa8bcb96cbb3157a","tx_testirreforeignfield_offer",9,"prices",,,,0,0,"tx_testirreforeignfield_price",14,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/copyParentContentToDifferentPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/copyParentContentToDifferentPage.csv
index 862c2c0a65c6..42a6b4b8edf3 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/copyParentContentToDifferentPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/copyParentContentToDifferentPage.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,53 +16,53 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
 ,299,90,256,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-,6,90,1,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+,6,90,1,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-,9,90,1,0,0,0,0,0,0,0,"Offer #1.1",6,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+,9,90,1,0,0,0,0,0,0,0,"Offer #1.1",6,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
-,14,90,1,0,0,0,0,0,0,0,"Price #1.1.1",9,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
+,14,90,1,0,0,0,0,0,0,0,"Price #1.1.1",9,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"c5384f6e9469c07c2e90bca873d93cc1","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",6,,,,,,
-,"d0754983bfe2639c6388e918c5c3c243","tx_irretutorial_1nff_offer",9,"prices",,,,0,0,"tx_irretutorial_1nff_price",14,,,,,,
-,"ec78ae01c0f6099f374b80d6740c1e7d","tx_irretutorial_1nff_hotel",6,"offers",,,,0,0,"tx_irretutorial_1nff_offer",9,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
+,"0e39ecf7ad8b072a1b1fac05ac2dfd4c","tt_content",299,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",6,,,,,,
+,"77c47e123fc813a6b465fb99ab716357","tx_testirreforeignfield_hotel",6,"offers",,,,0,0,"tx_testirreforeignfield_offer",9,,,,,,
+,"35f57ab5ca24a48eaa8bcb96cbb3157a","tx_testirreforeignfield_offer",9,"prices",,,,0,0,"tx_testirreforeignfield_price",14,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/createNCopyParentContentNHotelNOfferChildren.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/createNCopyParentContentNHotelNOfferChildren.csv
index 5f629bfc2546..cefea8c94328 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/createNCopyParentContentNHotelNOfferChildren.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/createNCopyParentContentNHotelNOfferChildren.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,56 +16,56 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
 ,299,89,128,0,0,0,0,0,0,0,"Testing #1",1,,,,,
 ,300,89,64,0,0,0,0,0,0,0,"Testing #1 (copy 1)",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-,6,89,1,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content",1nff.hotels,1,,
-,7,89,1,0,0,0,0,0,0,0,"Hotel #1",300,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+,6,89,1,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content","1nff.hotels",1,,
+,7,89,1,0,0,0,0,0,0,0,"Hotel #1",300,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-,9,89,1,0,0,0,0,0,0,0,"Offer #1",6,"tx_irretutorial_1nff_hotel",,0,,
-,10,89,1,0,0,0,0,0,0,0,"Offer #1",7,"tx_irretutorial_1nff_hotel",,0,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+,9,89,1,0,0,0,0,0,0,0,"Offer #1",6,"tx_testirreforeignfield_hotel",,0,,
+,10,89,1,0,0,0,0,0,0,0,"Offer #1",7,"tx_testirreforeignfield_hotel",,0,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"093c0d6fb779e67f62011fa7c0d67437","tt_content",300,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",7,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"c5384f6e9469c07c2e90bca873d93cc1","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",6,,,,,,
-,"e9c09ac89f1212d5b15f3013e2cee2af","tx_irretutorial_1nff_hotel",7,"offers",,,,0,0,"tx_irretutorial_1nff_offer",10,,,,,,
-,"ec78ae01c0f6099f374b80d6740c1e7d","tx_irretutorial_1nff_hotel",6,"offers",,,,0,0,"tx_irretutorial_1nff_offer",9,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
+,"0e39ecf7ad8b072a1b1fac05ac2dfd4c","tt_content",299,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",6,,,,,,
+,"77c47e123fc813a6b465fb99ab716357","tx_testirreforeignfield_hotel",6,"offers",,,,0,0,"tx_testirreforeignfield_offer",9,,,,,,
+,"10d0276aaa8ab897fa1d1fb601b9628e","tt_content",300,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",7,,,,,,
+,"f14125aa13e88b37c6e61a1714b26a6c","tx_testirreforeignfield_hotel",7,"offers",,,,0,0,"tx_testirreforeignfield_offer",10,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
index 2c6605eb6101..ac9b5f68e015 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -17,60 +17,60 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
 ,299,89,128,0,0,0,0,0,0,0,"Testing #1",1,,,,,
 ,300,89,192,0,1,299,0,0,0,0,"[Translate to Dansk:] Testing #1",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,514,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-,6,89,1,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content",1nff.hotels,1,,
-,7,89,1,0,1,6,0,0,0,0,"[Translate to Dansk:] Hotel #1",300,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,514,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+,6,89,1,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content","1nff.hotels",1,,
+,7,89,1,0,1,6,0,0,0,0,"[Translate to Dansk:] Hotel #1",300,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,514,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-,9,89,1,0,0,0,0,0,0,0,"Offer #1",6,"tx_irretutorial_1nff_hotel",,0,,
-,10,89,1,0,1,9,0,0,0,0,"[Translate to Dansk:] Offer #1",7,"tx_irretutorial_1nff_hotel",,0,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,514,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+,9,89,1,0,0,0,0,0,0,0,"Offer #1",6,"tx_testirreforeignfield_hotel",,0,,
+,10,89,1,0,1,9,0,0,0,0,"[Translate to Dansk:] Offer #1",7,"tx_testirreforeignfield_hotel",,0,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"093c0d6fb779e67f62011fa7c0d67437","tt_content",300,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",7,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1130084e4038e95f2d5806b731cd416a","tt_content",300,"l18n_parent",,,,0,0,"tt_content",299,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"29589c28b3f6979a757d467e0f180925","tx_irretutorial_1nff_hotel",7,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_hotel",6,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
 ,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"c5384f6e9469c07c2e90bca873d93cc1","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",6,,,,,,
-,"e1dcdb90066ed63c6e6eb1a88a9465d4","tx_irretutorial_1nff_offer",10,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_offer",9,,,,,,
-,"e9c09ac89f1212d5b15f3013e2cee2af","tx_irretutorial_1nff_hotel",7,"offers",,,,0,0,"tx_irretutorial_1nff_offer",10,,,,,,
-,"ec78ae01c0f6099f374b80d6740c1e7d","tx_irretutorial_1nff_hotel",6,"offers",,,,0,0,"tx_irretutorial_1nff_offer",9,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"0e39ecf7ad8b072a1b1fac05ac2dfd4c","tt_content",299,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",6,,,,,,
+,"77c47e123fc813a6b465fb99ab716357","tx_testirreforeignfield_hotel",6,"offers",,,,0,0,"tx_testirreforeignfield_offer",9,,,,,,
+,"1130084e4038e95f2d5806b731cd416a","tt_content",300,"l18n_parent",,,,0,0,"tt_content",299,,,,,,
+,"10d0276aaa8ab897fa1d1fb601b9628e","tt_content",300,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",7,,,,,,
+,"57786aaa4519b3e0fc9fe248562daef9","tx_testirreforeignfield_hotel",7,"l18n_parent",,,,0,0,"tx_testirreforeignfield_hotel",6,,,,,,
+,"f14125aa13e88b37c6e61a1714b26a6c","tx_testirreforeignfield_hotel",7,"offers",,,,0,0,"tx_testirreforeignfield_offer",10,,,,,,
+,"13a3a6fe638d72d8dc4516b32a115401","tx_testirreforeignfield_offer",10,"l18n_parent",,,,0,0,"tx_testirreforeignfield_offer",9,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/createParentContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/createParentContent.csv
index a6b3d6177766..f4ae1a7a2f96 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/createParentContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/createParentContent.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,47 +16,47 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
 ,299,89,128,0,0,0,0,0,0,0,"Testing #1",0,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","l18n_diffsource","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",
 ,2,89,1,0,0,0,,0,0,0,0,"Hotel #0",89,"pages",,0,
-,3,89,1,0,0,0,,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,
-,4,89,2,0,0,0,,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,
-,5,89,1,0,0,0,,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,
+,4,89,2,0,0,0,,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,
+,5,89,1,0,0,0,,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","l18n_diffsource","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",
-,5,89,1,0,0,0,,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,
-,6,89,2,0,0,0,,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,
-,7,89,1,0,0,0,,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,
-,8,89,1,0,0,0,,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,
+,6,89,2,0,0,0,,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,
+,7,89,1,0,0,0,,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,
+,8,89,1,0,0,0,,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","l18n_diffsource","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,
-,7,89,1,0,0,0,,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,
-,8,89,2,0,0,0,,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,
-,9,89,3,0,0,0,,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,
-,10,89,1,0,0,0,,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,
-,11,89,2,0,0,0,,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,
-,12,89,1,0,0,0,,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,
-,13,89,1,0,0,0,,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,
+,7,89,1,0,0,0,,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,
+,8,89,2,0,0,0,,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,
+,9,89,3,0,0,0,,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,
+,10,89,1,0,0,0,,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,
+,11,89,2,0,0,0,,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,
+,12,89,1,0,0,0,,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,
+,13,89,1,0,0,0,,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/createParentContentNHotelNOfferChildren.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/createParentContentNHotelNOfferChildren.csv
index e071b16cf1ee..7ade5724c77d 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/createParentContentNHotelNOfferChildren.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/createParentContentNHotelNOfferChildren.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,51 +16,51 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
 ,299,89,128,0,0,0,0,0,0,0,"Testing #1",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-,6,89,1,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+,6,89,1,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-,9,89,1,0,0,0,0,0,0,0,"Offer #1",6,"tx_irretutorial_1nff_hotel",,0,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+,9,89,1,0,0,0,0,0,0,0,"Offer #1",6,"tx_testirreforeignfield_hotel",,0,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"c5384f6e9469c07c2e90bca873d93cc1","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",6,,,,,,
-,"ec78ae01c0f6099f374b80d6740c1e7d","tx_irretutorial_1nff_hotel",6,"offers",,,,0,0,"tx_irretutorial_1nff_offer",9,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
+,"0e39ecf7ad8b072a1b1fac05ac2dfd4c","tt_content",299,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",6,,,,,,
+,"77c47e123fc813a6b465fb99ab716357","tx_testirreforeignfield_hotel",6,"offers",,,,0,0,"tx_testirreforeignfield_offer",9,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/deletePage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/deletePage.csv
index 63c13a897e58..6343105024ff 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/deletePage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/deletePage.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,1,0,0,0,0,"Relations",1,,,,,,,
@@ -16,30 +16,30 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,1,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,1,0,0,0,0,0,0,"Regular Element #2",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,1,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
 ,3,89,1,1,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
 ,4,89,2,1,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
 ,5,89,1,1,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,1,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,1,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,1,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,1,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,1,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,1,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,1,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,1,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,1,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,1,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,1,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,1,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,1,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,1,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,1,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,1,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,1,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,1,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,1,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,1,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,1,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,1,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
 ,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/deleteParentContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/deleteParentContent.csv
index 7db844229fe9..38aa8a52c3bf 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/deleteParentContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/deleteParentContent.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,43 +16,43 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,1,0,0,0,0,0,0,"Regular Element #2",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,1,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,1,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,1,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,1,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,1,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,1,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/localizeParentContentWAllChildren.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/localizeParentContentWAllChildren.csv
index 7c80bb8c4e2a..8dd420b4f87c 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/localizeParentContentWAllChildren.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/localizeParentContentWAllChildren.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -17,58 +17,58 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
 ,299,89,768,0,1,298,0,0,0,0,"[Translate to Dansk:] Regular Element #2",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,514,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-,6,89,1,0,1,5,0,0,0,0,"[Translate to Dansk:] Hotel #1",299,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,514,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+,6,89,1,0,1,5,0,0,0,0,"[Translate to Dansk:] Hotel #1",299,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,514,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-,9,89,1,0,1,8,0,0,0,0,"[Translate to Dansk:] Offer #1.1",6,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,514,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+,9,89,1,0,1,8,0,0,0,0,"[Translate to Dansk:] Offer #1.1",6,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,514,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,515,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,514,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
-,14,89,1,0,1,13,0,0,0,0,"[Translate to Dansk:] Price #1.1.1",9,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,514,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,515,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,514,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
+,14,89,1,0,1,13,0,0,0,0,"[Translate to Dansk:] Price #1.1.1",9,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"3c507bbfdad3f2a40b04073158fc600b","tx_irretutorial_1nff_price",14,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
 ,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
 ,"6dc66af7d395e5be3c87fc4e13c0455c","tt_content",299,"l18n_parent",,,,0,0,"tt_content",298,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"7588496c840cbdae5640fa2beac65eee","tx_irretutorial_1nff_hotel",6,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"c5384f6e9469c07c2e90bca873d93cc1","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",6,,,,,,
-,"d0754983bfe2639c6388e918c5c3c243","tx_irretutorial_1nff_offer",9,"prices",,,,0,0,"tx_irretutorial_1nff_price",14,,,,,,
-,"ec78ae01c0f6099f374b80d6740c1e7d","tx_irretutorial_1nff_hotel",6,"offers",,,,0,0,"tx_irretutorial_1nff_offer",9,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
-,"fade07fa18e8d5900a634120380ed421","tx_irretutorial_1nff_offer",9,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
+,"0e39ecf7ad8b072a1b1fac05ac2dfd4c","tt_content",299,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",6,,,,,,
+,"a6dffbdd6810a6de3d3af60ef770d04c","tx_testirreforeignfield_hotel",6,"l18n_parent",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"77c47e123fc813a6b465fb99ab716357","tx_testirreforeignfield_hotel",6,"offers",,,,0,0,"tx_testirreforeignfield_offer",9,,,,,,
+,"68e5c6a4c30b43e4e4ce2640c3caceb2","tx_testirreforeignfield_offer",9,"l18n_parent",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"35f57ab5ca24a48eaa8bcb96cbb3157a","tx_testirreforeignfield_offer",9,"prices",,,,0,0,"tx_testirreforeignfield_price",14,,,,,,
+,"b66adad459aa936c5af05fbd4c1637ac","tx_testirreforeignfield_price",14,"l18n_parent",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyNDiscardNModifyParentWHotelChild.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyNDiscardNModifyParentWHotelChild.csv
index 75a7ed50ed8d..c6f2dfddc622 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyNDiscardNModifyParentWHotelChild.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyNDiscardNModifyParentWHotelChild.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,46 +16,46 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Testing #2",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,0,0,0,0,0,0,0,"Testing #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,0,0,0,0,0,0,0,"Testing #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyOnlyHotelChild.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyOnlyHotelChild.csv
index e60ecf687de0..2873ccbbab01 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyOnlyHotelChild.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyOnlyHotelChild.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,46 +16,46 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,0,0,0,0,0,0,0,"Testing #1",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,0,0,0,0,0,0,0,"Testing #1",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyPage.csv
index 9222486d3c71..afaa8fa81001 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyPage.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Testing #1",1,,,,,,,
@@ -16,46 +16,46 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyParentContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyParentContent.csv
index 36ebb54cdfe9..766a2fe681aa 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyParentContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyParentContent.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,46 +16,46 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Testing #1",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyParentNAddHotelChild.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyParentNAddHotelChild.csv
index 0b17ed989ea2..acbc3607aee2 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyParentNAddHotelChild.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyParentNAddHotelChild.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,48 +16,48 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",2,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-,7,89,2,0,0,0,0,0,0,0,"Hotel #2",298,"tt_content",1nff.hotels,0,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+,7,89,2,0,0,0,0,0,0,0,"Hotel #2",298,"tt_content","1nff.hotels",0,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"3186356d41d5349c64afab914747c186","tt_content",298,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",7,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
+,"708e9637fba52252fd0b28cd3d2f1fd5","tt_content",298,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",7,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyParentNChangeHotelChildrenSorting.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyParentNChangeHotelChildrenSorting.csv
index 535eb93e34bb..16c97b36a8dc 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyParentNChangeHotelChildrenSorting.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyParentNChangeHotelChildrenSorting.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,46 +16,46 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,2,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,1,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,2,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,1,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"7bcc41134c060bfa73b90d3567ac49a2","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"d65e58ff32d9e5931e752c0d5fbf7ced","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
+,"065384c0060244f65c861635191c4601","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"f48173fd32b40982f84ce03c0df3781f","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",3,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyParentNDeleteHotelChild.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyParentNDeleteHotelChild.csv
index 3eb44caa1915..fa64d66ff042 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyParentNDeleteHotelChild.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyParentNDeleteHotelChild.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,43 +16,43 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",1,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,1,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,1,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,1,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,1,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,1,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,1,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyParentNHotelChild.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyParentNHotelChild.csv
index e60ecf687de0..2873ccbbab01 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyParentNHotelChild.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/modifyParentNHotelChild.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,46 +16,46 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,0,0,0,0,0,0,0,"Testing #1",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,0,0,0,0,0,0,0,"Testing #1",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/moveParentContentToDifferentPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/moveParentContentToDifferentPage.csv
index 414a11178ffb..76f5b46179d1 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/moveParentContentToDifferentPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/moveParentContentToDifferentPage.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,46 +16,46 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,90,256,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,90,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,90,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,90,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,90,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,90,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,90,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/moveParentContentToDifferentPageNChangeSorting.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/moveParentContentToDifferentPageNChangeSorting.csv
index a312bcfcb6f0..c8e20a8d8cad 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/moveParentContentToDifferentPageNChangeSorting.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/moveParentContentToDifferentPageNChangeSorting.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,46 +16,46 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,90,512,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,90,256,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,90,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,90,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,90,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,90,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,90,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,90,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,90,2,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,90,1,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,90,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,90,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,90,2,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,90,1,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,90,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,90,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,90,3,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,90,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,90,1,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,90,2,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,90,1,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,90,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,90,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
+,7,90,3,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,90,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,90,1,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,90,2,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,90,1,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,90,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,90,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"012118c645d3ac020e199670d725b319","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0a26995ccd926b97f9250843bc509ee5","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"c980c80b87d5b0f51ce5867ef09f693e","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"e47763798fbfb7fcd3f7cdd6044ba458","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"e65d656a77702a0312be9b7a39d8f197","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
-,"f689724283cc4a589c8ae3cddcb9cd72","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",9,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
+,"ecc35763bb87c6c6e91718f898892064","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"8f1a2e47e55fef75edcb595ed973f145","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0e4f97438a1a144e2918b4c4b9f1c40e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",11,,,,,,
+,"52b423989e351fcbdd256ce2ca27e875","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",10,,,,,,
+,"badc00640becc1104d56026d3c47d1fd","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",9,,,,,,
+,"1808d628a488bfe5ba18d6669f82c4ce","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",7,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/moveParentContentToDifferentPageTwice.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/moveParentContentToDifferentPageTwice.csv
index 4e3302a4a0ce..00deab036b63 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/moveParentContentToDifferentPageTwice.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/moveParentContentToDifferentPageTwice.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,46 +16,46 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,1,256,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,1,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,1,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,1,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,1,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,1,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,1,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/changeParentContentSorting.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/changeParentContentSorting.csv
index ddeac7ffe35f..ea6ce36a8caa 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/changeParentContentSorting.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/changeParentContentSorting.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,46 +16,46 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,768,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/copyPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/copyPage.csv
index f11ed46c79e4..1c2ffda5ec10 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/copyPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/copyPage.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -17,78 +17,78 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
 ,299,91,256,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
 ,300,91,128,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
 ,6,91,1,0,0,0,0,0,0,0,"Hotel #0",91,"pages",,0,,
-,7,91,513,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content",1nff.hotels,1,,
-,8,91,1,0,0,0,0,0,0,0,"Hotel #1",300,"tt_content",1nff.hotels,2,,
-,9,91,2,0,0,0,0,0,0,0,"Hotel #2",300,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,7,91,513,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content","1nff.hotels",1,,
+,8,91,1,0,0,0,0,0,0,0,"Hotel #1",300,"tt_content","1nff.hotels",2,,
+,9,91,2,0,0,0,0,0,0,0,"Hotel #2",300,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-,9,91,513,0,0,0,0,0,0,0,"Offer #1.1",7,"tx_irretutorial_1nff_hotel",,1,,
-,10,91,1,0,0,0,0,0,0,0,"Offer #1.1",8,"tx_irretutorial_1nff_hotel",,3,,
-,11,91,2,0,0,0,0,0,0,0,"Offer #1.2",8,"tx_irretutorial_1nff_hotel",,2,,
-,12,91,1,0,0,0,0,0,0,0,"Offer #2.1",9,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+,9,91,513,0,0,0,0,0,0,0,"Offer #1.1",7,"tx_testirreforeignfield_hotel",,1,,
+,10,91,1,0,0,0,0,0,0,0,"Offer #1.1",8,"tx_testirreforeignfield_hotel",,3,,
+,11,91,2,0,0,0,0,0,0,0,"Offer #1.2",8,"tx_testirreforeignfield_hotel",,2,,
+,12,91,1,0,0,0,0,0,0,0,"Offer #2.1",9,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
-,14,91,1025,0,0,0,0,0,0,0,"Price #1.1.1",9,"tx_irretutorial_1nff_offer",,,,
-,15,91,513,0,0,0,0,0,0,0,"Price #1.1.1",10,"tx_irretutorial_1nff_offer",,,,
-,16,91,514,0,0,0,0,0,0,0,"Price #1.1.2",10,"tx_irretutorial_1nff_offer",,,,
-,17,91,515,0,0,0,0,0,0,0,"Price #1.1.3",10,"tx_irretutorial_1nff_offer",,,,
-,18,91,1,0,0,0,0,0,0,0,"Price #1.2.1",11,"tx_irretutorial_1nff_offer",,,,
-,19,91,2,0,0,0,0,0,0,0,"Price #1.2.2",11,"tx_irretutorial_1nff_offer",,,,
-,20,91,1,0,0,0,0,0,0,0,"Price #2.1.1",12,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
+,14,91,1025,0,0,0,0,0,0,0,"Price #1.1.1",9,"tx_testirreforeignfield_offer",,,,
+,15,91,513,0,0,0,0,0,0,0,"Price #1.1.1",10,"tx_testirreforeignfield_offer",,,,
+,16,91,514,0,0,0,0,0,0,0,"Price #1.1.2",10,"tx_testirreforeignfield_offer",,,,
+,17,91,515,0,0,0,0,0,0,0,"Price #1.1.3",10,"tx_testirreforeignfield_offer",,,,
+,18,91,1,0,0,0,0,0,0,0,"Price #1.2.1",11,"tx_testirreforeignfield_offer",,,,
+,19,91,2,0,0,0,0,0,0,0,"Price #1.2.2",11,"tx_testirreforeignfield_offer",,,,
+,20,91,1,0,0,0,0,0,0,0,"Price #2.1.1",12,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"266accee962e071564b66166bb002874","pages",91,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",6,,,,,,
-,"277fb6f278dc9c056e0f3164f5e1778e","tx_irretutorial_1nff_offer",10,"prices",,,,0,0,"tx_irretutorial_1nff_price",15,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"3995c1d3a93d3ab38867852371e720e1","tx_irretutorial_1nff_hotel",9,"offers",,,,0,0,"tx_irretutorial_1nff_offer",12,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"494d75b7b111aa689d15a5c4108ddd0d","tx_irretutorial_1nff_offer",11,"prices",,,,0,0,"tx_irretutorial_1nff_price",18,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"67250ca82106f786e14f2b90f5a5da7d","tt_content",300,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",8,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"7adf68410be27466611b7e3e97ee6aa6","tx_irretutorial_1nff_offer",11,"prices",,,,1,0,"tx_irretutorial_1nff_price",19,,,,,,
-,"8383c20f5ece68a05f4e73423ceb4f69","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",7,,,,,,
-,"8c2094cd97152334826cfac5852aa42a","tx_irretutorial_1nff_offer",12,"prices",,,,0,0,"tx_irretutorial_1nff_price",20,,,,,,
-,"92e2c9f4ee5e5b6c608d2c980bc4d78f","tx_irretutorial_1nff_hotel",7,"offers",,,,0,0,"tx_irretutorial_1nff_offer",9,,,,,,
-,"a5c771c375921fe4bfb06c5027fbdd51","tx_irretutorial_1nff_offer",10,"prices",,,,1,0,"tx_irretutorial_1nff_price",16,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b58f0a6489ee99de86faac0511db39ba","tt_content",300,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",9,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"cefb86725658b810bea751e1ac3648a3","tx_irretutorial_1nff_offer",10,"prices",,,,2,0,"tx_irretutorial_1nff_price",17,,,,,,
-,"d0754983bfe2639c6388e918c5c3c243","tx_irretutorial_1nff_offer",9,"prices",,,,0,0,"tx_irretutorial_1nff_price",14,,,,,,
-,"e5fa041e279d04dab69ade17128a9243","tx_irretutorial_1nff_hotel",8,"offers",,,,1,0,"tx_irretutorial_1nff_offer",11,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
-,"efcb05dc035086f96053ec60f68186b6","tx_irretutorial_1nff_hotel",8,"offers",,,,0,0,"tx_irretutorial_1nff_offer",10,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"acbf104c3fcdb85a80b6f1c62213f1b2","tt_content",300,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",8,,,,,,
+,"694641347c205cba5f6284af4983e210","tt_content",300,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",9,,,,,,
+,"3a3ac66303c3333d24712b1f0dbae733","tt_content",299,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",7,,,,,,
+,"55682ad5fbb3cd4af94822337cdecddf","tx_testirreforeignfield_hotel",8,"offers",,,,0,0,"tx_testirreforeignfield_offer",10,,,,,,
+,"67b4d111498f9949044f6ad1b5f954e0","tx_testirreforeignfield_hotel",8,"offers",,,,1,0,"tx_testirreforeignfield_offer",11,,,,,,
+,"caea1dd8a2d11243f920cf60ad54a65b","tx_testirreforeignfield_hotel",9,"offers",,,,0,0,"tx_testirreforeignfield_offer",12,,,,,,
+,"c5bf340feb4639d5d8f687186b805902","tx_testirreforeignfield_hotel",7,"offers",,,,0,0,"tx_testirreforeignfield_offer",9,,,,,,
+,"0b8d08bb967f60d9231811f97c47151d","tx_testirreforeignfield_offer",10,"prices",,,,0,0,"tx_testirreforeignfield_price",15,,,,,,
+,"e5702e604310bb04bd9291394bd7b560","tx_testirreforeignfield_offer",10,"prices",,,,1,0,"tx_testirreforeignfield_price",16,,,,,,
+,"ffbd17bd4d58ee80e875b5cdd30ab3cf","tx_testirreforeignfield_offer",10,"prices",,,,2,0,"tx_testirreforeignfield_price",17,,,,,,
+,"ca9d3af43d483d6d235eae7946e91476","tx_testirreforeignfield_offer",11,"prices",,,,0,0,"tx_testirreforeignfield_price",18,,,,,,
+,"14dd08b537108dba2bb1fd3f783a5364","tx_testirreforeignfield_offer",11,"prices",,,,1,0,"tx_testirreforeignfield_price",19,,,,,,
+,"7b83a005a2ce92576cdca33948fcac83","tx_testirreforeignfield_offer",12,"prices",,,,0,0,"tx_testirreforeignfield_price",20,,,,,,
+,"35f57ab5ca24a48eaa8bcb96cbb3157a","tx_testirreforeignfield_offer",9,"prices",,,,0,0,"tx_testirreforeignfield_price",14,,,,,,
+,"f8ab061425b734a86ef5e35ad4a51fe7","pages",91,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",6,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/copyPageWHotelBeforeParentContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/copyPageWHotelBeforeParentContent.csv
index 90a9ddd59923..fcf3e2f0df54 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/copyPageWHotelBeforeParentContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/copyPageWHotelBeforeParentContent.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -17,78 +17,78 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
 ,299,91,256,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
 ,300,91,128,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
 ,6,91,1,0,0,0,0,0,0,0,"Hotel #0",91,"pages",,0,,
-,7,91,2,0,0,0,0,0,0,0,"Hotel #2",300,"tt_content",1nff.hotels,1,,
-,8,91,1,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content",1nff.hotels,1,,
-,9,91,1,0,0,0,0,0,0,0,"Hotel #1",300,"tt_content",1nff.hotels,2,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,7,91,2,0,0,0,0,0,0,0,"Hotel #2",300,"tt_content","1nff.hotels",1,,
+,8,91,1,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content","1nff.hotels",1,,
+,9,91,1,0,0,0,0,0,0,0,"Hotel #1",300,"tt_content","1nff.hotels",2,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-,9,91,513,0,0,0,0,0,0,0,"Offer #2.1",7,"tx_irretutorial_1nff_hotel",,1,,
-,10,91,513,0,0,0,0,0,0,0,"Offer #1.1",8,"tx_irretutorial_1nff_hotel",,1,,
-,11,91,1,0,0,0,0,0,0,0,"Offer #1.1",9,"tx_irretutorial_1nff_hotel",,3,,
-,12,91,2,0,0,0,0,0,0,0,"Offer #1.2",9,"tx_irretutorial_1nff_hotel",,2,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+,9,91,513,0,0,0,0,0,0,0,"Offer #2.1",7,"tx_testirreforeignfield_hotel",,1,,
+,10,91,513,0,0,0,0,0,0,0,"Offer #1.1",8,"tx_testirreforeignfield_hotel",,1,,
+,11,91,1,0,0,0,0,0,0,0,"Offer #1.1",9,"tx_testirreforeignfield_hotel",,3,,
+,12,91,2,0,0,0,0,0,0,0,"Offer #1.2",9,"tx_testirreforeignfield_hotel",,2,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
-,14,91,1025,0,0,0,0,0,0,0,"Price #2.1.1",9,"tx_irretutorial_1nff_offer",,,,
-,15,91,1025,0,0,0,0,0,0,0,"Price #1.1.1",10,"tx_irretutorial_1nff_offer",,,,
-,16,91,513,0,0,0,0,0,0,0,"Price #1.1.1",11,"tx_irretutorial_1nff_offer",,,,
-,17,91,514,0,0,0,0,0,0,0,"Price #1.1.2",11,"tx_irretutorial_1nff_offer",,,,
-,18,91,515,0,0,0,0,0,0,0,"Price #1.1.3",11,"tx_irretutorial_1nff_offer",,,,
-,19,91,1,0,0,0,0,0,0,0,"Price #1.2.1",12,"tx_irretutorial_1nff_offer",,,,
-,20,91,2,0,0,0,0,0,0,0,"Price #1.2.2",12,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
+,14,91,1025,0,0,0,0,0,0,0,"Price #2.1.1",9,"tx_testirreforeignfield_offer",,,,
+,15,91,1025,0,0,0,0,0,0,0,"Price #1.1.1",10,"tx_testirreforeignfield_offer",,,,
+,16,91,513,0,0,0,0,0,0,0,"Price #1.1.1",11,"tx_testirreforeignfield_offer",,,,
+,17,91,514,0,0,0,0,0,0,0,"Price #1.1.2",11,"tx_testirreforeignfield_offer",,,,
+,18,91,515,0,0,0,0,0,0,0,"Price #1.1.3",11,"tx_testirreforeignfield_offer",,,,
+,19,91,1,0,0,0,0,0,0,0,"Price #1.2.1",12,"tx_testirreforeignfield_offer",,,,
+,20,91,2,0,0,0,0,0,0,0,"Price #1.2.2",12,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0287e2b2358f2147cb04e4fb99de0177","tx_irretutorial_1nff_offer",11,"prices",,,,2,0,"tx_irretutorial_1nff_price",18,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"266accee962e071564b66166bb002874","pages",91,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",6,,,,,,
-,"277fb6f278dc9c056e0f3164f5e1778e","tx_irretutorial_1nff_offer",10,"prices",,,,0,0,"tx_irretutorial_1nff_price",15,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"2f2735c4a73595aab6529ef3707cb7f7","tx_irretutorial_1nff_offer",12,"prices",,,,0,0,"tx_irretutorial_1nff_price",19,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"3e90e7e724dd19e513c0c77537e839b4","tx_irretutorial_1nff_offer",11,"prices",,,,0,0,"tx_irretutorial_1nff_price",16,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4b1ccfa85b39745dff0411669a3aeb3d","tx_irretutorial_1nff_hotel",9,"offers",,,,1,0,"tx_irretutorial_1nff_offer",12,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"5a46903a1a99f3fd2e8291773be81ede","tx_irretutorial_1nff_offer",12,"prices",,,,1,0,"tx_irretutorial_1nff_price",20,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"8b05d52ad547d77bf8849a29bb3250ec","tt_content",300,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",7,,,,,,
-,"8db06fba0cca9fab411ce74e5714f130","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",8,,,,,,
-,"92e2c9f4ee5e5b6c608d2c980bc4d78f","tx_irretutorial_1nff_hotel",7,"offers",,,,0,0,"tx_irretutorial_1nff_offer",9,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"cf0d8528c173dcf0a7234125c40eb55e","tx_irretutorial_1nff_hotel",9,"offers",,,,0,0,"tx_irretutorial_1nff_offer",11,,,,,,
-,"d0754983bfe2639c6388e918c5c3c243","tx_irretutorial_1nff_offer",9,"prices",,,,0,0,"tx_irretutorial_1nff_price",14,,,,,,
-,"df7ed731cbc1c55ae79e4062e820c1ef","tx_irretutorial_1nff_offer",11,"prices",,,,1,0,"tx_irretutorial_1nff_price",17,,,,,,
-,"e18495622afd6ab187bff503a828ab76","tt_content",300,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",9,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
-,"efcb05dc035086f96053ec60f68186b6","tx_irretutorial_1nff_hotel",8,"offers",,,,0,0,"tx_irretutorial_1nff_offer",10,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"2bfc9f92dab0d028a88b306e234655b0","tt_content",299,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",8,,,,,,
+,"a1c199aed25931c7cef60e0c6a823754","tt_content",300,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",9,,,,,,
+,"aa0aa0a7f964cebd105633b45f7aae1f","tt_content",300,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",7,,,,,,
+,"55682ad5fbb3cd4af94822337cdecddf","tx_testirreforeignfield_hotel",8,"offers",,,,0,0,"tx_testirreforeignfield_offer",10,,,,,,
+,"f446b28bf394621f555a351e502c2af9","tx_testirreforeignfield_hotel",9,"offers",,,,0,0,"tx_testirreforeignfield_offer",11,,,,,,
+,"b0751056ffc84e267082cc2a40f83526","tx_testirreforeignfield_hotel",9,"offers",,,,1,0,"tx_testirreforeignfield_offer",12,,,,,,
+,"c5bf340feb4639d5d8f687186b805902","tx_testirreforeignfield_hotel",7,"offers",,,,0,0,"tx_testirreforeignfield_offer",9,,,,,,
+,"0b8d08bb967f60d9231811f97c47151d","tx_testirreforeignfield_offer",10,"prices",,,,0,0,"tx_testirreforeignfield_price",15,,,,,,
+,"93cf9871381a2435ac586d6a83b801ea","tx_testirreforeignfield_offer",11,"prices",,,,0,0,"tx_testirreforeignfield_price",16,,,,,,
+,"83b07d829d4644ced152f2e9864e60a8","tx_testirreforeignfield_offer",11,"prices",,,,1,0,"tx_testirreforeignfield_price",17,,,,,,
+,"63b348bb5e945c73040c5ef9dfccaf41","tx_testirreforeignfield_offer",11,"prices",,,,2,0,"tx_testirreforeignfield_price",18,,,,,,
+,"1c9c86aa9a280f8a8ee4c6a1e805d32d","tx_testirreforeignfield_offer",12,"prices",,,,0,0,"tx_testirreforeignfield_price",19,,,,,,
+,"a0e38dc3b2ac949896282c27ef082142","tx_testirreforeignfield_offer",12,"prices",,,,1,0,"tx_testirreforeignfield_price",20,,,,,,
+,"35f57ab5ca24a48eaa8bcb96cbb3157a","tx_testirreforeignfield_offer",9,"prices",,,,0,0,"tx_testirreforeignfield_price",14,,,,,,
+,"f8ab061425b734a86ef5e35ad4a51fe7","pages",91,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",6,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/copyParentContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/copyParentContent.csv
index 0bf85c412ad9..845532a9299c 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/copyParentContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/copyParentContent.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,53 +16,53 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
 ,299,89,128,0,0,0,0,0,0,0,"Regular Element #2 (copy 1)",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-,6,89,1,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+,6,89,1,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-,9,89,1,0,0,0,0,0,0,0,"Offer #1.1",6,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+,9,89,1,0,0,0,0,0,0,0,"Offer #1.1",6,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
-,14,89,1,0,0,0,0,0,0,0,"Price #1.1.1",9,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
+,14,89,1,0,0,0,0,0,0,0,"Price #1.1.1",9,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"c5384f6e9469c07c2e90bca873d93cc1","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",6,,,,,,
-,"d0754983bfe2639c6388e918c5c3c243","tx_irretutorial_1nff_offer",9,"prices",,,,0,0,"tx_irretutorial_1nff_price",14,,,,,,
-,"ec78ae01c0f6099f374b80d6740c1e7d","tx_irretutorial_1nff_hotel",6,"offers",,,,0,0,"tx_irretutorial_1nff_offer",9,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"0e39ecf7ad8b072a1b1fac05ac2dfd4c","tt_content",299,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",6,,,,,,
+,"77c47e123fc813a6b465fb99ab716357","tx_testirreforeignfield_hotel",6,"offers",,,,0,0,"tx_testirreforeignfield_offer",9,,,,,,
+,"35f57ab5ca24a48eaa8bcb96cbb3157a","tx_testirreforeignfield_offer",9,"prices",,,,0,0,"tx_testirreforeignfield_price",14,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/copyParentContentToDifferentPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/copyParentContentToDifferentPage.csv
index 862c2c0a65c6..3fef777ad110 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/copyParentContentToDifferentPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/copyParentContentToDifferentPage.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,53 +16,53 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
 ,299,90,256,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-,6,90,1,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+,6,90,1,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-,9,90,1,0,0,0,0,0,0,0,"Offer #1.1",6,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+,9,90,1,0,0,0,0,0,0,0,"Offer #1.1",6,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
-,14,90,1,0,0,0,0,0,0,0,"Price #1.1.1",9,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
+,14,90,1,0,0,0,0,0,0,0,"Price #1.1.1",9,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"c5384f6e9469c07c2e90bca873d93cc1","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",6,,,,,,
-,"d0754983bfe2639c6388e918c5c3c243","tx_irretutorial_1nff_offer",9,"prices",,,,0,0,"tx_irretutorial_1nff_price",14,,,,,,
-,"ec78ae01c0f6099f374b80d6740c1e7d","tx_irretutorial_1nff_hotel",6,"offers",,,,0,0,"tx_irretutorial_1nff_offer",9,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"0e39ecf7ad8b072a1b1fac05ac2dfd4c","tt_content",299,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",6,,,,,,
+,"77c47e123fc813a6b465fb99ab716357","tx_testirreforeignfield_hotel",6,"offers",,,,0,0,"tx_testirreforeignfield_offer",9,,,,,,
+,"35f57ab5ca24a48eaa8bcb96cbb3157a","tx_testirreforeignfield_offer",9,"prices",,,,0,0,"tx_testirreforeignfield_price",14,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/createNCopyParentContentNHotelNOfferChildren.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/createNCopyParentContentNHotelNOfferChildren.csv
index 5f629bfc2546..91aa6f1e0cf7 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/createNCopyParentContentNHotelNOfferChildren.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/createNCopyParentContentNHotelNOfferChildren.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,56 +16,56 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
 ,299,89,128,0,0,0,0,0,0,0,"Testing #1",1,,,,,
 ,300,89,64,0,0,0,0,0,0,0,"Testing #1 (copy 1)",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-,6,89,1,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content",1nff.hotels,1,,
-,7,89,1,0,0,0,0,0,0,0,"Hotel #1",300,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+,6,89,1,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content","1nff.hotels",1,,
+,7,89,1,0,0,0,0,0,0,0,"Hotel #1",300,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-,9,89,1,0,0,0,0,0,0,0,"Offer #1",6,"tx_irretutorial_1nff_hotel",,0,,
-,10,89,1,0,0,0,0,0,0,0,"Offer #1",7,"tx_irretutorial_1nff_hotel",,0,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+,9,89,1,0,0,0,0,0,0,0,"Offer #1",6,"tx_testirreforeignfield_hotel",,0,,
+,10,89,1,0,0,0,0,0,0,0,"Offer #1",7,"tx_testirreforeignfield_hotel",,0,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"093c0d6fb779e67f62011fa7c0d67437","tt_content",300,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",7,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"c5384f6e9469c07c2e90bca873d93cc1","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",6,,,,,,
-,"e9c09ac89f1212d5b15f3013e2cee2af","tx_irretutorial_1nff_hotel",7,"offers",,,,0,0,"tx_irretutorial_1nff_offer",10,,,,,,
-,"ec78ae01c0f6099f374b80d6740c1e7d","tx_irretutorial_1nff_hotel",6,"offers",,,,0,0,"tx_irretutorial_1nff_offer",9,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"10d0276aaa8ab897fa1d1fb601b9628e","tt_content",300,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",7,,,,,,
+,"0e39ecf7ad8b072a1b1fac05ac2dfd4c","tt_content",299,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",6,,,,,,
+,"f14125aa13e88b37c6e61a1714b26a6c","tx_testirreforeignfield_hotel",7,"offers",,,,0,0,"tx_testirreforeignfield_offer",10,,,,,,
+,"77c47e123fc813a6b465fb99ab716357","tx_testirreforeignfield_hotel",6,"offers",,,,0,0,"tx_testirreforeignfield_offer",9,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
index 2c6605eb6101..23bd82eb096b 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/createNLocalizeParentContentNHotelNOfferChildren.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -17,60 +17,60 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
 ,299,89,128,0,0,0,0,0,0,0,"Testing #1",1,,,,,
 ,300,89,192,0,1,299,0,0,0,0,"[Translate to Dansk:] Testing #1",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,514,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-,6,89,1,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content",1nff.hotels,1,,
-,7,89,1,0,1,6,0,0,0,0,"[Translate to Dansk:] Hotel #1",300,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,514,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+,6,89,1,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content","1nff.hotels",1,,
+,7,89,1,0,1,6,0,0,0,0,"[Translate to Dansk:] Hotel #1",300,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,514,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-,9,89,1,0,0,0,0,0,0,0,"Offer #1",6,"tx_irretutorial_1nff_hotel",,0,,
-,10,89,1,0,1,9,0,0,0,0,"[Translate to Dansk:] Offer #1",7,"tx_irretutorial_1nff_hotel",,0,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,514,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+,9,89,1,0,0,0,0,0,0,0,"Offer #1",6,"tx_testirreforeignfield_hotel",,0,,
+,10,89,1,0,1,9,0,0,0,0,"[Translate to Dansk:] Offer #1",7,"tx_testirreforeignfield_hotel",,0,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
+,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
 ,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"093c0d6fb779e67f62011fa7c0d67437","tt_content",300,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",7,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
 ,"1130084e4038e95f2d5806b731cd416a","tt_content",300,"l18n_parent",,,,0,0,"tt_content",299,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
-,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"29589c28b3f6979a757d467e0f180925","tx_irretutorial_1nff_hotel",7,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_hotel",6,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
+,"10d0276aaa8ab897fa1d1fb601b9628e","tt_content",300,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",7,,,,,,
+,"0e39ecf7ad8b072a1b1fac05ac2dfd4c","tt_content",299,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",6,,,,,,
+,"57786aaa4519b3e0fc9fe248562daef9","tx_testirreforeignfield_hotel",7,"l18n_parent",,,,0,0,"tx_testirreforeignfield_hotel",6,,,,,,
+,"f14125aa13e88b37c6e61a1714b26a6c","tx_testirreforeignfield_hotel",7,"offers",,,,0,0,"tx_testirreforeignfield_offer",10,,,,,,
+,"77c47e123fc813a6b465fb99ab716357","tx_testirreforeignfield_hotel",6,"offers",,,,0,0,"tx_testirreforeignfield_offer",9,,,,,,
+,"13a3a6fe638d72d8dc4516b32a115401","tx_testirreforeignfield_offer",10,"l18n_parent",,,,0,0,"tx_testirreforeignfield_offer",9,,,,,,
 ,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"c5384f6e9469c07c2e90bca873d93cc1","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",6,,,,,,
-,"e1dcdb90066ed63c6e6eb1a88a9465d4","tx_irretutorial_1nff_offer",10,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_offer",9,,,,,,
-,"e9c09ac89f1212d5b15f3013e2cee2af","tx_irretutorial_1nff_hotel",7,"offers",,,,0,0,"tx_irretutorial_1nff_offer",10,,,,,,
-,"ec78ae01c0f6099f374b80d6740c1e7d","tx_irretutorial_1nff_hotel",6,"offers",,,,0,0,"tx_irretutorial_1nff_offer",9,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/createParentContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/createParentContent.csv
index a6b3d6177766..155941accf0e 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/createParentContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/createParentContent.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,47 +16,47 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
 ,299,89,128,0,0,0,0,0,0,0,"Testing #1",0,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","l18n_diffsource","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",
 ,2,89,1,0,0,0,,0,0,0,0,"Hotel #0",89,"pages",,0,
-,3,89,1,0,0,0,,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,
-,4,89,2,0,0,0,,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,
-,5,89,1,0,0,0,,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,
+,4,89,2,0,0,0,,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,
+,5,89,1,0,0,0,,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","l18n_diffsource","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",
-,5,89,1,0,0,0,,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,
-,6,89,2,0,0,0,,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,
-,7,89,1,0,0,0,,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,
-,8,89,1,0,0,0,,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,
+,6,89,2,0,0,0,,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,
+,7,89,1,0,0,0,,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,
+,8,89,1,0,0,0,,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","l18n_diffsource","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,
-,7,89,1,0,0,0,,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,
-,8,89,2,0,0,0,,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,
-,9,89,3,0,0,0,,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,
-,10,89,1,0,0,0,,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,
-,11,89,2,0,0,0,,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,
-,12,89,1,0,0,0,,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,
-,13,89,1,0,0,0,,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,
+,7,89,1,0,0,0,,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,
+,8,89,2,0,0,0,,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,
+,9,89,3,0,0,0,,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,
+,10,89,1,0,0,0,,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,
+,11,89,2,0,0,0,,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,
+,12,89,1,0,0,0,,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,
+,13,89,1,0,0,0,,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/createParentContentNHotelNOfferChildren.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/createParentContentNHotelNOfferChildren.csv
index e071b16cf1ee..95fe5664e4a4 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/createParentContentNHotelNOfferChildren.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/createParentContentNHotelNOfferChildren.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,51 +16,51 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
 ,299,89,128,0,0,0,0,0,0,0,"Testing #1",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-,6,89,1,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+,6,89,1,0,0,0,0,0,0,0,"Hotel #1",299,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-,9,89,1,0,0,0,0,0,0,0,"Offer #1",6,"tx_irretutorial_1nff_hotel",,0,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+,9,89,1,0,0,0,0,0,0,0,"Offer #1",6,"tx_testirreforeignfield_hotel",,0,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"c5384f6e9469c07c2e90bca873d93cc1","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",6,,,,,,
-,"ec78ae01c0f6099f374b80d6740c1e7d","tx_irretutorial_1nff_hotel",6,"offers",,,,0,0,"tx_irretutorial_1nff_offer",9,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"0e39ecf7ad8b072a1b1fac05ac2dfd4c","tt_content",299,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",6,,,,,,
+,"77c47e123fc813a6b465fb99ab716357","tx_testirreforeignfield_hotel",6,"offers",,,,0,0,"tx_testirreforeignfield_offer",9,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/deletePage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/deletePage.csv
index 63c13a897e58..6343105024ff 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/deletePage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/deletePage.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,1,0,0,0,0,"Relations",1,,,,,,,
@@ -16,30 +16,30 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,1,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,1,0,0,0,0,0,0,"Regular Element #2",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,1,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
 ,3,89,1,1,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
 ,4,89,2,1,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
 ,5,89,1,1,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,1,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,1,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,1,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,1,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,1,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,1,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,1,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,1,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,1,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,1,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,1,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,1,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,1,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,1,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,1,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,1,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,1,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,1,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,1,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,1,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,1,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,1,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
 ,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/deleteParentContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/deleteParentContent.csv
index 7db844229fe9..38aa8a52c3bf 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/deleteParentContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/deleteParentContent.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,43 +16,43 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,1,0,0,0,0,0,0,"Regular Element #2",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,1,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,1,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,1,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,1,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,1,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,1,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/localizeParentContentWAllChildren.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/localizeParentContentWAllChildren.csv
index 7c80bb8c4e2a..29dfc3c318f5 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/localizeParentContentWAllChildren.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/localizeParentContentWAllChildren.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -17,58 +17,58 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
 ,299,89,768,0,1,298,0,0,0,0,"[Translate to Dansk:] Regular Element #2",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,514,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-,6,89,1,0,1,5,0,0,0,0,"[Translate to Dansk:] Hotel #1",299,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,514,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+,6,89,1,0,1,5,0,0,0,0,"[Translate to Dansk:] Hotel #1",299,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,514,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-,9,89,1,0,1,8,0,0,0,0,"[Translate to Dansk:] Offer #1.1",6,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,514,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+,9,89,1,0,1,8,0,0,0,0,"[Translate to Dansk:] Offer #1.1",6,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,514,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,515,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,514,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
-,14,89,1,0,1,13,0,0,0,0,"[Translate to Dansk:] Price #1.1.1",9,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,514,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,515,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,514,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
+,14,89,1,0,1,13,0,0,0,0,"[Translate to Dansk:] Price #1.1.1",9,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"3c507bbfdad3f2a40b04073158fc600b","tx_irretutorial_1nff_price",14,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
 ,"6dc66af7d395e5be3c87fc4e13c0455c","tt_content",299,"l18n_parent",,,,0,0,"tt_content",298,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"7588496c840cbdae5640fa2beac65eee","tx_irretutorial_1nff_hotel",6,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"c5384f6e9469c07c2e90bca873d93cc1","tt_content",299,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",6,,,,,,
-,"d0754983bfe2639c6388e918c5c3c243","tx_irretutorial_1nff_offer",9,"prices",,,,0,0,"tx_irretutorial_1nff_price",14,,,,,,
-,"ec78ae01c0f6099f374b80d6740c1e7d","tx_irretutorial_1nff_hotel",6,"offers",,,,0,0,"tx_irretutorial_1nff_offer",9,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
-,"fade07fa18e8d5900a634120380ed421","tx_irretutorial_1nff_offer",9,"l18n_parent",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
+,"0e39ecf7ad8b072a1b1fac05ac2dfd4c","tt_content",299,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",6,,,,,,
+,"a6dffbdd6810a6de3d3af60ef770d04c","tx_testirreforeignfield_hotel",6,"l18n_parent",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"77c47e123fc813a6b465fb99ab716357","tx_testirreforeignfield_hotel",6,"offers",,,,0,0,"tx_testirreforeignfield_offer",9,,,,,,
+,"68e5c6a4c30b43e4e4ce2640c3caceb2","tx_testirreforeignfield_offer",9,"l18n_parent",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"35f57ab5ca24a48eaa8bcb96cbb3157a","tx_testirreforeignfield_offer",9,"prices",,,,0,0,"tx_testirreforeignfield_price",14,,,,,,
+,"b66adad459aa936c5af05fbd4c1637ac","tx_testirreforeignfield_price",14,"l18n_parent",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
+,"583b9974d1df1d9efb695cdabfe53a73","pages",91,"l10n_parent",,,,0,0,"pages",89,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyNDiscardNModifyParentWHotelChild.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyNDiscardNModifyParentWHotelChild.csv
index 75a7ed50ed8d..c6f2dfddc622 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyNDiscardNModifyParentWHotelChild.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyNDiscardNModifyParentWHotelChild.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,46 +16,46 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Testing #2",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,0,0,0,0,0,0,0,"Testing #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,0,0,0,0,0,0,0,"Testing #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyOnlyHotelChild.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyOnlyHotelChild.csv
index e60ecf687de0..0b4c3a28c1ad 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyOnlyHotelChild.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyOnlyHotelChild.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,46 +16,46 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,0,0,0,0,0,0,0,"Testing #1",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,0,0,0,0,0,0,0,"Testing #1",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyPage.csv
index 9222486d3c71..44ec4450d0fe 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyPage.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Testing #1",1,,,,,,,
@@ -16,46 +16,46 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyParentContent.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyParentContent.csv
index 36ebb54cdfe9..766a2fe681aa 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyParentContent.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyParentContent.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,46 +16,46 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Testing #1",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyParentNAddHotelChild.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyParentNAddHotelChild.csv
index 0b17ed989ea2..df673fd5e458 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyParentNAddHotelChild.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyParentNAddHotelChild.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,48 +16,48 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",2,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-,7,89,2,0,0,0,0,0,0,0,"Hotel #2",298,"tt_content",1nff.hotels,0,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+,7,89,2,0,0,0,0,0,0,0,"Hotel #2",298,"tt_content","1nff.hotels",0,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"3186356d41d5349c64afab914747c186","tt_content",298,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",7,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"708e9637fba52252fd0b28cd3d2f1fd5","tt_content",298,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",7,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyParentNChangeHotelChildrenSorting.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyParentNChangeHotelChildrenSorting.csv
index 535eb93e34bb..9794d32bc8a4 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyParentNChangeHotelChildrenSorting.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyParentNChangeHotelChildrenSorting.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,46 +16,46 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,2,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,1,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,2,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,1,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"7bcc41134c060bfa73b90d3567ac49a2","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"d65e58ff32d9e5931e752c0d5fbf7ced","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"065384c0060244f65c861635191c4601","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"f48173fd32b40982f84ce03c0df3781f","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",3,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyParentNDeleteHotelChild.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyParentNDeleteHotelChild.csv
index 3eb44caa1915..fa64d66ff042 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyParentNDeleteHotelChild.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyParentNDeleteHotelChild.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,43 +16,43 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",1,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,1,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,1,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,1,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,1,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,1,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,1,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyParentNHotelChild.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyParentNHotelChild.csv
index e60ecf687de0..0b4c3a28c1ad 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyParentNHotelChild.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/modifyParentNHotelChild.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,46 +16,46 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,0,0,0,0,0,0,0,"Testing #1",297,"tt_content",1nff.hotels,1,,
-,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,0,0,0,0,0,0,0,"Testing #1",297,"tt_content","1nff.hotels",1,,
+,5,89,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,89,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,89,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/moveParentContentToDifferentPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/moveParentContentToDifferentPage.csv
index 414a11178ffb..0df04ce31dd6 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/moveParentContentToDifferentPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/moveParentContentToDifferentPage.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,46 +16,46 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,90,256,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,90,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,90,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,90,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,90,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,90,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,90,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/moveParentContentToDifferentPageNChangeSorting.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/moveParentContentToDifferentPageNChangeSorting.csv
index a312bcfcb6f0..c8e20a8d8cad 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/moveParentContentToDifferentPageNChangeSorting.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/moveParentContentToDifferentPageNChangeSorting.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,46 +16,46 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,90,512,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,90,256,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,90,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,90,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,90,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,90,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,90,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,90,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,90,2,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,90,1,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,90,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,90,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,90,2,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,90,1,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,90,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,90,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,90,3,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,90,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,90,1,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,90,2,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,90,1,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,90,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,90,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
+,7,90,3,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,90,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,90,1,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,90,2,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,90,1,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,90,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,90,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"012118c645d3ac020e199670d725b319","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0a26995ccd926b97f9250843bc509ee5","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"c980c80b87d5b0f51ce5867ef09f693e","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"e47763798fbfb7fcd3f7cdd6044ba458","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"e65d656a77702a0312be9b7a39d8f197","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
-,"f689724283cc4a589c8ae3cddcb9cd72","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",9,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
+,"ecc35763bb87c6c6e91718f898892064","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"8f1a2e47e55fef75edcb595ed973f145","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0e4f97438a1a144e2918b4c4b9f1c40e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",11,,,,,,
+,"52b423989e351fcbdd256ce2ca27e875","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",10,,,,,,
+,"badc00640becc1104d56026d3c47d1fd","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",9,,,,,,
+,"1808d628a488bfe5ba18d6669f82c4ce","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",7,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/moveParentContentToDifferentPageTwice.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/moveParentContentToDifferentPageTwice.csv
index 4e3302a4a0ce..eef8e1a809e3 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/moveParentContentToDifferentPageTwice.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/moveParentContentToDifferentPageTwice.csv
@@ -1,5 +1,5 @@
 "pages",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_irretutorial_hotels",,,,,,,
+,"uid","pid","sorting","deleted","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","tx_testirreforeignfield_hotels",,,,,,,
 ,1,0,256,0,0,0,0,0,"FunctionalTest",0,,,,,,,
 ,88,1,256,0,0,0,0,0,"DataHandlerTest",0,,,,,,,
 ,89,88,256,0,0,0,0,0,"Relations",1,,,,,,,
@@ -16,46 +16,46 @@
 ,1,0,0,"Dansk","dk",,,,,,,,,,,,
 ,2,0,0,"Deutsch","de",,,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_irretutorial_1nff_hotels",,,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","tx_testirreforeignfield_hotels",,,,,
 ,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",2,,,,,
 ,298,1,256,0,0,0,0,0,0,0,"Regular Element #2",1,,,,,
-"tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
+"tx_testirreforeignfield_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","offers",,
 ,2,89,1,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0,,
-,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",1nff.hotels,2,,
-,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",1nff.hotels,1,,
-,5,1,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",1nff.hotels,1,,
-"tx_irretutorial_1nff_offer",,,,,,,,,,,,,,,,,
+,3,89,1,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content","1nff.hotels",2,,
+,4,89,2,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content","1nff.hotels",1,,
+,5,1,1,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content","1nff.hotels",1,,
+"tx_testirreforeignfield_offer",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier","prices",,
-,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_irretutorial_1nff_hotel",,3,,
-,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_irretutorial_1nff_hotel",,2,,
-,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_irretutorial_1nff_hotel",,1,,
-,8,1,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_irretutorial_1nff_hotel",,1,,
-"tx_irretutorial_1nff_price",,,,,,,,,,,,,,,,,
+,5,89,1,0,0,0,0,0,0,0,"Offer #1.1",3,"tx_testirreforeignfield_hotel",,3,,
+,6,89,2,0,0,0,0,0,0,0,"Offer #1.2",3,"tx_testirreforeignfield_hotel",,2,,
+,7,89,1,0,0,0,0,0,0,0,"Offer #2.1",4,"tx_testirreforeignfield_hotel",,1,,
+,8,1,1,0,0,0,0,0,0,0,"Offer #1.1",5,"tx_testirreforeignfield_hotel",,1,,
+"tx_testirreforeignfield_price",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","title","parentid","parenttable","parentidentifier",,,
-,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_irretutorial_1nff_offer",,,,
-,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_irretutorial_1nff_offer",,,,
-,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_irretutorial_1nff_offer",,,,
-,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_irretutorial_1nff_offer",,,,
-,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,,,
-,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,,,
-,13,1,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,,,
+,7,89,1,0,0,0,0,0,0,0,"Price #1.1.1",5,"tx_testirreforeignfield_offer",,,,
+,8,89,2,0,0,0,0,0,0,0,"Price #1.1.2",5,"tx_testirreforeignfield_offer",,,,
+,9,89,3,0,0,0,0,0,0,0,"Price #1.1.3",5,"tx_testirreforeignfield_offer",,,,
+,10,89,1,0,0,0,0,0,0,0,"Price #1.2.1",6,"tx_testirreforeignfield_offer",,,,
+,11,89,2,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_testirreforeignfield_offer",,,,
+,12,89,1,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_testirreforeignfield_offer",,,,
+,13,1,1,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_testirreforeignfield_offer",,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
-,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
-,"0be6b4051958ba5e752ac09f1b88ac7a","tx_irretutorial_1nff_offer",5,"prices",,,,2,0,"tx_irretutorial_1nff_price",9,,,,,,
-,"0db25b4f2fa1f8ab4d3296280222e2b5","tx_irretutorial_1nff_hotel",5,"offers",,,,0,0,"tx_irretutorial_1nff_offer",8,,,,,,
-,"0fc0d09ae681642e4bc17ef8e338b20e","tx_irretutorial_1nff_offer",5,"prices",,,,0,0,"tx_irretutorial_1nff_price",7,,,,,,
-,"1c63417300a4a2423a0206cbc1cc6430","tx_irretutorial_1nff_hotel",4,"offers",,,,0,0,"tx_irretutorial_1nff_offer",7,,,,,,
-,"1ea8fb364449dd57ef33bf410d0d97ce","tt_content",298,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",5,,,,,,
 ,"25426f92d44dd2ccf416108462b446e3","sys_workspace",1,"custom_stages",,,,0,0,"sys_workspace_stage",1,,,,,,
-,"2abe914437799afd8d74ff900e1ad9ea","tx_irretutorial_1nff_offer",8,"prices",,,,0,0,"tx_irretutorial_1nff_price",13,,,,,,
-,"3cd13aad565798bc7837b17d09eae98a","tx_irretutorial_1nff_offer",7,"prices",,,,0,0,"tx_irretutorial_1nff_price",12,,,,,,
-,"447af67bf50f6b2e12eeb8928b53849b","tx_irretutorial_1nff_offer",6,"prices",,,,0,0,"tx_irretutorial_1nff_price",10,,,,,,
-,"4db47dff0b7cfc1011b50654d6ae26ba","tt_content",297,"tx_irretutorial_1nff_hotels",,,,1,0,"tx_irretutorial_1nff_hotel",4,,,,,,
-,"58521c3fb6b7050e33ae71d02a7ac20d","pages",89,"tx_irretutorial_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",2,,,,,,
-,"6341e914a1bc771531b04a589f1e6c10","tx_irretutorial_1nff_hotel",3,"offers",,,,0,0,"tx_irretutorial_1nff_offer",5,,,,,,
-,"74f844144854e2f894e8a22e620948d5","tt_content",297,"tx_irretutorial_1nff_hotels",,,,0,0,"tx_irretutorial_1nff_hotel",3,,,,,,
-,"b509b296e32d7a2ee0b525f3cb04b30c","tx_irretutorial_1nff_offer",6,"prices",,,,1,0,"tx_irretutorial_1nff_price",11,,,,,,
-,"b6b18aded51cc224658c8eda1e009117","tx_irretutorial_1nff_hotel",3,"offers",,,,1,0,"tx_irretutorial_1nff_offer",6,,,,,,
-,"ef81102fb56d455adf439a444ec05777","tx_irretutorial_1nff_offer",5,"prices",,,,1,0,"tx_irretutorial_1nff_price",8,,,,,,
+,"01a3ce8c4e3b2bb1aa439dc29081f996","sys_workspace_stage",1,"responsible_persons",,,,0,0,"be_users",3,,,,,,
+,"8309f9a3ae2a259bdcb29913b7101244","pages",89,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",2,,,,,,
+,"b9be8f0166b062001c138957270e72e2","tt_content",297,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",3,,,,,,
+,"4e8bfa4d76d4cec2d9f6ec62d2974371","tt_content",298,"tx_testirreforeignfield_hotels",,,,0,0,"tx_testirreforeignfield_hotel",5,,,,,,
+,"0f8f737335f799fe854cad110043adbb","tx_testirreforeignfield_hotel",3,"offers",,,,0,0,"tx_testirreforeignfield_offer",5,,,,,,
+,"0bb4f497c3f8219b96eeffbd07cc3f98","tx_testirreforeignfield_hotel",3,"offers",,,,1,0,"tx_testirreforeignfield_offer",6,,,,,,
+,"808ac7fa895f4ec61aaa183255d25956","tx_testirreforeignfield_hotel",5,"offers",,,,0,0,"tx_testirreforeignfield_offer",8,,,,,,
+,"cc09ae19a5e619c5ffcf8c5bdddc9d59","tx_testirreforeignfield_offer",5,"prices",,,,0,0,"tx_testirreforeignfield_price",7,,,,,,
+,"5fe48b40d6ca75de1caa0e183720532f","tx_testirreforeignfield_offer",5,"prices",,,,1,0,"tx_testirreforeignfield_price",8,,,,,,
+,"b60b7f997a26002475b11ac77e3719c4","tx_testirreforeignfield_offer",5,"prices",,,,2,0,"tx_testirreforeignfield_price",9,,,,,,
+,"3ba8cf6deba3b25131b91ff428dac66e","tx_testirreforeignfield_offer",6,"prices",,,,0,0,"tx_testirreforeignfield_price",10,,,,,,
+,"1b5619b2db96553e7081b1cedb89f842","tx_testirreforeignfield_offer",6,"prices",,,,1,0,"tx_testirreforeignfield_price",11,,,,,,
+,"995ce52b64bc9024b648b137636f9eb4","tx_testirreforeignfield_offer",8,"prices",,,,0,0,"tx_testirreforeignfield_price",13,,,,,,
+,"50d9980f8befd0df6533dc786eedbffa","tt_content",297,"tx_testirreforeignfield_hotels",,,,1,0,"tx_testirreforeignfield_hotel",4,,,,,,
+,"77a0f5788043eba660dbcc94adde7344","tx_testirreforeignfield_hotel",4,"offers",,,,0,0,"tx_testirreforeignfield_offer",7,,,,,,
+,"2c4ea41c93f123ca77f1c5d54061936c","tx_testirreforeignfield_offer",7,"prices",,,,0,0,"tx_testirreforeignfield_price",12,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/ImportDefault.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/ImportDefault.csv
index 1317861109bd..b0df79665b7c 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/ImportDefault.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/ImportDefault.csv
@@ -28,9 +28,9 @@
 ,29,298,"tt_content",0,1,"categories",,,,,,,,,,,
 ,30,298,"tt_content",0,2,"categories",,,,,,,,,,,
 "tt_content",,,,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","image","categories","tx_irretutorial_1nff_hotels",,,
-,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",0,2,0,,,
-,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",0,2,0,,,
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","header","image","categories",,,,
+,297,89,256,0,0,0,0,0,0,0,"Regular Element #1",0,2,,,,
+,298,89,512,0,0,0,0,0,0,0,"Regular Element #2",0,2,,,,
 "sys_refindex",,,,,,,,,,,,,,,,,
 ,"hash","tablename","recuid","field","flexpointer","softref_key","softref_id","sorting","workspace","ref_table","ref_uid","ref_string",,,,,
 ,"3c637501ab9c158daa933643bff8cc43","sys_category",28,"items",,,,0,0,"tt_content",297,,,,,,
-- 
GitLab