From 92aae5c00a45a5db89c3a56754ce84181f8018b2 Mon Sep 17 00:00:00 2001
From: Oliver Hader <oliver@typo3.org>
Date: Wed, 19 Feb 2014 23:03:12 +0100
Subject: [PATCH] [TASK] Rename tt_content.tx_irretutorial_hotels in tests

This change affects EXT:irre_tutorial and functional tests only:
* rename tx_irretutorial_hotels to tx_irretutorial_1nff_hotels
* use constants for table and field names in functional tests

Resolves: #56132
Releases: 6.2
Change-Id: Iee2240c489c5523fbea208145ba667f349fde592
Reviewed-on: https://review.typo3.org/27744
Reviewed-by: Oliver Hader
Tested-by: Oliver Hader
---
 .../ForeignField/AbstractActionTestCase.php   | 63 +++++++-------
 .../changeParentContentRecordSorting.csv      |  2 +-
 .../DataSet/Assertion/copyPageRecord.csv      |  2 +-
 .../Assertion/copyParentContentRecord.csv     |  2 +-
 ...entRecordWithHotelAndOfferChildRecords.csv |  2 +-
 ...entRecordWithHotelAndOfferChildRecords.csv |  2 +-
 .../Assertion/createParentContentRecord.csv   |  2 +-
 ...entRecordWithHotelAndOfferChildRecords.csv |  2 +-
 .../DataSet/Assertion/deletePageRecord.csv    |  2 +-
 .../Assertion/deleteParentContentRecord.csv   |  2 +-
 .../Assertion/localizeParentContentRecord.csv |  2 +-
 .../Assertion/modifyOnlyHotelChildRecord.csv  |  2 +-
 .../Assertion/modifyParentContentRecord.csv   |  2 +-
 ...difyParentRecordAndAddHotelChildRecord.csv |  2 +-
 ...ecordAndChangeHotelChildRecordsSorting.csv |  2 +-
 ...yParentRecordAndDeleteHotelChildRecord.csv |  2 +-
 ...modifyParentRecordWithHotelChildRecord.csv |  2 +-
 ...moveParentContentRecordToDifferentPage.csv |  2 +-
 ...tRecordToDifferentPageAndChangeSorting.csv |  2 +-
 .../DataSet/Scenario/LiveDefaultElements.csv  |  2 +-
 .../copyContentRecordOfCategoryRelation.csv   |  2 +-
 .../deleteContentRecordOfCategoryRelation.csv |  2 +-
 ...ocalizeContentRecordOfCategoryRelation.csv |  2 +-
 .../modifyBothRecordsOfCategoryRelation.csv   |  2 +-
 ...modifyCategoryRecordOfCategoryRelation.csv |  2 +-
 .../modifyContentRecordOfCategoryRelation.csv |  2 +-
 ...ecordOfCategoryRelationToDifferentPage.csv |  2 +-
 .../DataSet/Scenario/LiveDefaultElements.csv  |  2 +-
 .../Assertion/changeContentRecordSorting.csv  |  2 +-
 .../DataSet/Assertion/copyContentRecord.csv   |  2 +-
 .../DataSet/Assertion/copyPageRecord.csv      |  2 +-
 .../Assertion/createContentRecords.csv        |  2 +-
 .../DataSet/Assertion/deleteContentRecord.csv |  2 +-
 .../DataSet/Assertion/deletePageRecord.csv    |  2 +-
 .../Assertion/localizeContentRecord.csv       |  2 +-
 .../DataSet/Assertion/localizePageRecord.csv  |  2 +-
 .../DataSet/Assertion/modifyContentRecord.csv |  2 +-
 .../moveContentRecordToDifferentPage.csv      |  2 +-
 ...tRecordToDifferentPageAndChangeSorting.csv |  2 +-
 .../movePageRecordToDifferentPage.csv         |  2 +-
 ...eRecordToDifferentPageAndChangeSorting.csv |  2 +-
 .../DataSet/Scenario/LiveDefaultElements.csv  |  2 +-
 .../ExtTables/ext_tables.general.php          |  6 +-
 .../Private/Language/locallang_db.xml         |  2 +-
 .../Extensions/irre_tutorial/ext_tables.sql   |  2 +-
 .../Fixtures/Frontend/JsonRenderer.ts         |  6 +-
 .../ForeignField/AbstractActionTestCase.php   | 83 ++++++++++---------
 .../changeParentContentRecordSorting.csv      |  2 +-
 .../DataSet/Assertion/copyPageRecord.csv      |  2 +-
 .../Assertion/copyParentContentRecord.csv     |  2 +-
 ...entRecordWithHotelAndOfferChildRecords.csv |  2 +-
 ...ildRecordsAndDiscardCopiedParentRecord.csv |  2 +-
 ...entRecordWithHotelAndOfferChildRecords.csv |  2 +-
 ...RecordsAndDiscardLocalizedParentRecord.csv |  2 +-
 .../Assertion/createParentContentRecord.csv   |  2 +-
 ...entRecordWithHotelAndOfferChildRecords.csv |  2 +-
 .../DataSet/Assertion/deletePageRecord.csv    |  2 +-
 .../Assertion/deleteParentContentRecord.csv   |  2 +-
 ...entRecordAndDiscardDeletedParentRecord.csv |  2 +-
 .../Assertion/localizeParentContentRecord.csv |  2 +-
 .../Assertion/modifyOnlyHotelChildRecord.csv  |  2 +-
 .../DataSet/Assertion/modifyPageRecord.csv    |  2 +-
 .../Assertion/modifyParentContentRecord.csv   |  2 +-
 ...difyParentRecordAndAddHotelChildRecord.csv |  2 +-
 ...ecordAndChangeHotelChildRecordsSorting.csv |  2 +-
 ...yParentRecordAndDeleteHotelChildRecord.csv |  2 +-
 ...modifyParentRecordWithHotelChildRecord.csv |  2 +-
 ...hildRecordAndDiscardAllModifiedRecords.csv |  2 +-
 ...ldRecordAndDiscardModifiedParentRecord.csv |  2 +-
 ...moveParentContentRecordToDifferentPage.csv |  2 +-
 ...tRecordToDifferentPageAndChangeSorting.csv |  2 +-
 .../DataSet/Scenario/LiveDefaultElements.csv  |  2 +-
 .../DataSet/Assertion/addCategoryRelation.csv |  2 +-
 .../changeCategoryRelationSorting.csv         |  2 +-
 .../copyCategoryRecordOfCategoryRelation.csv  |  2 +-
 .../copyContentRecordOfCategoryRelation.csv   |  2 +-
 ...teCategoryRecordAndAddCategoryRelation.csv |  2 +-
 ...ategoryRecordAndCreateCategoryRelation.csv |  2 +-
 ...ateContentRecordAndAddCategoryRelation.csv |  2 +-
 ...ContentRecordAndCreateCategoryRelation.csv |  2 +-
 ...deleteCategoryRecordOfCategoryRelation.csv |  2 +-
 .../Assertion/deleteCategoryRelation.csv      |  2 +-
 .../deleteContentRecordOfCategoryRelation.csv |  2 +-
 ...calizeCategoryRecordOfCategoryRelation.csv |  2 +-
 ...ocalizeContentRecordOfCategoryRelation.csv |  2 +-
 .../modifyBothRecordsOfCategoryRelation.csv   |  2 +-
 ...modifyCategoryRecordOfCategoryRelation.csv |  2 +-
 .../modifyContentRecordOfCategoryRelation.csv |  2 +-
 ...ecordOfCategoryRelationToDifferentPage.csv |  2 +-
 .../DataSet/Scenario/LiveDefaultElements.csv  |  2 +-
 .../Assertion/changeContentRecordSorting.csv  |  2 +-
 .../Assertion/changePageRecordSorting.csv     |  2 +-
 .../DataSet/Assertion/copyContentRecord.csv   |  2 +-
 .../DataSet/Assertion/copyPageRecord.csv      |  2 +-
 .../Assertion/createContentRecords.csv        |  2 +-
 .../DataSet/Assertion/deleteContentRecord.csv |  2 +-
 .../DataSet/Assertion/deletePageRecord.csv    |  2 +-
 .../Assertion/localizeContentRecord.csv       |  2 +-
 .../DataSet/Assertion/localizePageRecord.csv  |  2 +-
 .../DataSet/Assertion/modifyContentRecord.csv |  2 +-
 .../moveContentRecordToDifferentPage.csv      |  2 +-
 ...tRecordToDifferentPageAndChangeSorting.csv |  2 +-
 .../movePageRecordToDifferentPage.csv         |  2 +-
 ...eRecordToDifferentPageAndChangeSorting.csv |  2 +-
 .../DataSet/Scenario/LiveDefaultElements.csv  |  2 +-
 105 files changed, 183 insertions(+), 177 deletions(-)

diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/AbstractActionTestCase.php b/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/AbstractActionTestCase.php
index 373ebb2416f9..1c51b61b9222 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/AbstractActionTestCase.php
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/AbstractActionTestCase.php
@@ -43,6 +43,9 @@ abstract class AbstractActionTestCase extends \TYPO3\CMS\Core\Tests\Functional\D
 	const TABLE_Hotel = 'tx_irretutorial_1nff_hotel';
 	const TABLE_Offer = 'tx_irretutorial_1nff_offer';
 
+	const FIELD_ContentHotel = 'tx_irretutorial_1nff_hotels';
+	const FIELD_HotelOffer = 'offers';
+
 	/**
 	 * @var string
 	 */
@@ -81,7 +84,7 @@ abstract class AbstractActionTestCase extends \TYPO3\CMS\Core\Tests\Functional\D
 		$responseContent = $this->getFrontendResponse(self::VALUE_PageId)->getResponseContent();
 		$this->assertResponseContentHasRecords($responseContent, self::TABLE_Content, 'header', 'Testing #1');
 		$this->assertResponseContentStructureHasRecords(
-			$responseContent, self::TABLE_Content . ':' . self::VALUE_ContentIdLast, 'tx_irretutorial_hotels',
+			$responseContent, self::TABLE_Content . ':' . self::VALUE_ContentIdLast, self::FIELD_ContentHotel,
 			self::TABLE_Hotel, 'title', array('Hotel #1')
 		);
 	}
@@ -107,7 +110,7 @@ abstract class AbstractActionTestCase extends \TYPO3\CMS\Core\Tests\Functional\D
 		$newContentId = $newTableIds[self::TABLE_Content][self::VALUE_ContentIdLast];
 		$responseContent = $this->getFrontendResponse(self::VALUE_PageId)->getResponseContent();
 		$this->assertResponseContentStructureHasRecords(
-			$responseContent, self::TABLE_Content . ':' . $newContentId, 'tx_irretutorial_hotels',
+			$responseContent, self::TABLE_Content . ':' . $newContentId, self::FIELD_ContentHotel,
 			self::TABLE_Hotel, 'title', array('Hotel #1')
 		);
 	}
@@ -121,7 +124,7 @@ abstract class AbstractActionTestCase extends \TYPO3\CMS\Core\Tests\Functional\D
 
 		$responseContent = $this->getFrontendResponse(self::VALUE_PageId, self::VALUE_LanguageId)->getResponseContent();
 		$this->assertResponseContentStructureHasRecords(
-			$responseContent, self::TABLE_Content . ':' . self::VALUE_ContentIdLast, 'tx_irretutorial_hotels',
+			$responseContent, self::TABLE_Content . ':' . self::VALUE_ContentIdLast, self::FIELD_ContentHotel,
 			self::TABLE_Hotel, 'title', array('[Translate to Dansk:] Hotel #1')
 		);
 	}
@@ -135,11 +138,11 @@ abstract class AbstractActionTestCase extends \TYPO3\CMS\Core\Tests\Functional\D
 
 		$responseContent = $this->getFrontendResponse(self::VALUE_PageId)->getResponseContent();
 		$this->assertResponseContentStructureHasRecords(
-			$responseContent, self::TABLE_Content . ':' . self::VALUE_ContentIdFirst, 'tx_irretutorial_hotels',
+			$responseContent, self::TABLE_Content . ':' . self::VALUE_ContentIdFirst, self::FIELD_ContentHotel,
 			self::TABLE_Hotel, 'title', array('Hotel #1', 'Hotel #2')
 		);
 		$this->assertResponseContentStructureHasRecords(
-			$responseContent, self::TABLE_Content . ':' . self::VALUE_ContentIdLast, 'tx_irretutorial_hotels',
+			$responseContent, self::TABLE_Content . ':' . self::VALUE_ContentIdLast, self::FIELD_ContentHotel,
 			self::TABLE_Hotel, 'title', array('Hotel #1')
 		);
 	}
@@ -154,7 +157,7 @@ abstract class AbstractActionTestCase extends \TYPO3\CMS\Core\Tests\Functional\D
 		$responseContent = $this->getFrontendResponse(self::VALUE_PageIdTarget)->getResponseContent();
 		$this->assertResponseContentHasRecords($responseContent, self::TABLE_Content, 'header', 'Regular Element #2');
 		$this->assertResponseContentStructureHasRecords(
-			$responseContent, self::TABLE_Content . ':' . self::VALUE_ContentIdLast, 'tx_irretutorial_hotels',
+			$responseContent, self::TABLE_Content . ':' . self::VALUE_ContentIdLast, self::FIELD_ContentHotel,
 			self::TABLE_Hotel, 'title', array('Hotel #1')
 		);
 	}
@@ -170,11 +173,11 @@ abstract class AbstractActionTestCase extends \TYPO3\CMS\Core\Tests\Functional\D
 		$responseContent = $this->getFrontendResponse(self::VALUE_PageIdTarget)->getResponseContent();
 		$this->assertResponseContentHasRecords($responseContent, self::TABLE_Content, 'header', array('Regular Element #2', 'Regular Element #1'));
 		$this->assertResponseContentStructureHasRecords(
-			$responseContent, self::TABLE_Content . ':' . self::VALUE_ContentIdFirst, 'tx_irretutorial_hotels',
+			$responseContent, self::TABLE_Content . ':' . self::VALUE_ContentIdFirst, self::FIELD_ContentHotel,
 			self::TABLE_Hotel, 'title', array('Hotel #1', 'Hotel #2')
 		);
 		$this->assertResponseContentStructureHasRecords(
-			$responseContent, self::TABLE_Content . ':' . self::VALUE_ContentIdLast, 'tx_irretutorial_hotels',
+			$responseContent, self::TABLE_Content . ':' . self::VALUE_ContentIdLast, self::FIELD_ContentHotel,
 			self::TABLE_Hotel, 'title', array('Hotel #1')
 		);
 	}
@@ -229,8 +232,8 @@ abstract class AbstractActionTestCase extends \TYPO3\CMS\Core\Tests\Functional\D
 			self::VALUE_PageId,
 			array(
 				self::TABLE_Offer => array('title' => 'Offer #1'),
-				self::TABLE_Hotel => array('title' => 'Hotel #1', 'offers' => '__previousUid'),
-				self::TABLE_Content => array('header' => 'Testing #1', 'tx_irretutorial_hotels' => '__previousUid'),
+				self::TABLE_Hotel => array('title' => 'Hotel #1', self::FIELD_HotelOffer => '__previousUid'),
+				self::TABLE_Content => array('header' => 'Testing #1', self::FIELD_ContentHotel => '__previousUid'),
 			)
 		);
 		$this->assertAssertionDataSet('createParentContentRecordWithHotelAndOfferChildRecords');
@@ -239,7 +242,7 @@ abstract class AbstractActionTestCase extends \TYPO3\CMS\Core\Tests\Functional\D
 		$responseContent = $this->getFrontendResponse(self::VALUE_PageId)->getResponseContent();
 		$this->assertResponseContentHasRecords($responseContent, self::TABLE_Content, 'header', 'Testing #1');
 		$this->assertResponseContentStructureHasRecords(
-			$responseContent, self::TABLE_Content . ':' . $newContentId, 'tx_irretutorial_hotels',
+			$responseContent, self::TABLE_Content . ':' . $newContentId, self::FIELD_ContentHotel,
 			self::TABLE_Hotel, 'title', 'Hotel #1'
 		);
 	}
@@ -252,8 +255,8 @@ abstract class AbstractActionTestCase extends \TYPO3\CMS\Core\Tests\Functional\D
 			self::VALUE_PageId,
 			array(
 				self::TABLE_Offer => array('title' => 'Offer #1'),
-				self::TABLE_Hotel => array('title' => 'Hotel #1', 'offers' => '__previousUid'),
-				self::TABLE_Content => array('header' => 'Testing #1', 'tx_irretutorial_hotels' => '__previousUid'),
+				self::TABLE_Hotel => array('title' => 'Hotel #1', self::FIELD_HotelOffer => '__previousUid'),
+				self::TABLE_Content => array('header' => 'Testing #1', self::FIELD_ContentHotel => '__previousUid'),
 			)
 		);
 		$newContentId = $newTableIds[self::TABLE_Content][0];
@@ -265,15 +268,15 @@ abstract class AbstractActionTestCase extends \TYPO3\CMS\Core\Tests\Functional\D
 		$copiedHotelId = $copiedTableIds[self::TABLE_Hotel][$newHotelId];
 		$responseContent = $this->getFrontendResponse(self::VALUE_PageId)->getResponseContent();
 		$this->assertResponseContentStructureHasRecords(
-			$responseContent, self::TABLE_Content . ':' . $newContentId, 'tx_irretutorial_hotels',
+			$responseContent, self::TABLE_Content . ':' . $newContentId, self::FIELD_ContentHotel,
 			self::TABLE_Hotel, 'title', 'Hotel #1'
 		);
 		$this->assertResponseContentStructureHasRecords(
-			$responseContent, self::TABLE_Content . ':' . $copiedContentId, 'tx_irretutorial_hotels',
+			$responseContent, self::TABLE_Content . ':' . $copiedContentId, self::FIELD_ContentHotel,
 			self::TABLE_Hotel, 'title', 'Hotel #1'
 		);
 		$this->assertResponseContentStructureHasRecords(
-			$responseContent, self::TABLE_Hotel . ':' . $copiedHotelId, 'offers',
+			$responseContent, self::TABLE_Hotel . ':' . $copiedHotelId, self::FIELD_HotelOffer,
 			self::TABLE_Offer, 'title', 'Offer #1'
 		);
 	}
@@ -287,8 +290,8 @@ abstract class AbstractActionTestCase extends \TYPO3\CMS\Core\Tests\Functional\D
 			self::VALUE_PageId,
 			array(
 				self::TABLE_Offer => array('title' => 'Offer #1'),
-				self::TABLE_Hotel => array('title' => 'Hotel #1', 'offers' => '__previousUid'),
-				self::TABLE_Content => array('header' => 'Testing #1', 'tx_irretutorial_hotels' => '__previousUid'),
+				self::TABLE_Hotel => array('title' => 'Hotel #1', self::FIELD_HotelOffer => '__previousUid'),
+				self::TABLE_Content => array('header' => 'Testing #1', self::FIELD_ContentHotel => '__previousUid'),
 			)
 		);
 		$newContentId = $newTableIds[self::TABLE_Content][0];
@@ -303,11 +306,11 @@ abstract class AbstractActionTestCase extends \TYPO3\CMS\Core\Tests\Functional\D
 		// @todo Does not work since children don't point to live-default record
 		/*
 			$this->assertResponseContentStructureHasRecords(
-				$responseContent, self::TABLE_Content . ':' . $localizedContentId, 'tx_irretutorial_hotels',
+				$responseContent, self::TABLE_Content . ':' . $localizedContentId, self::FIELD_ContentHotel,
 				self::TABLE_Hotel, 'title', '[Translate to Dansk:] Hotel #1'
 			);
 			$this->assertResponseContentStructureHasRecords(
-				$responseContent, self::TABLE_Hotel . ':' . $localizedHotelId, 'offers',
+				$responseContent, self::TABLE_Hotel . ':' . $localizedHotelId, self::FIELD_HotelOffer,
 				self::TABLE_Offer, 'title', '[Translate to Dansk:] Offer #1'
 			);
 		*/
@@ -322,7 +325,7 @@ abstract class AbstractActionTestCase extends \TYPO3\CMS\Core\Tests\Functional\D
 
 		$responseContent = $this->getFrontendResponse(self::VALUE_PageId)->getResponseContent();
 		$this->assertResponseContentStructureHasRecords(
-			$responseContent, self::TABLE_Content . ':' . self::VALUE_ContentIdFirst, 'tx_irretutorial_hotels',
+			$responseContent, self::TABLE_Content . ':' . self::VALUE_ContentIdFirst, self::FIELD_ContentHotel,
 			self::TABLE_Hotel, 'title', array('Hotel #1', 'Testing #1')
 		);
 	}
@@ -331,12 +334,12 @@ abstract class AbstractActionTestCase extends \TYPO3\CMS\Core\Tests\Functional\D
 	 * @test
 	 */
 	public function modifyParentRecordAndChangeHotelChildRecordsSorting() {
-		$this->actionService->modifyRecord(self::TABLE_Content, self::VALUE_ContentIdFirst, array('tx_irretutorial_hotels' => '4,3'));
+		$this->actionService->modifyRecord(self::TABLE_Content, self::VALUE_ContentIdFirst, array(self::FIELD_ContentHotel => '4,3'));
 		$this->assertAssertionDataSet('modifyParentRecordAndChangeHotelChildRecordsSorting');
 
 		$responseContent = $this->getFrontendResponse(self::VALUE_PageId)->getResponseContent();
 		$this->assertResponseContentStructureHasRecords(
-			$responseContent, self::TABLE_Content . ':' . self::VALUE_ContentIdFirst, 'tx_irretutorial_hotels',
+			$responseContent, self::TABLE_Content . ':' . self::VALUE_ContentIdFirst, self::FIELD_ContentHotel,
 			self::TABLE_Hotel, 'title', array('Hotel #2', 'Hotel #1')
 		);
 	}
@@ -349,14 +352,14 @@ abstract class AbstractActionTestCase extends \TYPO3\CMS\Core\Tests\Functional\D
 			self::VALUE_PageId,
 			array(
 				self::TABLE_Hotel => array('uid' => 4, 'title' => 'Testing #1'),
-				self::TABLE_Content => array('uid' => self::VALUE_ContentIdFirst, 'tx_irretutorial_hotels' => '3,4'),
+				self::TABLE_Content => array('uid' => self::VALUE_ContentIdFirst, self::FIELD_ContentHotel => '3,4'),
 			)
 		);
 		$this->assertAssertionDataSet('modifyParentRecordWithHotelChildRecord');
 
 		$responseContent = $this->getFrontendResponse(self::VALUE_PageId)->getResponseContent();
 		$this->assertResponseContentStructureHasRecords(
-			$responseContent, self::TABLE_Content . ':' . self::VALUE_ContentIdFirst, 'tx_irretutorial_hotels',
+			$responseContent, self::TABLE_Content . ':' . self::VALUE_ContentIdFirst, self::FIELD_ContentHotel,
 			self::TABLE_Hotel, 'title', array('Hotel #1', 'Testing #1')
 		);
 	}
@@ -369,14 +372,14 @@ abstract class AbstractActionTestCase extends \TYPO3\CMS\Core\Tests\Functional\D
 			self::VALUE_PageId,
 			array(
 				self::TABLE_Hotel => array('uid' => '__NEW', 'title' => 'Hotel #2'),
-				self::TABLE_Content => array('uid' => self::VALUE_ContentIdLast, 'tx_irretutorial_hotels' => '5,__previousUid'),
+				self::TABLE_Content => array('uid' => self::VALUE_ContentIdLast, self::FIELD_ContentHotel => '5,__previousUid'),
 			)
 		);
 		$this->assertAssertionDataSet('modifyParentRecordAndAddHotelChildRecord');
 
 		$responseContent = $this->getFrontendResponse(self::VALUE_PageId)->getResponseContent();
 		$this->assertResponseContentStructureHasRecords(
-			$responseContent, self::TABLE_Content . ':' . self::VALUE_ContentIdLast, 'tx_irretutorial_hotels',
+			$responseContent, self::TABLE_Content . ':' . self::VALUE_ContentIdLast, self::FIELD_ContentHotel,
 			self::TABLE_Hotel, 'title', array('Hotel #1', 'Hotel #2')
 		);
 	}
@@ -388,18 +391,18 @@ abstract class AbstractActionTestCase extends \TYPO3\CMS\Core\Tests\Functional\D
 		$this->actionService->modifyRecord(
 			self::TABLE_Content,
 			self::VALUE_ContentIdFirst,
-			array('tx_irretutorial_hotels' => '3'),
+			array(self::FIELD_ContentHotel => '3'),
 			array(self::TABLE_Hotel => array(4))
 		);
 		$this->assertAssertionDataSet('modifyParentRecordAndDeleteHotelChildRecord');
 
 		$responseContent = $this->getFrontendResponse(self::VALUE_PageId)->getResponseContent();
 		$this->assertResponseContentStructureHasRecords(
-			$responseContent, self::TABLE_Content . ':' . self::VALUE_ContentIdLast, 'tx_irretutorial_hotels',
+			$responseContent, self::TABLE_Content . ':' . self::VALUE_ContentIdLast, self::FIELD_ContentHotel,
 			self::TABLE_Hotel, 'title', 'Hotel #1'
 		);
 		$this->assertResponseContentStructureDoesNotHaveRecords(
-			$responseContent, self::TABLE_Content . ':' . self::VALUE_ContentIdLast, 'tx_irretutorial_hotels',
+			$responseContent, self::TABLE_Content . ':' . self::VALUE_ContentIdLast, self::FIELD_ContentHotel,
 			self::TABLE_Hotel, 'title', 'Hotel #2'
 		);
 	}
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/changeParentContentRecordSorting.csv b/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/changeParentContentRecordSorting.csv
index 2a70257b2bcd..0f24603c0944 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/changeParentContentRecordSorting.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/changeParentContentRecordSorting.csv
@@ -1,5 +1,5 @@
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_hotels
 ,297,89,768,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
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/copyPageRecord.csv b/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/copyPageRecord.csv
index 7031a0a3dd79..e345a31be9c5 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/copyPageRecord.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/copyPageRecord.csv
@@ -6,7 +6,7 @@ pages
 ,90,88,512,0,0,0,0,0,0,Target
 ,91,90,256,0,0,0,0,0,0,Relations
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_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
 ,299,91,256,0,0,0,0,0,0,0,0,"Regular Element #2",0,0,1
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/copyParentContentRecord.csv b/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/copyParentContentRecord.csv
index 6dbd88a4e289..6fa90e9b9168 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/copyParentContentRecord.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/copyParentContentRecord.csv
@@ -1,5 +1,5 @@
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_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
 ,299,89,128,0,0,0,0,0,0,0,0,"Regular Element #2 (copy 1)",0,0,1
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/createAndCopyParentContentRecordWithHotelAndOfferChildRecords.csv b/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/createAndCopyParentContentRecordWithHotelAndOfferChildRecords.csv
index 17fb0708ba54..100a0d130bcd 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/createAndCopyParentContentRecordWithHotelAndOfferChildRecords.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/createAndCopyParentContentRecordWithHotelAndOfferChildRecords.csv
@@ -1,5 +1,5 @@
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_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
 ,299,89,128,0,0,0,0,0,0,0,0,"Testing #1",,0,1
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/createAndLocalizeParentContentRecordWithHotelAndOfferChildRecords.csv b/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/createAndLocalizeParentContentRecordWithHotelAndOfferChildRecords.csv
index b28f4018e6b4..435cd1233f62 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/createAndLocalizeParentContentRecordWithHotelAndOfferChildRecords.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/createAndLocalizeParentContentRecordWithHotelAndOfferChildRecords.csv
@@ -1,5 +1,5 @@
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_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
 ,299,89,128,0,0,0,0,0,0,0,0,"Testing #1",,0,1
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/createParentContentRecord.csv b/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/createParentContentRecord.csv
index 156e6be214da..87617d314aaa 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/createParentContentRecord.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/createParentContentRecord.csv
@@ -1,5 +1,5 @@
 "tt_content",,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","image","categories","tx_irretutorial_hotels"
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","image","categories","tx_irretutorial_1nff_hotels"
 ,299,89,128,0,0,0,0,0,0,0,0,"Testing #1","\NULL",0,0
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1","\NULL",0,2
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2","\NULL",0,1
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/createParentContentRecordWithHotelAndOfferChildRecords.csv b/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/createParentContentRecordWithHotelAndOfferChildRecords.csv
index 001cacf696c4..e2aea6195133 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/createParentContentRecordWithHotelAndOfferChildRecords.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/createParentContentRecordWithHotelAndOfferChildRecords.csv
@@ -1,5 +1,5 @@
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_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
 ,299,89,128,0,0,0,0,0,0,0,0,"Testing #1",,0,1
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/deletePageRecord.csv b/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/deletePageRecord.csv
index d46f8bf7d155..848fa9a85325 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/deletePageRecord.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/deletePageRecord.csv
@@ -5,7 +5,7 @@ pages
 ,89,88,1000000000,1,0,0,0,0,0,Relations
 ,90,88,512,0,0,0,0,0,0,Target
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_hotels
 ,297,89,1000000000,1,0,0,0,0,0,0,0,"Regular Element #1",,0,2
 ,298,89,1000000000,1,0,0,0,0,0,0,0,"Regular Element #2",,0,1
 tx_irretutorial_1nff_hotel
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/deleteParentContentRecord.csv b/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/deleteParentContentRecord.csv
index 4eac45e1a313..1044b243dfb3 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/deleteParentContentRecord.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/deleteParentContentRecord.csv
@@ -1,5 +1,5 @@
 "tt_content",,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","image","categories","tx_irretutorial_hotels"
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","image","categories","tx_irretutorial_1nff_hotels"
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1","\NULL",0,2
 ,298,89,1000000000,1,0,0,0,0,0,0,0,"Regular Element #2","\NULL",0,1
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/localizeParentContentRecord.csv b/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/localizeParentContentRecord.csv
index 8d0c818848ad..f10ac4a0d018 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/localizeParentContentRecord.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/localizeParentContentRecord.csv
@@ -1,5 +1,5 @@
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_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
 ,299,89,768,0,1,298,0,0,0,0,0,"[Translate to Dansk:] Regular Element #2",0,0,1
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/modifyOnlyHotelChildRecord.csv b/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/modifyOnlyHotelChildRecord.csv
index 4df4b7c7bb2d..1dd7b72c8f3b 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/modifyOnlyHotelChildRecord.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/modifyOnlyHotelChildRecord.csv
@@ -1,5 +1,5 @@
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_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
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/modifyParentContentRecord.csv b/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/modifyParentContentRecord.csv
index 0a29956fbe5a..595675ca1055 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/modifyParentContentRecord.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/modifyParentContentRecord.csv
@@ -1,4 +1,4 @@
 "tt_content",,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","image","categories","tx_irretutorial_hotels"
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","image","categories","tx_irretutorial_1nff_hotels"
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1","\NULL",0,2
 ,298,89,512,0,0,0,0,0,0,0,0,"Testing #1","\NULL",0,1
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/modifyParentRecordAndAddHotelChildRecord.csv b/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/modifyParentRecordAndAddHotelChildRecord.csv
index 05db685a1d47..2336b2801a35 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/modifyParentRecordAndAddHotelChildRecord.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/modifyParentRecordAndAddHotelChildRecord.csv
@@ -1,5 +1,5 @@
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_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,2
 tx_irretutorial_1nff_hotel
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/modifyParentRecordAndChangeHotelChildRecordsSorting.csv b/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/modifyParentRecordAndChangeHotelChildRecordsSorting.csv
index 297a83e5fbb2..648175123203 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/modifyParentRecordAndChangeHotelChildRecordsSorting.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/modifyParentRecordAndChangeHotelChildRecordsSorting.csv
@@ -1,5 +1,5 @@
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_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
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/modifyParentRecordAndDeleteHotelChildRecord.csv b/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/modifyParentRecordAndDeleteHotelChildRecord.csv
index 97f5a52af1d4..b7de16bb577d 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/modifyParentRecordAndDeleteHotelChildRecord.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/modifyParentRecordAndDeleteHotelChildRecord.csv
@@ -1,5 +1,5 @@
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_hotels
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",,0,1
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",,0,1
 tx_irretutorial_1nff_hotel
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/modifyParentRecordWithHotelChildRecord.csv b/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/modifyParentRecordWithHotelChildRecord.csv
index 4df4b7c7bb2d..1dd7b72c8f3b 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/modifyParentRecordWithHotelChildRecord.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/modifyParentRecordWithHotelChildRecord.csv
@@ -1,5 +1,5 @@
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_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
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/moveParentContentRecordToDifferentPage.csv b/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/moveParentContentRecordToDifferentPage.csv
index 312590a13b60..1713ea5cd34b 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/moveParentContentRecordToDifferentPage.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/moveParentContentRecordToDifferentPage.csv
@@ -1,5 +1,5 @@
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_hotels
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",,0,2
 ,298,90,256,0,0,0,0,0,0,0,0,"Regular Element #2",,0,1
 tx_irretutorial_1nff_hotel
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/moveParentContentRecordToDifferentPageAndChangeSorting.csv b/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/moveParentContentRecordToDifferentPageAndChangeSorting.csv
index 6ebb05aa2cb4..9fae3e6a681f 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/moveParentContentRecordToDifferentPageAndChangeSorting.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/moveParentContentRecordToDifferentPageAndChangeSorting.csv
@@ -1,5 +1,5 @@
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_hotels
 ,297,90,512,0,0,0,0,0,0,0,0,"Regular Element #1",,0,2
 ,298,90,256,0,0,0,0,0,0,0,0,"Regular Element #2",,0,1
 tx_irretutorial_1nff_hotel
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Scenario/LiveDefaultElements.csv b/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Scenario/LiveDefaultElements.csv
index 5fc32df6ef8e..959e6818437d 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Scenario/LiveDefaultElements.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Scenario/LiveDefaultElements.csv
@@ -3,7 +3,7 @@
 ,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","t3ver_move_id","header","image","categories","tx_irretutorial_hotels"
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","image","categories","tx_irretutorial_1nff_hotels"
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1","\NULL",0,2
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2","\NULL",0,1
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/copyContentRecordOfCategoryRelation.csv b/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/copyContentRecordOfCategoryRelation.csv
index 8ae064f33a8e..35c3862c2f7d 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/copyContentRecordOfCategoryRelation.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/copyContentRecordOfCategoryRelation.csv
@@ -1,5 +1,5 @@
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_hotels
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",,2,0
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",,2,0
 ,299,89,128,0,0,0,0,0,0,0,0,"Regular Element #2 (copy 1)",0,2,0
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/deleteContentRecordOfCategoryRelation.csv b/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/deleteContentRecordOfCategoryRelation.csv
index b40bf054681b..f7353da58f39 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/deleteContentRecordOfCategoryRelation.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/deleteContentRecordOfCategoryRelation.csv
@@ -1,5 +1,5 @@
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_hotels
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",,2,0
 ,298,89,1000000000,1,0,0,0,0,0,0,0,"Regular Element #2",,2,0
 sys_category_record_mm
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/localizeContentRecordOfCategoryRelation.csv b/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/localizeContentRecordOfCategoryRelation.csv
index 4aa7bca94d68..fc95aef10051 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/localizeContentRecordOfCategoryRelation.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/localizeContentRecordOfCategoryRelation.csv
@@ -1,5 +1,5 @@
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_hotels
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",,2,0
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",,2,0
 ,299,89,768,0,1,298,0,0,0,0,0,"[Translate to Dansk:] Regular Element #2",0,2,0
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/modifyBothRecordsOfCategoryRelation.csv b/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/modifyBothRecordsOfCategoryRelation.csv
index 8583566c979f..3c9fbbdd308f 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/modifyBothRecordsOfCategoryRelation.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/modifyBothRecordsOfCategoryRelation.csv
@@ -11,6 +11,6 @@ sys_category_record_mm
 ,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,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_hotels
 ,297,89,256,0,0,0,0,0,0,0,0,"Testing #1",,2,0
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",,2,0
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/modifyCategoryRecordOfCategoryRelation.csv b/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/modifyCategoryRecordOfCategoryRelation.csv
index d3323dcb9e77..6da9e9b19d7d 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/modifyCategoryRecordOfCategoryRelation.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/modifyCategoryRecordOfCategoryRelation.csv
@@ -11,6 +11,6 @@ sys_category_record_mm
 ,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,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_hotels
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",,2,0
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",,2,0
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/modifyContentRecordOfCategoryRelation.csv b/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/modifyContentRecordOfCategoryRelation.csv
index 70a85be6d516..9aa47bde49ab 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/modifyContentRecordOfCategoryRelation.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/modifyContentRecordOfCategoryRelation.csv
@@ -11,6 +11,6 @@ sys_category_record_mm
 ,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,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_hotels
 ,297,89,256,0,0,0,0,0,0,0,0,"Testing #1",,2,0
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",,2,0
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/moveContentRecordOfCategoryRelationToDifferentPage.csv b/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/moveContentRecordOfCategoryRelationToDifferentPage.csv
index 4f44dd416f5e..756d8fb8146b 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/moveContentRecordOfCategoryRelationToDifferentPage.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/moveContentRecordOfCategoryRelationToDifferentPage.csv
@@ -1,5 +1,5 @@
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_hotels
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",,2,0
 ,298,90,256,0,0,0,0,0,0,0,0,"Regular Element #2",,2,0
 sys_category_record_mm
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/DataSet/Scenario/LiveDefaultElements.csv b/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/DataSet/Scenario/LiveDefaultElements.csv
index faa0353c2bfe..2686e8cc9281 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/DataSet/Scenario/LiveDefaultElements.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/DataSet/Scenario/LiveDefaultElements.csv
@@ -15,6 +15,6 @@
 ,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","t3ver_move_id","header","image","categories","tx_irretutorial_hotels"
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","image","categories","tx_irretutorial_1nff_hotels"
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1","\NULL",2,0
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2","\NULL",2,0
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/DataSet/Assertion/changeContentRecordSorting.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/DataSet/Assertion/changeContentRecordSorting.csv
index eb85e1e05a2e..0b1932856303 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/DataSet/Assertion/changeContentRecordSorting.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/DataSet/Assertion/changeContentRecordSorting.csv
@@ -1,4 +1,4 @@
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_hotels
 ,297,89,768,0,0,0,0,0,0,0,0,"Regular Element #1",,0,0
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",,0,0
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/DataSet/Assertion/copyContentRecord.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/DataSet/Assertion/copyContentRecord.csv
index 23a5a68f4dd8..f8ede5d8e447 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/DataSet/Assertion/copyContentRecord.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/DataSet/Assertion/copyContentRecord.csv
@@ -1,5 +1,5 @@
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_hotels
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",,0,0
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",,0,0
 ,299,89,128,0,0,0,0,0,0,0,0,"Regular Element #2 (copy 1)",0,0,0
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/DataSet/Assertion/copyPageRecord.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/DataSet/Assertion/copyPageRecord.csv
index f61da22755b7..3a8b5f2912b8 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/DataSet/Assertion/copyPageRecord.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/DataSet/Assertion/copyPageRecord.csv
@@ -6,7 +6,7 @@ pages
 ,90,88,512,0,0,0,0,0,0,Target
 ,91,90,256,0,0,0,0,0,0,Relations
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,tx_irretutorial_1nff_hotels
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",,0
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",,0
 ,299,91,256,0,0,0,0,0,0,0,0,"Regular Element #2",0,0
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/DataSet/Assertion/createContentRecords.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/DataSet/Assertion/createContentRecords.csv
index 3e07929effc8..136b3aedd5c5 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/DataSet/Assertion/createContentRecords.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/DataSet/Assertion/createContentRecords.csv
@@ -1,5 +1,5 @@
 "tt_content",,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","image","categories","tx_irretutorial_hotels"
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","image","categories","tx_irretutorial_1nff_hotels"
 ,299,89,128,0,0,0,0,0,0,0,0,"Testing #1","\NULL",0,0
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1","\NULL",0,0
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2","\NULL",0,0
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/DataSet/Assertion/deleteContentRecord.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/DataSet/Assertion/deleteContentRecord.csv
index 17212cf05af2..b4ed57194926 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/DataSet/Assertion/deleteContentRecord.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/DataSet/Assertion/deleteContentRecord.csv
@@ -1,4 +1,4 @@
 "tt_content",,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","image","categories","tx_irretutorial_hotels"
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","image","categories","tx_irretutorial_1nff_hotels"
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1","\NULL",0,0
 ,298,89,1000000000,1,0,0,0,0,0,0,0,"Regular Element #2","\NULL",0,0
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/DataSet/Assertion/deletePageRecord.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/DataSet/Assertion/deletePageRecord.csv
index be2c7df03453..7a618b45a6b8 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/DataSet/Assertion/deletePageRecord.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/DataSet/Assertion/deletePageRecord.csv
@@ -5,6 +5,6 @@ pages
 ,89,88,1000000000,1,0,0,0,0,0,Relations
 ,90,88,512,0,0,0,0,0,0,Target
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_hotels
 ,297,89,1000000000,1,0,0,0,0,0,0,0,"Regular Element #1",,0,0
 ,298,89,1000000000,1,0,0,0,0,0,0,0,"Regular Element #2",,0,0
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/DataSet/Assertion/localizeContentRecord.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/DataSet/Assertion/localizeContentRecord.csv
index ae8fbd1d3548..34168d1b9f18 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/DataSet/Assertion/localizeContentRecord.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/DataSet/Assertion/localizeContentRecord.csv
@@ -1,5 +1,5 @@
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_hotels
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",,0,0
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",,0,0
 ,299,89,768,0,1,298,0,0,0,0,0,"[Translate to Dansk:] Regular Element #2",0,0,0
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/DataSet/Assertion/localizePageRecord.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/DataSet/Assertion/localizePageRecord.csv
index 8c8d9a67afff..30a21bf2c270 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/DataSet/Assertion/localizePageRecord.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/DataSet/Assertion/localizePageRecord.csv
@@ -8,6 +8,6 @@ pages_language_overlay
 ,uid,pid,deleted,sys_language_uid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,title
 ,1,89,0,1,0,0,0,0,"[Translate to Dansk:] Relations"
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_hotels
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",,0,0
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",,0,0
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/DataSet/Assertion/modifyContentRecord.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/DataSet/Assertion/modifyContentRecord.csv
index 8b02b73be5b7..7bfc48b7483a 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/DataSet/Assertion/modifyContentRecord.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/DataSet/Assertion/modifyContentRecord.csv
@@ -1,4 +1,4 @@
 "tt_content",,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","image","categories","tx_irretutorial_hotels"
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","image","categories","tx_irretutorial_1nff_hotels"
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1","\NULL",0,0
 ,298,89,512,0,0,0,0,0,0,0,0,"Testing #1","\NULL",0,0
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/DataSet/Assertion/moveContentRecordToDifferentPage.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/DataSet/Assertion/moveContentRecordToDifferentPage.csv
index 3d384a4cc156..46b8a5f2e8aa 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/DataSet/Assertion/moveContentRecordToDifferentPage.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/DataSet/Assertion/moveContentRecordToDifferentPage.csv
@@ -1,4 +1,4 @@
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_hotels
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",,0,0
 ,298,90,256,0,0,0,0,0,0,0,0,"Regular Element #2",,0,0
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/DataSet/Assertion/moveContentRecordToDifferentPageAndChangeSorting.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/DataSet/Assertion/moveContentRecordToDifferentPageAndChangeSorting.csv
index 8b7acceb1a08..4a1cb35bb361 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/DataSet/Assertion/moveContentRecordToDifferentPageAndChangeSorting.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/DataSet/Assertion/moveContentRecordToDifferentPageAndChangeSorting.csv
@@ -1,4 +1,4 @@
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_hotels
 ,297,90,512,0,0,0,0,0,0,0,0,"Regular Element #1",,0,0
 ,298,90,256,0,0,0,0,0,0,0,0,"Regular Element #2",,0,0
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/DataSet/Assertion/movePageRecordToDifferentPage.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/DataSet/Assertion/movePageRecordToDifferentPage.csv
index 531b93e7b926..8896718306e3 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/DataSet/Assertion/movePageRecordToDifferentPage.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/DataSet/Assertion/movePageRecordToDifferentPage.csv
@@ -5,6 +5,6 @@ pages
 ,89,90,256,0,0,0,0,0,0,Relations
 ,90,88,512,0,0,0,0,0,0,Target
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_hotels
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",,0,0
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",,0,0
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/DataSet/Assertion/movePageRecordToDifferentPageAndChangeSorting.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/DataSet/Assertion/movePageRecordToDifferentPageAndChangeSorting.csv
index 915ba38f01dd..cec2f319b9ca 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/DataSet/Assertion/movePageRecordToDifferentPageAndChangeSorting.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/DataSet/Assertion/movePageRecordToDifferentPageAndChangeSorting.csv
@@ -5,6 +5,6 @@ pages
 ,89,1,192,0,0,0,0,0,0,Relations
 ,90,1,128,0,0,0,0,0,0,Target
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_hotels
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",,0,0
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",,0,0
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/DataSet/Scenario/LiveDefaultElements.csv b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/DataSet/Scenario/LiveDefaultElements.csv
index 380aec137da9..ab3220d66137 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Regular/DataSet/Scenario/LiveDefaultElements.csv
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Regular/DataSet/Scenario/LiveDefaultElements.csv
@@ -9,6 +9,6 @@
 ,30,0,768,0,0,0,0,0,0,0,0,"Category C",0,0,
 ,31,0,1024,0,0,0,0,0,0,0,0,"Category A.A",28,0,
 "tt_content",,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","image","categories","tx_irretutorial_hotels"
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","image","categories","tx_irretutorial_1nff_hotels"
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1","\NULL",0,0
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2","\NULL",0,0
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/ExtTables/ext_tables.general.php b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/ExtTables/ext_tables.general.php
index af9fb419b865..2ec9b2f50d63 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/ExtTables/ext_tables.general.php
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/ExtTables/ext_tables.general.php
@@ -67,9 +67,9 @@ if (!defined('TYPO3_MODE')) {
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTCAcolumns(
 	'tt_content',
 	 array(
-		 'tx_irretutorial_hotels' => array(
+		 'tx_irretutorial_1nff_hotels' => array(
 			'exclude' => 1,
-			'label' => 'LLL:EXT:irre_tutorial/Resources/Private/Language/locallang_db.xml:tt_content.tx_irretutorial_hotels',
+			'label' => 'LLL:EXT:irre_tutorial/Resources/Private/Language/locallang_db.xml:tt_content.tx_irretutorial_1nff_hotels',
 			'config' => array(
 				'type' => 'inline',
 				'foreign_table' => 'tx_irretutorial_1nff_hotel',
@@ -103,6 +103,6 @@ if (!defined('TYPO3_MODE')) {
 
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addToAllTCAtypes(
 	'tt_content',
-	'--div--;LLL:EXT:irre_tutorial/Resources/Private/Language/locallang_db.xml:tt_content.div.irre, tx_irretutorial_hotels;;;;1-1-1, tx_irretutorial_flexform'
+	'--div--;LLL:EXT:irre_tutorial/Resources/Private/Language/locallang_db.xml:tt_content.div.irre, tx_irretutorial_1nff_hotels;;;;1-1-1, tx_irretutorial_flexform'
 );
 ?>
\ No newline at end of file
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Resources/Private/Language/locallang_db.xml b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Resources/Private/Language/locallang_db.xml
index 392625d347e9..349e703eeb23 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Resources/Private/Language/locallang_db.xml
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Resources/Private/Language/locallang_db.xml
@@ -12,7 +12,7 @@
 			<label index="pages.doktype.div.irre">IRRE Tutorial</label>
 			<label index="pages.doktype.I.233">IRRE Tutorial Test Page</label>
 			<label index="pages.tx_irretutorial_hotels">Hotels:</label>
-			<label index="tt_content.tx_irretutorial_hotels">Hotels:</label>
+			<label index="tt_content.tx_irretutorial_1nff_hotels">Hotels:</label>
 			<label index="tt_content.tx_irretutorial_flexform">IRRE:</label>
 			<label index="tt_content.tx_irretutorial_flexform.hotels">IRRE:</label>
 			<label index="tt_content.div.irre">IRRE Tutorial</label>
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 c3261a91f90c..7616e15bc37f 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
@@ -22,7 +22,7 @@ CREATE TABLE pages_language_overlay (
 # Table structure for table 'tt_content'
 #
 CREATE TABLE tt_content (
-    tx_irretutorial_hotels int(11) DEFAULT '0' NOT NULL,
+    tx_irretutorial_1nff_hotels int(11) DEFAULT '0' NOT NULL,
     tx_irretutorial_flexform mediumtext
 );
 
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Frontend/JsonRenderer.ts b/typo3/sysext/core/Tests/Functional/Fixtures/Frontend/JsonRenderer.ts
index 64520bafb3a3..35e76d093f73 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Frontend/JsonRenderer.ts
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Frontend/JsonRenderer.ts
@@ -15,7 +15,7 @@ watcher {
 	tableFields {
 		pages = uid,_ORIG_uid,pid,sorting,title
 		sys_category = uid,_ORIG_uid,_LOCALIZED_UID,pid,sys_language_uid,title,parent,items,sys_language_uid
-		tt_content = uid,_ORIG_uid,_LOCALIZED_UID,pid,sorting,sys_language_uid,header,categories,tx_irretutorial_hotels
+		tt_content = uid,_ORIG_uid,_LOCALIZED_UID,pid,sorting,sys_language_uid,header,categories,tx_irretutorial_1nff_hotels
 		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
@@ -60,8 +60,8 @@ page {
 			}
 			20 = CONTENT
 			20 {
-				if.isTrue.field = tx_irretutorial_hotels
-				watcher.parentRecordField = tx_irretutorial_hotels
+				if.isTrue.field = tx_irretutorial_1nff_hotels
+				watcher.parentRecordField = tx_irretutorial_1nff_hotels
 				table = tx_irretutorial_1nff_hotel
 				select {
 					orderBy = sorting
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/AbstractActionTestCase.php b/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/AbstractActionTestCase.php
index de810e3f3d9a..b7c8c8ab3ad6 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/AbstractActionTestCase.php
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/AbstractActionTestCase.php
@@ -44,6 +44,9 @@ abstract class AbstractActionTestCase extends \TYPO3\CMS\Core\Tests\Functional\D
 	const TABLE_Hotel = 'tx_irretutorial_1nff_hotel';
 	const TABLE_Offer = 'tx_irretutorial_1nff_offer';
 
+	const FIELD_ContentHotel = 'tx_irretutorial_1nff_hotels';
+	const FIELD_HotelOffer = 'offers';
+
 	/**
 	 * @var string
 	 */
@@ -90,7 +93,7 @@ abstract class AbstractActionTestCase extends \TYPO3\CMS\Core\Tests\Functional\D
 		$responseContent = $this->getFrontendResponse(self::VALUE_PageId, 0, self::VALUE_BackendUserId, self::VALUE_WorkspaceId)->getResponseContent();
 		$this->assertResponseContentHasRecords($responseContent, self::TABLE_Content, 'header', 'Testing #1');
 		$this->assertResponseContentStructureHasRecords(
-			$responseContent, self::TABLE_Content . ':' . self::VALUE_ContentIdLast, 'tx_irretutorial_hotels',
+			$responseContent, self::TABLE_Content . ':' . self::VALUE_ContentIdLast, self::FIELD_ContentHotel,
 			self::TABLE_Hotel, 'title', array('Hotel #1')
 		);
 	}
@@ -129,7 +132,7 @@ abstract class AbstractActionTestCase extends \TYPO3\CMS\Core\Tests\Functional\D
 		$newContentId = $newTableIds[self::TABLE_Content][self::VALUE_ContentIdLast];
 		$responseContent = $this->getFrontendResponse(self::VALUE_PageId, 0, self::VALUE_BackendUserId, self::VALUE_WorkspaceId)->getResponseContent();
 		$this->assertResponseContentStructureHasRecords(
-			$responseContent, self::TABLE_Content . ':' . $newContentId, 'tx_irretutorial_hotels',
+			$responseContent, self::TABLE_Content . ':' . $newContentId, self::FIELD_ContentHotel,
 			self::TABLE_Hotel, 'title', array('Hotel #1')
 		);
 	}
@@ -143,7 +146,7 @@ abstract class AbstractActionTestCase extends \TYPO3\CMS\Core\Tests\Functional\D
 
 		$responseContent = $this->getFrontendResponse(self::VALUE_PageId, self::VALUE_LanguageId, self::VALUE_BackendUserId, self::VALUE_WorkspaceId)->getResponseContent();
 		$this->assertResponseContentStructureHasRecords(
-			$responseContent, self::TABLE_Content . ':' . self::VALUE_ContentIdLast, 'tx_irretutorial_hotels',
+			$responseContent, self::TABLE_Content . ':' . self::VALUE_ContentIdLast, self::FIELD_ContentHotel,
 			self::TABLE_Hotel, 'title', array('[Translate to Dansk:] Hotel #1')
 		);
 	}
@@ -157,11 +160,11 @@ abstract class AbstractActionTestCase extends \TYPO3\CMS\Core\Tests\Functional\D
 
 		$responseContent = $this->getFrontendResponse(self::VALUE_PageId, 0, self::VALUE_BackendUserId, self::VALUE_WorkspaceId)->getResponseContent();
 		$this->assertResponseContentStructureHasRecords(
-			$responseContent, self::TABLE_Content . ':' . self::VALUE_ContentIdFirst, 'tx_irretutorial_hotels',
+			$responseContent, self::TABLE_Content . ':' . self::VALUE_ContentIdFirst, self::FIELD_ContentHotel,
 			self::TABLE_Hotel, 'title', array('Hotel #1', 'Hotel #2')
 		);
 		$this->assertResponseContentStructureHasRecords(
-			$responseContent, self::TABLE_Content . ':' . self::VALUE_ContentIdLast, 'tx_irretutorial_hotels',
+			$responseContent, self::TABLE_Content . ':' . self::VALUE_ContentIdLast, self::FIELD_ContentHotel,
 			self::TABLE_Hotel, 'title', array('Hotel #1')
 		);
 	}
@@ -179,7 +182,7 @@ abstract class AbstractActionTestCase extends \TYPO3\CMS\Core\Tests\Functional\D
 		// @todo Workspace child records gets lost due to core bug
 		/*
 		$this->assertResponseContentStructureHasRecords(
-			$responseContent, self::TABLE_Content . ':' . self::VALUE_ContentIdLast, 'tx_irretutorial_hotels',
+			$responseContent, self::TABLE_Content . ':' . self::VALUE_ContentIdLast, self::FIELD_ContentHotel,
 			self::TABLE_Hotel, 'title', array('Hotel #1')
 		);
 		*/
@@ -197,11 +200,11 @@ abstract class AbstractActionTestCase extends \TYPO3\CMS\Core\Tests\Functional\D
 		$responseContent = $this->getFrontendResponse(self::VALUE_PageIdTarget, 0, self::VALUE_BackendUserId, self::VALUE_WorkspaceId)->getResponseContent();
 		$this->assertResponseContentHasRecords($responseContent, self::TABLE_Content, 'header', array('Regular Element #2', 'Regular Element #1'));
 		$this->assertResponseContentStructureHasRecords(
-			$responseContent, self::TABLE_Content . ':' . self::VALUE_ContentIdFirst, 'tx_irretutorial_hotels',
+			$responseContent, self::TABLE_Content . ':' . self::VALUE_ContentIdFirst, self::FIELD_ContentHotel,
 			self::TABLE_Hotel, 'title', array('Hotel #1', 'Hotel #2')
 		);
 		$this->assertResponseContentStructureHasRecords(
-			$responseContent, self::TABLE_Content . ':' . self::VALUE_ContentIdLast, 'tx_irretutorial_hotels',
+			$responseContent, self::TABLE_Content . ':' . self::VALUE_ContentIdLast, self::FIELD_ContentHotel,
 			self::TABLE_Hotel, 'title', array('Hotel #1')
 		);
 	}
@@ -220,7 +223,7 @@ abstract class AbstractActionTestCase extends \TYPO3\CMS\Core\Tests\Functional\D
 		$responseContent = $this->getFrontendResponse(self::VALUE_PageId, 0, self::VALUE_BackendUserId, self::VALUE_WorkspaceId)->getResponseContent();
 		$this->assertResponseContentHasRecords($responseContent, self::TABLE_Page, 'title', 'Testing #1');
 		$this->assertResponseContentStructureHasRecords(
-			$responseContent, self::TABLE_Content . ':' . self::VALUE_ContentIdFirst, 'tx_irretutorial_hotels',
+			$responseContent, self::TABLE_Content . ':' . self::VALUE_ContentIdFirst, self::FIELD_ContentHotel,
 			self::TABLE_Hotel, 'title', array('Hotel #1', 'Hotel #2')
 		);
 	}
@@ -260,8 +263,8 @@ abstract class AbstractActionTestCase extends \TYPO3\CMS\Core\Tests\Functional\D
 			self::VALUE_PageId,
 			array(
 				self::TABLE_Offer => array('title' => 'Offer #1'),
-				self::TABLE_Hotel => array('title' => 'Hotel #1', 'offers' => '__previousUid'),
-				self::TABLE_Content => array('header' => 'Testing #1', 'tx_irretutorial_hotels' => '__previousUid'),
+				self::TABLE_Hotel => array('title' => 'Hotel #1', self::FIELD_HotelOffer => '__previousUid'),
+				self::TABLE_Content => array('header' => 'Testing #1', self::FIELD_ContentHotel => '__previousUid'),
 			)
 		);
 		$this->assertAssertionDataSet('createParentContentRecordWithHotelAndOfferChildRecords');
@@ -273,7 +276,7 @@ abstract class AbstractActionTestCase extends \TYPO3\CMS\Core\Tests\Functional\D
 		// @todo Shadow fields are not correct on the new placeholder
 		/*
 			$this->assertResponseContentStructureHasRecords(
-				$responseContent, self::TABLE_Content . ':' . $newContentId, 'tx_irretutorial_hotels',
+				$responseContent, self::TABLE_Content . ':' . $newContentId, self::FIELD_ContentHotel,
 				self::TABLE_Hotel, 'title', 'Hotel #1'
 			);
 		*/
@@ -288,8 +291,8 @@ abstract class AbstractActionTestCase extends \TYPO3\CMS\Core\Tests\Functional\D
 			self::VALUE_PageId,
 			array(
 				self::TABLE_Offer => array('title' => 'Offer #1'),
-				self::TABLE_Hotel => array('title' => 'Hotel #1', 'offers' => '__previousUid'),
-				self::TABLE_Content => array('header' => 'Testing #1', 'tx_irretutorial_hotels' => '__previousUid'),
+				self::TABLE_Hotel => array('title' => 'Hotel #1', self::FIELD_HotelOffer => '__previousUid'),
+				self::TABLE_Content => array('header' => 'Testing #1', self::FIELD_ContentHotel => '__previousUid'),
 			)
 		);
 		$newContentId = $newTableIds[self::TABLE_Content][0];
@@ -305,15 +308,15 @@ abstract class AbstractActionTestCase extends \TYPO3\CMS\Core\Tests\Functional\D
 		// @todo Shadow fields are not correct on the new placeholder
 		/*
 			$this->assertResponseContentStructureHasRecords(
-				$responseContent, self::TABLE_Content . ':' . $newContentId, 'tx_irretutorial_hotels',
+				$responseContent, self::TABLE_Content . ':' . $newContentId, self::FIELD_ContentHotel,
 				self::TABLE_Hotel, 'title', 'Hotel #1'
 			);
 			$this->assertResponseContentStructureHasRecords(
-				$responseContent, self::TABLE_Content . ':' . $copiedContentId, 'tx_irretutorial_hotels',
+				$responseContent, self::TABLE_Content . ':' . $copiedContentId, self::FIELD_ContentHotel,
 				self::TABLE_Hotel, 'title', 'Hotel #1'
 			);
 			$this->assertResponseContentStructureHasRecords(
-				$responseContent, self::TABLE_Hotel . ':' . $copiedHotelId, 'offers',
+				$responseContent, self::TABLE_Hotel . ':' . $copiedHotelId, self::FIELD_HotelOffer,
 				self::TABLE_Offer, 'title', 'Offer #1'
 			);
 		 */
@@ -328,8 +331,8 @@ abstract class AbstractActionTestCase extends \TYPO3\CMS\Core\Tests\Functional\D
 			self::VALUE_PageId,
 			array(
 				self::TABLE_Offer => array('title' => 'Offer #1'),
-				self::TABLE_Hotel => array('title' => 'Hotel #1', 'offers' => '__previousUid'),
-				self::TABLE_Content => array('header' => 'Testing #1', 'tx_irretutorial_hotels' => '__previousUid'),
+				self::TABLE_Hotel => array('title' => 'Hotel #1', self::FIELD_HotelOffer => '__previousUid'),
+				self::TABLE_Content => array('header' => 'Testing #1', self::FIELD_ContentHotel => '__previousUid'),
 			)
 		);
 		$newContentId = $newTableIds['tt_content'][0];
@@ -352,8 +355,8 @@ abstract class AbstractActionTestCase extends \TYPO3\CMS\Core\Tests\Functional\D
 			self::VALUE_PageId,
 			array(
 				self::TABLE_Offer => array('title' => 'Offer #1'),
-				self::TABLE_Hotel => array('title' => 'Hotel #1', 'offers' => '__previousUid'),
-				self::TABLE_Content => array('header' => 'Testing #1', 'tx_irretutorial_hotels' => '__previousUid'),
+				self::TABLE_Hotel => array('title' => 'Hotel #1', self::FIELD_HotelOffer => '__previousUid'),
+				self::TABLE_Content => array('header' => 'Testing #1', self::FIELD_ContentHotel => '__previousUid'),
 			)
 		);
 		$newContentId = $newTableIds[self::TABLE_Content][0];
@@ -369,11 +372,11 @@ abstract class AbstractActionTestCase extends \TYPO3\CMS\Core\Tests\Functional\D
 		// @todo Does not work since children don't point to live-default record
 		/*
 			$this->assertResponseContentStructureHasRecords(
-				$responseContent, self::TABLE_Content . ':' . $localizedContentId, 'tx_irretutorial_hotels',
+				$responseContent, self::TABLE_Content . ':' . $localizedContentId, self::FIELD_ContentHotel,
 				self::TABLE_Hotel, 'title', '[Translate to Dansk:] Hotel #1'
 			);
 			$this->assertResponseContentStructureHasRecords(
-				$responseContent, self::TABLE_Hotel . ':' . $localizedHotelId, 'offers',
+				$responseContent, self::TABLE_Hotel . ':' . $localizedHotelId, self::FIELD_HotelOffer,
 				self::TABLE_Offer, 'title', '[Translate to Dansk:] Offer #1'
 			);
 		*/
@@ -388,8 +391,8 @@ abstract class AbstractActionTestCase extends \TYPO3\CMS\Core\Tests\Functional\D
 			self::VALUE_PageId,
 			array(
 				self::TABLE_Offer => array('title' => 'Offer #1'),
-				self::TABLE_Hotel => array('title' => 'Hotel #1', 'offers' => '__previousUid'),
-				self::TABLE_Content => array('header' => 'Testing #1', 'tx_irretutorial_hotels' => '__previousUid'),
+				self::TABLE_Hotel => array('title' => 'Hotel #1', self::FIELD_HotelOffer => '__previousUid'),
+				self::TABLE_Content => array('header' => 'Testing #1', self::FIELD_ContentHotel => '__previousUid'),
 			)
 		);
 		$newContentId = $newTableIds[self::TABLE_Content][0];
@@ -412,7 +415,7 @@ abstract class AbstractActionTestCase extends \TYPO3\CMS\Core\Tests\Functional\D
 
 		$responseContent = $this->getFrontendResponse(self::VALUE_PageId, 0, self::VALUE_BackendUserId, self::VALUE_WorkspaceId)->getResponseContent();
 		$this->assertResponseContentStructureHasRecords(
-			$responseContent, self::TABLE_Content . ':' . self::VALUE_ContentIdFirst, 'tx_irretutorial_hotels',
+			$responseContent, self::TABLE_Content . ':' . self::VALUE_ContentIdFirst, self::FIELD_ContentHotel,
 			self::TABLE_Hotel, 'title', array('Hotel #1', 'Testing #1')
 		);
 	}
@@ -421,12 +424,12 @@ abstract class AbstractActionTestCase extends \TYPO3\CMS\Core\Tests\Functional\D
 	 * @test
 	 */
 	public function modifyParentRecordAndChangeHotelChildRecordsSorting() {
-		$this->actionService->modifyRecord(self::TABLE_Content, self::VALUE_ContentIdFirst, array('tx_irretutorial_hotels' => '4,3'));
+		$this->actionService->modifyRecord(self::TABLE_Content, self::VALUE_ContentIdFirst, array(self::FIELD_ContentHotel => '4,3'));
 		$this->assertAssertionDataSet('modifyParentRecordAndChangeHotelChildRecordsSorting');
 
 		$responseContent = $this->getFrontendResponse(self::VALUE_PageId, 0, self::VALUE_BackendUserId, self::VALUE_WorkspaceId)->getResponseContent();
 		$this->assertResponseContentStructureHasRecords(
-			$responseContent, self::TABLE_Content . ':' . self::VALUE_ContentIdFirst, 'tx_irretutorial_hotels',
+			$responseContent, self::TABLE_Content . ':' . self::VALUE_ContentIdFirst, self::FIELD_ContentHotel,
 			self::TABLE_Hotel, 'title', array('Hotel #2', 'Hotel #1')
 		);
 	}
@@ -439,14 +442,14 @@ abstract class AbstractActionTestCase extends \TYPO3\CMS\Core\Tests\Functional\D
 			self::VALUE_PageId,
 			array(
 				self::TABLE_Hotel => array('uid' => 4, 'title' => 'Testing #1'),
-				self::TABLE_Content => array('uid' => self::VALUE_ContentIdFirst, 'tx_irretutorial_hotels' => '3,4'),
+				self::TABLE_Content => array('uid' => self::VALUE_ContentIdFirst, self::FIELD_ContentHotel => '3,4'),
 			)
 		);
 		$this->assertAssertionDataSet('modifyParentRecordWithHotelChildRecord');
 
 		$responseContent = $this->getFrontendResponse(self::VALUE_PageId, 0, self::VALUE_BackendUserId, self::VALUE_WorkspaceId)->getResponseContent();
 		$this->assertResponseContentStructureHasRecords(
-			$responseContent, self::TABLE_Content . ':' . self::VALUE_ContentIdFirst, 'tx_irretutorial_hotels',
+			$responseContent, self::TABLE_Content . ':' . self::VALUE_ContentIdFirst, self::FIELD_ContentHotel,
 			self::TABLE_Hotel, 'title', array('Hotel #1', 'Testing #1')
 		);
 	}
@@ -459,7 +462,7 @@ abstract class AbstractActionTestCase extends \TYPO3\CMS\Core\Tests\Functional\D
 			self::VALUE_PageId,
 			array(
 				self::TABLE_Hotel => array('uid' => 4, 'title' => 'Testing #1'),
-				self::TABLE_Content => array('uid' => self::VALUE_ContentIdFirst, 'tx_irretutorial_hotels' => '3,4'),
+				self::TABLE_Content => array('uid' => self::VALUE_ContentIdFirst, self::FIELD_ContentHotel => '3,4'),
 			)
 		);
 		$modifiedContentId = $this->actionService->getDataHander()->getAutoVersionId(self::TABLE_Content, self::VALUE_ContentIdFirst);
@@ -469,14 +472,14 @@ abstract class AbstractActionTestCase extends \TYPO3\CMS\Core\Tests\Functional\D
 		$responseContent = $this->getFrontendResponse(self::VALUE_PageId, 0, self::VALUE_BackendUserId, self::VALUE_WorkspaceId)->getResponseContent();
 		$this->assertResponseContentHasRecords($responseContent, self::TABLE_Content, 'header', 'Regular Element #1');
 		$this->assertResponseContentStructureHasRecords(
-			$responseContent, self::TABLE_Content . ':' . self::VALUE_ContentIdFirst, 'tx_irretutorial_hotels',
+			$responseContent, self::TABLE_Content . ':' . self::VALUE_ContentIdFirst, self::FIELD_ContentHotel,
 			self::TABLE_Hotel, 'title', array('Hotel #1', 'Testing #1')
 			// @todo Discarding the parent record should discard the child records as well
 			// self::TABLE_Hotel, 'title', array('Hotel #1', 'Hotel #2')
 		);
 		/*
 			$this->assertResponseContentStructureDoesNotHaveRecords(
-				$responseContent, self::TABLE_Content . ':' . self::VALUE_ContentIdFirst, 'tx_irretutorial_hotels',
+				$responseContent, self::TABLE_Content . ':' . self::VALUE_ContentIdFirst, self::FIELD_ContentHotel,
 				self::TABLE_Hotel, 'title', 'Testing #1'
 			);
 		*/
@@ -490,7 +493,7 @@ abstract class AbstractActionTestCase extends \TYPO3\CMS\Core\Tests\Functional\D
 			self::VALUE_PageId,
 			array(
 				self::TABLE_Hotel => array('uid' => 4, 'title' => 'Testing #1'),
-				self::TABLE_Content => array('uid' => self::VALUE_ContentIdFirst, 'tx_irretutorial_hotels' => '3,4'),
+				self::TABLE_Content => array('uid' => self::VALUE_ContentIdFirst, self::FIELD_ContentHotel => '3,4'),
 			)
 		);
 		$modifiedContentId = $this->actionService->getDataHander()->getAutoVersionId(self::TABLE_Content, self::VALUE_ContentIdFirst);
@@ -506,7 +509,7 @@ abstract class AbstractActionTestCase extends \TYPO3\CMS\Core\Tests\Functional\D
 		$responseContent = $this->getFrontendResponse(self::VALUE_PageId, 0, self::VALUE_BackendUserId, self::VALUE_WorkspaceId)->getResponseContent();
 		$this->assertResponseContentHasRecords($responseContent, self::TABLE_Content, 'header', 'Regular Element #1');
 		$this->assertResponseContentStructureHasRecords(
-			$responseContent, self::TABLE_Content . ':' . self::VALUE_ContentIdFirst, 'tx_irretutorial_hotels',
+			$responseContent, self::TABLE_Content . ':' . self::VALUE_ContentIdFirst, self::FIELD_ContentHotel,
 			self::TABLE_Hotel, 'title', array('Hotel #1', 'Hotel #2')
 		);
 	}
@@ -519,7 +522,7 @@ abstract class AbstractActionTestCase extends \TYPO3\CMS\Core\Tests\Functional\D
 			self::VALUE_PageId,
 			array(
 				self::TABLE_Hotel => array('uid' => '__NEW', 'title' => 'Hotel #2'),
-				self::TABLE_Content => array('uid' => self::VALUE_ContentIdLast, 'tx_irretutorial_hotels' => '5,__previousUid'),
+				self::TABLE_Content => array('uid' => self::VALUE_ContentIdLast, self::FIELD_ContentHotel => '5,__previousUid'),
 			)
 		);
 		$this->assertAssertionDataSet('modifyParentRecordAndAddHotelChildRecord');
@@ -529,7 +532,7 @@ abstract class AbstractActionTestCase extends \TYPO3\CMS\Core\Tests\Functional\D
 		// @todo Child record cannot be selected since they do not point to the live record
 		/*
 			$this->assertResponseContentStructureHasRecords(
-				$responseContent, self::TABLE_Content . ':' . self::VALUE_ContentIdLast, 'tx_irretutorial_hotels',
+				$responseContent, self::TABLE_Content . ':' . self::VALUE_ContentIdLast, self::FIELD_ContentHotel,
 				self::TABLE_Hotel, 'title', array('Hotel #1', 'Hotel #2')
 			);
 		*/
@@ -542,18 +545,18 @@ abstract class AbstractActionTestCase extends \TYPO3\CMS\Core\Tests\Functional\D
 		$this->actionService->modifyRecord(
 			self::TABLE_Content,
 			self::VALUE_ContentIdFirst,
-			array('tx_irretutorial_hotels' => '3'),
+			array(self::FIELD_ContentHotel => '3'),
 			array(self::TABLE_Hotel => array(4))
 		);
 		$this->assertAssertionDataSet('modifyParentRecordAndDeleteHotelChildRecord');
 
 		$responseContent = $this->getFrontendResponse(self::VALUE_PageId, 0, self::VALUE_BackendUserId, self::VALUE_WorkspaceId)->getResponseContent();
 		$this->assertResponseContentStructureHasRecords(
-			$responseContent, self::TABLE_Content . ':' . self::VALUE_ContentIdLast, 'tx_irretutorial_hotels',
+			$responseContent, self::TABLE_Content . ':' . self::VALUE_ContentIdLast, self::FIELD_ContentHotel,
 			self::TABLE_Hotel, 'title', 'Hotel #1'
 		);
 		$this->assertResponseContentStructureDoesNotHaveRecords(
-			$responseContent, self::TABLE_Content . ':' . self::VALUE_ContentIdLast, 'tx_irretutorial_hotels',
+			$responseContent, self::TABLE_Content . ':' . self::VALUE_ContentIdLast, self::FIELD_ContentHotel,
 			self::TABLE_Hotel, 'title', 'Hotel #2'
 		);
 	}
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/changeParentContentRecordSorting.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/changeParentContentRecordSorting.csv
index 0cdf9e8585fa..8655d66ac383 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/changeParentContentRecordSorting.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/changeParentContentRecordSorting.csv
@@ -1,5 +1,5 @@
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_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
 ,299,-1,256,0,0,0,1,4,0,297,0,"Regular Element #1",0,0,2
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/copyPageRecord.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/copyPageRecord.csv
index 187db54d9708..7ea0469c7432 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/copyPageRecord.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/copyPageRecord.csv
@@ -7,7 +7,7 @@ pages
 ,91,90,256,0,1,1,0,0,0,Relations
 ,92,-1,256,0,1,-1,0,91,0,Relations
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_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
 ,299,91,256,0,0,0,1,1,0,0,0,"Regular Element #2",,0,0
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/copyParentContentRecord.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/copyParentContentRecord.csv
index 5127a9dde40d..a58b101653dc 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/copyParentContentRecord.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/copyParentContentRecord.csv
@@ -1,5 +1,5 @@
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_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
 ,299,89,128,0,0,0,1,1,0,0,0,"Regular Element #2 (copy 1)",,0,0
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/createAndCopyParentContentRecordWithHotelAndOfferChildRecords.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/createAndCopyParentContentRecordWithHotelAndOfferChildRecords.csv
index bd1572fd2ab3..ef68a49298ee 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/createAndCopyParentContentRecordWithHotelAndOfferChildRecords.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/createAndCopyParentContentRecordWithHotelAndOfferChildRecords.csv
@@ -1,5 +1,5 @@
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_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
 ,299,89,128,0,0,0,1,1,0,0,0,"Testing #1",,0,0
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/createAndCopyParentContentRecordWithHotelAndOfferChildRecordsAndDiscardCopiedParentRecord.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/createAndCopyParentContentRecordWithHotelAndOfferChildRecordsAndDiscardCopiedParentRecord.csv
index 24e4b1a1d553..8851ee6c4bf2 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/createAndCopyParentContentRecordWithHotelAndOfferChildRecordsAndDiscardCopiedParentRecord.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/createAndCopyParentContentRecordWithHotelAndOfferChildRecordsAndDiscardCopiedParentRecord.csv
@@ -1,5 +1,5 @@
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_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
 ,299,89,128,0,0,0,1,1,0,0,0,"Testing #1",,0,0
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/createAndLocalizeParentContentRecordWithHotelAndOfferChildRecords.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/createAndLocalizeParentContentRecordWithHotelAndOfferChildRecords.csv
index fd55e1cbabfc..be0ac7568cff 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/createAndLocalizeParentContentRecordWithHotelAndOfferChildRecords.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/createAndLocalizeParentContentRecordWithHotelAndOfferChildRecords.csv
@@ -1,5 +1,5 @@
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_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
 ,299,89,128,0,0,0,1,1,0,0,0,"Testing #1",,0,0
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/createAndLocalizeParentContentRecordWithHotelAndOfferChildRecordsAndDiscardLocalizedParentRecord.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/createAndLocalizeParentContentRecordWithHotelAndOfferChildRecordsAndDiscardLocalizedParentRecord.csv
index 5be62769e27b..c28c8fc7e79e 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/createAndLocalizeParentContentRecordWithHotelAndOfferChildRecordsAndDiscardLocalizedParentRecord.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/createAndLocalizeParentContentRecordWithHotelAndOfferChildRecordsAndDiscardLocalizedParentRecord.csv
@@ -1,5 +1,5 @@
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_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
 ,299,89,128,0,0,0,1,1,0,0,0,"Testing #1",,0,0
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/createParentContentRecord.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/createParentContentRecord.csv
index 0ed8958f3695..be354131e776 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/createParentContentRecord.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/createParentContentRecord.csv
@@ -1,5 +1,5 @@
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_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
 ,299,89,128,0,0,0,1,1,0,0,0,"Testing #1",,0,0
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/createParentContentRecordWithHotelAndOfferChildRecords.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/createParentContentRecordWithHotelAndOfferChildRecords.csv
index 64e5d9ca6e01..91fa09fe58df 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/createParentContentRecordWithHotelAndOfferChildRecords.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/createParentContentRecordWithHotelAndOfferChildRecords.csv
@@ -1,5 +1,5 @@
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_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
 ,299,89,128,0,0,0,1,1,0,0,0,"Testing #1",,0,0
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/deletePageRecord.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/deletePageRecord.csv
index 99de9ab7b610..c4d195e0f962 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/deletePageRecord.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/deletePageRecord.csv
@@ -6,7 +6,7 @@ pages
 ,90,88,512,0,0,0,0,0,0,Target
 ,91,-1,256,0,1,2,0,89,0,Relations
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_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
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/deleteParentContentRecord.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/deleteParentContentRecord.csv
index 469f9cd48e4a..37a1d01c0a66 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/deleteParentContentRecord.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/deleteParentContentRecord.csv
@@ -1,5 +1,5 @@
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_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
 ,299,-1,512,0,0,0,1,2,0,298,0,"Regular Element #2",0,0,1
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/deleteParentContentRecordAndDiscardDeletedParentRecord.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/deleteParentContentRecordAndDiscardDeletedParentRecord.csv
index 405ca32f4c6b..d7f79581f42b 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/deleteParentContentRecordAndDiscardDeletedParentRecord.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/deleteParentContentRecordAndDiscardDeletedParentRecord.csv
@@ -1,5 +1,5 @@
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_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
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/localizeParentContentRecord.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/localizeParentContentRecord.csv
index e5a63c8c985b..fe24a37f675d 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/localizeParentContentRecord.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/localizeParentContentRecord.csv
@@ -1,5 +1,5 @@
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_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
 ,299,89,768,0,1,298,1,1,0,0,0,"[Translate to Dansk:] Regular Element #2",,0,0
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/modifyOnlyHotelChildRecord.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/modifyOnlyHotelChildRecord.csv
index 367a5b03f6bb..3b1803f0a783 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/modifyOnlyHotelChildRecord.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/modifyOnlyHotelChildRecord.csv
@@ -1,5 +1,5 @@
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_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
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/modifyPageRecord.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/modifyPageRecord.csv
index 26001a9181ff..5135b806d4ad 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/modifyPageRecord.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/modifyPageRecord.csv
@@ -6,7 +6,7 @@ pages
 ,90,88,512,0,0,0,0,0,0,Target
 ,91,-1,256,0,1,0,0,89,0,"Testing #1"
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_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
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/modifyParentContentRecord.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/modifyParentContentRecord.csv
index af499b890880..19065a5cdafe 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/modifyParentContentRecord.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/modifyParentContentRecord.csv
@@ -1,5 +1,5 @@
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_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
 ,299,-1,512,0,0,0,1,0,0,298,0,"Testing #1",0,0,1
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/modifyParentRecordAndAddHotelChildRecord.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/modifyParentRecordAndAddHotelChildRecord.csv
index 0dbf527c669b..30b4e3a80978 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/modifyParentRecordAndAddHotelChildRecord.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/modifyParentRecordAndAddHotelChildRecord.csv
@@ -1,5 +1,5 @@
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_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
 ,299,-1,512,0,0,0,1,0,0,298,0,"Regular Element #2",0,0,2
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/modifyParentRecordAndChangeHotelChildRecordsSorting.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/modifyParentRecordAndChangeHotelChildRecordsSorting.csv
index 5cafcb99449c..c75632f28146 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/modifyParentRecordAndChangeHotelChildRecordsSorting.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/modifyParentRecordAndChangeHotelChildRecordsSorting.csv
@@ -1,5 +1,5 @@
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_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
 ,299,-1,256,0,0,0,1,0,0,297,0,"Regular Element #1",0,0,2
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/modifyParentRecordAndDeleteHotelChildRecord.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/modifyParentRecordAndDeleteHotelChildRecord.csv
index 42034454a2c5..1f9c5d148b73 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/modifyParentRecordAndDeleteHotelChildRecord.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/modifyParentRecordAndDeleteHotelChildRecord.csv
@@ -1,5 +1,5 @@
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_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
 ,299,-1,256,0,0,0,1,0,0,297,0,"Regular Element #1",0,0,1
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/modifyParentRecordWithHotelChildRecord.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/modifyParentRecordWithHotelChildRecord.csv
index 9a81e96dae8b..2604c2a3bb07 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/modifyParentRecordWithHotelChildRecord.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/modifyParentRecordWithHotelChildRecord.csv
@@ -1,5 +1,5 @@
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_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
 ,299,-1,256,0,0,0,1,0,0,297,0,"Regular Element #1",0,0,2
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/modifyParentRecordWithHotelChildRecordAndDiscardAllModifiedRecords.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/modifyParentRecordWithHotelChildRecordAndDiscardAllModifiedRecords.csv
index 04f8f66743b5..8359ca597e2e 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/modifyParentRecordWithHotelChildRecordAndDiscardAllModifiedRecords.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/modifyParentRecordWithHotelChildRecordAndDiscardAllModifiedRecords.csv
@@ -1,5 +1,5 @@
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_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
 ,299,-1,256,0,0,0,0,0,0,297,0,"Regular Element #1",0,0,2
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/modifyParentRecordWithHotelChildRecordAndDiscardModifiedParentRecord.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/modifyParentRecordWithHotelChildRecordAndDiscardModifiedParentRecord.csv
index af7494f8c052..e400db66bcb5 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/modifyParentRecordWithHotelChildRecordAndDiscardModifiedParentRecord.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/modifyParentRecordWithHotelChildRecordAndDiscardModifiedParentRecord.csv
@@ -1,5 +1,5 @@
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_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
 ,299,-1,256,0,0,0,0,0,0,297,0,"Regular Element #1",0,0,2
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/moveParentContentRecordToDifferentPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/moveParentContentRecordToDifferentPage.csv
index 6383d9a30ecb..ef7f7a398939 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/moveParentContentRecordToDifferentPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/moveParentContentRecordToDifferentPage.csv
@@ -1,5 +1,5 @@
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_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
 ,299,-1,512,0,0,0,1,4,0,298,0,"Regular Element #2",0,0,1
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/moveParentContentRecordToDifferentPageAndChangeSorting.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/moveParentContentRecordToDifferentPageAndChangeSorting.csv
index bdccd66038a5..fb6dc1c40aea 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/moveParentContentRecordToDifferentPageAndChangeSorting.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Assertion/moveParentContentRecordToDifferentPageAndChangeSorting.csv
@@ -1,5 +1,5 @@
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_hotels
 ,297,90,384,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
 ,299,-1,512,0,0,0,1,4,0,298,0,"Regular Element #2",0,0,1
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Scenario/LiveDefaultElements.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Scenario/LiveDefaultElements.csv
index 81f889fd3905..972ace9d2e31 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Scenario/LiveDefaultElements.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/InlineRelationalRecordEditing/ForeignField/DataSet/Scenario/LiveDefaultElements.csv
@@ -10,7 +10,7 @@ sys_workspace_stage
 ,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","t3ver_move_id","header","image","categories","tx_irretutorial_hotels"
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","image","categories","tx_irretutorial_1nff_hotels"
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1","\NULL",0,2
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2","\NULL",0,1
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/addCategoryRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/addCategoryRelation.csv
index 6cb9587e0ad1..bebea516ab81 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/addCategoryRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/addCategoryRelation.csv
@@ -15,7 +15,7 @@ sys_category_record_mm
 ,29,299,tt_content,0,2,categories
 ,31,299,tt_content,0,3,categories
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_hotels
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",,2,0
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",,2,0
 ,299,-1,256,0,0,0,1,0,0,297,0,"Regular Element #1",0,3,0
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/changeCategoryRelationSorting.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/changeCategoryRelationSorting.csv
index 5d03a131d6d2..ca3206221f32 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/changeCategoryRelationSorting.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/changeCategoryRelationSorting.csv
@@ -14,7 +14,7 @@ sys_category_record_mm
 ,28,299,tt_content,0,2,categories
 ,29,299,tt_content,0,1,categories
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_hotels
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",,2,0
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",,2,0
 ,299,-1,256,0,0,0,1,0,0,297,0,"Regular Element #1",0,2,0
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/copyCategoryRecordOfCategoryRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/copyCategoryRecordOfCategoryRelation.csv
index 0c725cab1861..83dfcee151fc 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/copyCategoryRecordOfCategoryRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/copyCategoryRecordOfCategoryRelation.csv
@@ -15,6 +15,6 @@ sys_category_record_mm
 # --- workspace change ---
 ,33,297,tt_content,1,0,categories
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_hotels
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",,2,0
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",,2,0
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/copyContentRecordOfCategoryRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/copyContentRecordOfCategoryRelation.csv
index 76698ad0998b..d82729290573 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/copyContentRecordOfCategoryRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/copyContentRecordOfCategoryRelation.csv
@@ -14,7 +14,7 @@ sys_category_record_mm
 ,29,300,tt_content,0,1,categories
 ,30,300,tt_content,0,2,categories
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_hotels
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",,2,0
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",,2,0
 ,299,89,128,0,0,0,1,1,0,0,0,"Regular Element #2 (copy 1)",,2,0
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/createCategoryRecordAndAddCategoryRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/createCategoryRecordAndAddCategoryRelation.csv
index 4c4474bd8f6c..810da47a3460 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/createCategoryRecordAndAddCategoryRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/createCategoryRecordAndAddCategoryRelation.csv
@@ -15,6 +15,6 @@ sys_category_record_mm
 # --- workspace change ---
 ,33,297,tt_content,1,0,categories
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_hotels
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",,2,0
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",,2,0
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/createCategoryRecordAndCreateCategoryRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/createCategoryRecordAndCreateCategoryRelation.csv
index c6e5c1c89d4f..4b6bcfdbb7d7 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/createCategoryRecordAndCreateCategoryRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/createCategoryRecordAndCreateCategoryRelation.csv
@@ -15,7 +15,7 @@ sys_category_record_mm
 # --- workspace changes ---
 ,33,300,tt_content,0,1,categories
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_hotels
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",,2,0
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",,2,0
 ,299,89,128,0,0,0,1,1,0,0,0,"Testing #1",,0,0
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/createContentRecordAndAddCategoryRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/createContentRecordAndAddCategoryRelation.csv
index ceca2b4017f5..b934de2f66d2 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/createContentRecordAndAddCategoryRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/createContentRecordAndAddCategoryRelation.csv
@@ -13,7 +13,7 @@ sys_category_record_mm
 # --- workspace changes ---
 ,29,300,tt_content,0,1,categories
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_hotels
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",,2,0
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",,2,0
 ,299,89,128,0,0,0,1,1,0,0,0,"Testing #1",,1,0
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/createContentRecordAndCreateCategoryRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/createContentRecordAndCreateCategoryRelation.csv
index eca9432c7eb6..a463644eefb5 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/createContentRecordAndCreateCategoryRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/createContentRecordAndCreateCategoryRelation.csv
@@ -15,7 +15,7 @@ sys_category_record_mm
 # --- workspace change ---
 ,33,300,tt_content,0,1,categories
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_hotels
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",,2,0
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",,2,0
 ,299,89,128,0,0,0,1,1,0,0,0,"Testing #1",,0,0
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/deleteCategoryRecordOfCategoryRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/deleteCategoryRecordOfCategoryRelation.csv
index 8285326cb48e..b1dcfeb3d50b 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/deleteCategoryRecordOfCategoryRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/deleteCategoryRecordOfCategoryRelation.csv
@@ -14,6 +14,6 @@ sys_category_record_mm
 # --- workspace change ---
 ,32,297,tt_content,1,0,categories
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_hotels
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",,2,0
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",,2,0
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/deleteCategoryRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/deleteCategoryRelation.csv
index aa8cb977769b..2aec9acbac84 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/deleteCategoryRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/deleteCategoryRelation.csv
@@ -13,7 +13,7 @@ sys_category_record_mm
 # --- workspace change ---
 ,28,299,tt_content,0,1,categories
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_hotels
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",,2,0
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",,2,0
 ,299,-1,256,0,0,0,1,0,0,297,0,"Regular Element #1",0,1,0
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/deleteContentRecordOfCategoryRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/deleteContentRecordOfCategoryRelation.csv
index d9e5181609bb..62e02c5a2ff9 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/deleteContentRecordOfCategoryRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/deleteContentRecordOfCategoryRelation.csv
@@ -14,7 +14,7 @@ sys_category_record_mm
 ,29,299,tt_content,0,1,categories
 ,30,299,tt_content,0,2,categories
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_hotels
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",,2,0
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",,2,0
 ,299,-1,512,0,0,0,1,2,0,298,0,"Regular Element #2",0,2,0
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/localizeCategoryRecordOfCategoryRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/localizeCategoryRecordOfCategoryRelation.csv
index 242d0596a3a1..e4015b59a661 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/localizeCategoryRecordOfCategoryRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/localizeCategoryRecordOfCategoryRelation.csv
@@ -15,6 +15,6 @@ sys_category_record_mm
 # --- workspace change ---
 ,33,297,tt_content,1,0,categories
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_hotels
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",,2,0
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",,2,0
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/localizeContentRecordOfCategoryRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/localizeContentRecordOfCategoryRelation.csv
index 95253c7fad1e..0027c3226592 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/localizeContentRecordOfCategoryRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/localizeContentRecordOfCategoryRelation.csv
@@ -14,7 +14,7 @@ sys_category_record_mm
 ,29,300,tt_content,0,1,categories
 ,30,300,tt_content,0,2,categories
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_hotels
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",,2,0
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",,2,0
 ,299,89,768,0,1,298,1,1,0,0,0,"[Translate to Dansk:] Regular Element #2",,2,0
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/modifyBothRecordsOfCategoryRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/modifyBothRecordsOfCategoryRelation.csv
index 84ad339b97e1..37fd777955f4 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/modifyBothRecordsOfCategoryRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/modifyBothRecordsOfCategoryRelation.csv
@@ -16,7 +16,7 @@ sys_category_record_mm
 ,28,299,tt_content,0,1,categories
 ,29,299,tt_content,0,2,categories
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_hotels
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",,2,0
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",,2,0
 ,299,-1,256,0,0,0,1,0,0,297,0,"Testing #1",0,2,0
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/modifyCategoryRecordOfCategoryRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/modifyCategoryRecordOfCategoryRelation.csv
index e5a4541d733f..4fb4eb3b4455 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/modifyCategoryRecordOfCategoryRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/modifyCategoryRecordOfCategoryRelation.csv
@@ -14,6 +14,6 @@ sys_category_record_mm
 # --- workspace change ---
 ,32,297,tt_content,1,0,categories
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_hotels
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",,2,0
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",,2,0
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/modifyContentRecordOfCategoryRelation.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/modifyContentRecordOfCategoryRelation.csv
index aa1b0be7bff2..94a9e4c1454f 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/modifyContentRecordOfCategoryRelation.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/modifyContentRecordOfCategoryRelation.csv
@@ -14,7 +14,7 @@ sys_category_record_mm
 ,28,299,tt_content,0,1,categories
 ,29,299,tt_content,0,2,categories
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_hotels
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",,2,0
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",,2,0
 ,299,-1,256,0,0,0,1,0,0,297,0,"Testing #1",0,2,0
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/moveContentRecordOfCategoryRelationToDifferentPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/moveContentRecordOfCategoryRelationToDifferentPage.csv
index 5f23a0f4fd42..78d95af8c55d 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/moveContentRecordOfCategoryRelationToDifferentPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Assertion/moveContentRecordOfCategoryRelationToDifferentPage.csv
@@ -14,7 +14,7 @@ sys_category_record_mm
 ,29,299,tt_content,0,1,categories
 ,30,299,tt_content,0,2,categories
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_hotels
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",,2,0
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",,2,0
 ,299,-1,512,0,0,0,1,4,0,298,0,"Regular Element #2",0,2,0
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Scenario/LiveDefaultElements.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Scenario/LiveDefaultElements.csv
index b04c8c0d1807..7f883a579aed 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Scenario/LiveDefaultElements.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/DataSet/Scenario/LiveDefaultElements.csv
@@ -22,6 +22,6 @@ sys_workspace_stage
 ,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","t3ver_move_id","header","image","categories","tx_irretutorial_hotels"
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","image","categories","tx_irretutorial_1nff_hotels"
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1","\NULL",2,0
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2","\NULL",2,0
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/DataSet/Assertion/changeContentRecordSorting.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/DataSet/Assertion/changeContentRecordSorting.csv
index 5405bc298022..ebfcc8210688 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/DataSet/Assertion/changeContentRecordSorting.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/DataSet/Assertion/changeContentRecordSorting.csv
@@ -1,5 +1,5 @@
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_hotels
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",,0,0
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",,0,0
 ,299,-1,256,0,0,0,1,4,0,297,0,"Regular Element #1",0,0,0
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/DataSet/Assertion/changePageRecordSorting.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/DataSet/Assertion/changePageRecordSorting.csv
index 04b042cd42bd..24fd90bd7d35 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/DataSet/Assertion/changePageRecordSorting.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/DataSet/Assertion/changePageRecordSorting.csv
@@ -7,6 +7,6 @@ pages
 ,91,-1,256,0,1,4,0,89,0,Relations
 ,92,88,768,0,1,3,0,0,89,"[MOVE-TO PLACEHOLDER for #89, WS#1]"
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_hotels
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",,0,0
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",,0,0
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/DataSet/Assertion/copyContentRecord.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/DataSet/Assertion/copyContentRecord.csv
index e125733954d0..54588bf86307 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/DataSet/Assertion/copyContentRecord.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/DataSet/Assertion/copyContentRecord.csv
@@ -1,5 +1,5 @@
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_hotels
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",,0,0
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",,0,0
 ,299,89,128,0,0,0,1,1,0,0,0,"Regular Element #2 (copy 1)",,0,0
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/DataSet/Assertion/copyPageRecord.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/DataSet/Assertion/copyPageRecord.csv
index b0953ebb49a5..bc3ee4e3fef9 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/DataSet/Assertion/copyPageRecord.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/DataSet/Assertion/copyPageRecord.csv
@@ -7,7 +7,7 @@ pages
 ,91,90,256,0,1,1,0,0,0,Relations
 ,92,-1,256,0,1,-1,0,91,0,Relations
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,tx_irretutorial_1nff_hotels
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",,0,0
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",,0,0
 ,299,91,256,0,0,0,1,1,0,0,0,"Regular Element #2",,0,0
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/DataSet/Assertion/createContentRecords.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/DataSet/Assertion/createContentRecords.csv
index c354ebeb6750..13b181bffdcd 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/DataSet/Assertion/createContentRecords.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/DataSet/Assertion/createContentRecords.csv
@@ -1,5 +1,5 @@
 "tt_content",,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","image","categories","tx_irretutorial_hotels"
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","image","categories","tx_irretutorial_1nff_hotels"
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1","\NULL",0,0
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2","\NULL",0,0
 ,299,89,128,0,0,0,1,1,0,0,0,"Testing #1",,0,0
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/DataSet/Assertion/deleteContentRecord.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/DataSet/Assertion/deleteContentRecord.csv
index e2223a7be329..22f66d078c68 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/DataSet/Assertion/deleteContentRecord.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/DataSet/Assertion/deleteContentRecord.csv
@@ -1,5 +1,5 @@
 "tt_content",,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","image","categories","tx_irretutorial_hotels"
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","image","categories","tx_irretutorial_1nff_hotels"
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",,0,0
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",,0,0
 ,299,-1,512,0,0,0,1,2,0,298,0,"Regular Element #2",0,0,0
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/DataSet/Assertion/deletePageRecord.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/DataSet/Assertion/deletePageRecord.csv
index e6962cfef970..0be09a5100bf 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/DataSet/Assertion/deletePageRecord.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/DataSet/Assertion/deletePageRecord.csv
@@ -6,6 +6,6 @@ pages
 ,90,88,512,0,0,0,0,0,0,Target
 ,91,-1,256,0,1,2,0,89,0,Relations
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_hotels
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",,0,0
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",,0,0
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/DataSet/Assertion/localizeContentRecord.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/DataSet/Assertion/localizeContentRecord.csv
index ff2ba00a895c..0810be094bfd 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/DataSet/Assertion/localizeContentRecord.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/DataSet/Assertion/localizeContentRecord.csv
@@ -1,5 +1,5 @@
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_hotels
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",,0,0
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",,0,0
 ,299,89,768,0,1,298,1,1,0,0,0,"[Translate to Dansk:] Regular Element #2",,0,0
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/DataSet/Assertion/localizePageRecord.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/DataSet/Assertion/localizePageRecord.csv
index 076e4e270bd7..1eb5a5d70353 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/DataSet/Assertion/localizePageRecord.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/DataSet/Assertion/localizePageRecord.csv
@@ -9,6 +9,6 @@ pages_language_overlay
 ,1,89,0,1,1,1,0,0,"[Translate to Dansk:] Relations"
 ,2,-1,0,1,1,-1,0,1,"[Translate to Dansk:] Relations"
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_hotels
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",,0,0
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",,0,0
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/DataSet/Assertion/modifyContentRecord.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/DataSet/Assertion/modifyContentRecord.csv
index 621942a3a3a0..4a8fba17af66 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/DataSet/Assertion/modifyContentRecord.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/DataSet/Assertion/modifyContentRecord.csv
@@ -1,5 +1,5 @@
 "tt_content",,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","image","categories","tx_irretutorial_hotels"
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","image","categories","tx_irretutorial_1nff_hotels"
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",,0,0
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",,0,0
 ,299,-1,512,0,0,0,1,0,0,298,0,"Testing #1",0,0,0
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/DataSet/Assertion/moveContentRecordToDifferentPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/DataSet/Assertion/moveContentRecordToDifferentPage.csv
index 374fde92b271..d35119343fe3 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/DataSet/Assertion/moveContentRecordToDifferentPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/DataSet/Assertion/moveContentRecordToDifferentPage.csv
@@ -1,5 +1,5 @@
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_hotels
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",,0,0
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",,0,0
 ,299,-1,512,0,0,0,1,4,0,298,0,"Regular Element #2",0,0,0
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/DataSet/Assertion/moveContentRecordToDifferentPageAndChangeSorting.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/DataSet/Assertion/moveContentRecordToDifferentPageAndChangeSorting.csv
index efbf94a64b1b..d9a3027512bd 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/DataSet/Assertion/moveContentRecordToDifferentPageAndChangeSorting.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/DataSet/Assertion/moveContentRecordToDifferentPageAndChangeSorting.csv
@@ -1,5 +1,5 @@
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_hotels
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",,0,0
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",,0,0
 ,299,-1,512,0,0,0,1,4,0,298,0,"Regular Element #2",0,0,0
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/DataSet/Assertion/movePageRecordToDifferentPage.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/DataSet/Assertion/movePageRecordToDifferentPage.csv
index f43ab9f6d28d..21bb9f69399f 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/DataSet/Assertion/movePageRecordToDifferentPage.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/DataSet/Assertion/movePageRecordToDifferentPage.csv
@@ -7,6 +7,6 @@ pages
 ,91,-1,256,0,1,4,0,89,0,Relations
 ,92,90,256,0,1,3,0,0,89,"[MOVE-TO PLACEHOLDER for #89, WS#1]"
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_hotels
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",,0,0
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",,0,0
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/DataSet/Assertion/movePageRecordToDifferentPageAndChangeSorting.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/DataSet/Assertion/movePageRecordToDifferentPageAndChangeSorting.csv
index b720ab1a489d..1dc21dea6885 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/DataSet/Assertion/movePageRecordToDifferentPageAndChangeSorting.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/DataSet/Assertion/movePageRecordToDifferentPageAndChangeSorting.csv
@@ -9,6 +9,6 @@ pages
 ,93,-1,256,0,1,4,0,89,0,Relations
 ,94,1,192,0,1,3,0,0,89,"[MOVE-TO PLACEHOLDER for #89, WS#1]"
 tt_content
-,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_hotels
+,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,header,image,categories,tx_irretutorial_1nff_hotels
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1",,0,0
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2",,0,0
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/DataSet/Scenario/LiveDefaultElements.csv b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/DataSet/Scenario/LiveDefaultElements.csv
index eae28bd10665..6e41cfbe7d40 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/DataSet/Scenario/LiveDefaultElements.csv
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/DataSet/Scenario/LiveDefaultElements.csv
@@ -16,6 +16,6 @@ sys_workspace_stage
 ,30,0,768,0,0,0,0,0,0,0,0,"Category C",0,0,
 ,31,0,1024,0,0,0,0,0,0,0,0,"Category A.A",28,0,
 "tt_content",,,,,,,,,,,,,,,
-,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","image","categories","tx_irretutorial_hotels"
+,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","header","image","categories","tx_irretutorial_1nff_hotels"
 ,297,89,256,0,0,0,0,0,0,0,0,"Regular Element #1","\NULL",0,0
 ,298,89,512,0,0,0,0,0,0,0,0,"Regular Element #2","\NULL",0,0
-- 
GitLab