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 373ebb2416f9719ed06053ff380b37e763959ec0..1c51b61b9222419f406df1701b26e58b6545670f 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 2a70257b2bcd87d80182930e6475ae0719389077..0f24603c0944efa84af750f8ef6a382bdbaa967f 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 7031a0a3dd7900810b5501ab1dfbe519060ffb6f..e345a31be9c5055bb9e71497fff0064fd4ad36da 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 6dbd88a4e289a81975cc02e69747f8ed0b86c7c9..6fa90e9b9168e9aba68ca788c64c60bc1f4808b6 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 17fb0708ba5434b0df1faba695275a5c2669e344..100a0d130bcd37f50470d99f7e6b837d6b865771 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 b28f4018e6b4a9af47bc8d0123a7f13baa56243e..435cd1233f62d0c4a81da7e85150dc34944d3cb3 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 156e6be214da57733c825d4f969056258ec0f830..87617d314aaa832b499fafbb99693f0797ef573d 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 001cacf696c4d8c07dba43c5072d8218cca2926e..e2aea6195133a877b3dc2eceea6292484f9bf008 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 d46f8bf7d15596af9b38c954aeeb66a3afd273f4..848fa9a8532593088e613c2fca20cb22b1087b1e 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 4eac45e1a313b013192b6edc6a20047205658a86..1044b243dfb3ac84ca4c66a04d506d56dca1fdce 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 8d0c818848adb77fa5af61395c05afeda3439805..f10ac4a0d01812a1fcadbd6f1cbb5e69bcc78540 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 4df4b7c7bb2dc269d27b7ffc0dd24a436bd9e242..1dd7b72c8f3b572475c76681c244fb911f433e40 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 0a29956fbe5aaad0e44b8a1e46ff1371306347c7..595675ca1055acdd7bb162586945ad72a7e8eb68 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 05db685a1d47c51c4f70c344e9faffd9c0880ade..2336b2801a353ae4af5ae2723be2a91bb6051fab 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 297a83e5fbb2b0ca318668ca5e9ec781bc2dd29c..648175123203c5de7533ba73500fd1ca4a6c01a1 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 97f5a52af1d45c13c5a96bf50b2a020afdd62474..b7de16bb577d55e19a4a719b75804cca1ad69064 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 4df4b7c7bb2dc269d27b7ffc0dd24a436bd9e242..1dd7b72c8f3b572475c76681c244fb911f433e40 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 312590a13b60892d1e9b5a93884aab425924347c..1713ea5cd34bd40fedc945e703bcd728cc4ca2cc 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 6ebb05aa2cb4864c91b4207b299b19c1855ec286..9fae3e6a681f391602a4224a847fb005ba33444d 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 5fc32df6ef8e2b858f7a0131e5dbd084f246cd6b..959e6818437df9e6f2895b7516c9c8ddb30e9666 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 8ae064f33a8e91978fb8df9773613dcf51bd34f0..35c3862c2f7dd4e13133143a5cc3f2cb197e79ef 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 b40bf054681bbf78a0c35da6a6d8e480903827e4..f7353da58f39721388dd3a587645d8c7625bfb2a 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 4aa7bca94d683a626286602e4a6e83f4a9c55bea..fc95aef1005197b87711061b0219e0b6f98e8fc4 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 8583566c979f3b2b8894a76e3280d9e6fe85632f..3c9fbbdd308f84033de0ec49652a6ff7cb80190f 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 d3323dcb9e7762f21415bcddef1ee0764f92e4f0..6da9e9b19d7d2606772d370b57ceb2765d899b12 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 70a85be6d5162a12ed3caa381829a7a35a059016..9aa47bde49ab2b433ec534ec4d31e308c1322739 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 4f44dd416f5ee5a7e4abebb275e8e88f8023e703..756d8fb8146b38835ea37845e9a15df45bdedfdb 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 faa0353c2bfe5efbb5ba90a3596dd49e802ee26a..2686e8cc92813a8f1609770e3e880cf4440d9f76 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 eb85e1e05a2ec29337f33e0faaa8996cfe195b26..0b193285630339c5a77a29e342353bb6781ad372 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 23a5a68f4dd8a0a6b7361ff14e0a15983b7f7595..f8ede5d8e447369d787fc4f87fc281715bfb1013 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 f61da22755b7759a20542825f7f41609d9939961..3a8b5f2912b832d3b4cd0ee035457b713f1ec40a 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 3e07929effc8b03ad777d5caecaa05a2d04180e3..136b3aedd5c567e90d6adb6bdb674d2c1bf98529 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 17212cf05af23dc12e7974a8252494a6ef00864e..b4ed571949267f87ffb9a80fce6fb20b2aae3ad1 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 be2c7df03453d3327cedb467aafe5c4777406b80..7a618b45a6b891d56d53b81e1760a4fd38000d15 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 ae8fbd1d35486f4478a02048111a2c3c3a0e6478..34168d1b9f18933b9efe20c6bd049154b248330f 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 8c8d9a67afffc20b6855740379ee609fcdf911be..30a21bf2c2707327b2d9837ec2aee59c20e95da5 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 8b02b73be5b727414d137e8fe817f49860f44c92..7bfc48b7483a381de3260e6b5b1b9d437c84a2a9 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 3d384a4cc1569d02b3a38d1425c9e3a62e7cde3b..46b8a5f2e8aaeb1e567513d69b44ea46558c9520 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 8b7acceb1a08486a1ce2ac89472d2ce64881eb39..4a1cb35bb361ef1bad6d014f709c0d815d6426fb 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 531b93e7b926b3dbc65780cf5a1568bdf1780e7b..8896718306e36905e5e5fb26c36278efe000b6b9 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 915ba38f01dd9f61a0ea68a730cec723984687a1..cec2f319b9ca7955ebe637e0f9ff2699dc107a76 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 380aec137da9f76ddf1a1ac8982d9170bcc9aefb..ab3220d661374d3c55894c88d36dd34614e02a6c 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 af9fb419b865fe41ee6c2e922f8cbd896ff134ed..2ec9b2f50d630326c8cb0bb37e2fb57a001694ce 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 392625d347e92decbb80684b43d558b05f631ca3..349e703eeb236d2944d33562d724eda2b7e5b767 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 c3261a91f90ca22f55d448aa90fd7bd066b4c98e..7616e15bc37f693a6cd6663c219f7c3151d68fb6 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 64520bafb3a3ed3294d2229a96cfc4553e95f7c4..35e76d093f7352c692fa4b9c4a2b81eb8b2c1e3f 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 de810e3f3d9a19a342d5acb0dd15a3fe60cd0e38..b7c8c8ab3ad6fb0a431ee78e4662744012fb19a1 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 0cdf9e8585fa5b979041bfea9957962b30d89b47..8655d66ac38379d2ae0f74eb50d5975ad050a070 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 187db54d97085ccee78c3986e75f6d8aaba18916..7ea0469c7432bd8d8337bd49515a70bdeba9642b 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 5127a9dde40d2f65affae37f2da75064442bdeb8..a58b101653dc470ff4db66ae90856870cbcd6e7d 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 bd1572fd2ab3ab02e373455cfd92bd6e5591ead3..ef68a49298ee80963e47fad2d0bf58058d6b87d4 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 24e4b1a1d5536a554dcb3b4cf76e13170e34c597..8851ee6c4bf26d0b7c0dafa930e9afdcc8c22385 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 fd55e1cbabfc55890158f017f6af7d124db67959..be0ac7568cffa9c0352fd9b659fccdea13167c90 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 5be62769e27b46b1e64e23196d4a68dcc46eadd4..c28c8fc7e79e3f197308b9e29706cc88e06504a8 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 0ed8958f369530cfe89f8002cf1a09f505bdd4b9..be354131e77655ced31712554a43b50f50de7b62 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 64e5d9ca6e0136d71bbd0ee351d0d182cf12e12a..91fa09fe58dfb7df4335de9b0355a1ca8341eb60 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 99de9ab7b61059065ae3fa9a74f29898f53d6010..c4d195e0f9621b68646ac3929f528d1e2d6a099a 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 469f9cd48e4a580dd1c3fe54fdc28e7cbc189d5e..37a1d01c0a668e90f8870c5d7c1753e377fc7891 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 405ca32f4c6b22e832354e9bcaa956b5e98c7b01..d7f79581f42b71cac3fb4dea2cbd0e6bad2b6aee 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 e5a63c8c985b642327d13fa8641e14ac2bc3a157..fe24a37f675d13c589d1022174fb72e1c99da695 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 367a5b03f6bb07dd502c968593e9c2dbe64c42cd..3b1803f0a78390bf59987c8186f68cf2c91f34b2 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 26001a9181ffdde4c68388f094800e632e1a9356..5135b806d4ada0a58e4ecf35e3483a95e59aa1e3 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 af499b890880d0785dd27d8e0dcaf767b73068c1..19065a5cdafee3a56cea1e97a2086ad47f3f34df 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 0dbf527c669b0a4531a7a6fda68c5ef05fee9c80..30b4e3a80978367609ea09bdf4fdaa1b2f04e296 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 5cafcb99449cc35a27b15a789eeae1ec70728fb4..c75632f28146792b470e825ae7debbd311ee37da 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 42034454a2c5f9995b51eb132389b6dfbff8e8e0..1f9c5d148b73dc30d3a93908dd66313f4589b75f 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 9a81e96dae8b0c4de2dd12c5561f628bb008114e..2604c2a3bb0744f91d117e31d50b208aa884c8a4 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 04f8f66743b51f0fb222fbe6c18bd019b135af30..8359ca597e2eaa702e5ec53ecfb39798c9b37fce 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 af7494f8c05298cfbcfb5b5ebb3db3d220a406d3..e400db66bcb5140df74d0add46950cd249724583 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 6383d9a30ecb96d2c9aa47543023671121b3afdb..ef7f7a3989397f111724b0c04a4fd17b6e739330 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 bdccd66038a5f9f10b12686ee45f999c1f3121df..fb6dc1c40aea3b35ea173f1ee928950a11b75e6f 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 81f889fd3905b275b13adec755b7bcd8ca1ef300..972ace9d2e31e5b73c9e86434f602e1f99f4568e 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 6cb9587e0ad111880d49db6486a2e61c59d10787..bebea516ab81a2482b0c3b616729046d3feb831f 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 5d03a131d6d22c9c0cc38f9ac012ebc1bfcd1da6..ca3206221f326fe9a328e2d834aced12fa28d5aa 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 0c725cab18613253134b9bc1084d9291704f6db4..83dfcee151fc01b08d4f8944adfad88ca0a9ae4a 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 76698ad0998ba0a72caa6ce8a2ec674f0f82c167..d827292905733cd467dad4a153fdbc904e756f70 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 4c4474bd8f6cb5686d1606deef64b257deba96aa..810da47a346052b3a3b27f8a16eeed67fe3e24dd 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 c6e5c1c89d4f65560d4dc0e7d29acb7e603120cc..4b6bcfdbb7d7c54bcf33fd3d97b8a9d6d651bcd0 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 ceca2b4017f5b32124156446b4022ed442b3c5f6..b934de2f66d22bd5dc7fa2296c409595d1a2f2f6 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 eca9432c7eb67cbd9bc76d64affd93c75e670afc..a463644eefb5de8971768fac8403fe6bc7ec92ba 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 8285326cb48ee23aeace02774cb4eff709a17254..b1dcfeb3d50b182ab7c2bb0bfad805d5e6cd59b8 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 aa8cb977769bf6a8389eb8e1ffb9b12216cc99e4..2aec9acbac84a7a662ac3ebfc46f5892a047cb34 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 d9e5181609bb4e4ecba3d0095fdf0169962bb7c0..62e02c5a2ff9a46402d3e09ff242a602ff3e77de 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 242d0596a3a123d0d0f8aeaa54192c3b050faf94..e4015b59a6613b73bc6328eadecf6a4ec23e2e45 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 95253c7fad1e6e0f6f230a4d7f18091fee6461a2..0027c32265927cae4db641e7e7d7ecb13b711241 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 84ad339b97e18781921e2c3d9890e67c5d178f6b..37fd777955f4d72b567254beb813796bed257e23 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 e5a4541d733f81058e19a69c6fe3f2792e104e00..4fb4eb3b4455dda41a741540a48f747c8d4179c4 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 aa1b0be7bff24588757908cea695c881fbb62ef2..94a9e4c1454f1cf8b89632c597b1beaad7d53d9c 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 5f23a0f4fd423315e10f77f4ac7b1b3f2798ecd2..78d95af8c55da1e93cc49711ad737f9985b0c558 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 b04c8c0d18071802b02b1e4e8c235426889f3f12..7f883a579aed064f5ef7d5deef45aeacf2462db3 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 5405bc298022732c1bc67a0c85e62c61c005a340..ebfcc821068836692b6b4ce3f028fc7a9baae4c9 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 04b042cd42bda6c6e44550bba33d7108c54ae6b9..24fd90bd7d35da464c95840a8066f205feff1830 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 e125733954d07f08b7128af80013714e01b57cfc..54588bf863072e96bf509552c660bc3460471328 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 b0953ebb49a50fe8f17d707c0c97512fd66b92b3..bc3ee4e3fef91099c3e3141ecfaf4c0551b92900 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 c354ebeb6750264023275157c6d21eff7e7aa51d..13b181bffdcdd8dfef7556c3a2b0027166dae303 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 e2223a7be329ea86c0b3a488c3559dfe23471727..22f66d078c6806b77081f333e1e1f0102bac8e88 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 e6962cfef9704666b36c85da0b7f0ad1b20489cd..0be09a5100bfb25d08e81a2bf73a2cf331e9cdc0 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 ff2ba00a895c6525478a3f78e22b67c2a1613fe9..0810be094bfd2ea6880f8affcf8e796e5d45a417 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 076e4e270bd7e293d8d6fd59fc5832e92771aa53..1eb5a5d70353d29af8fa24ce8ca3a30eb1c98caf 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 621942a3a3a04f451019233fa73287932e8ddeed..4a8fba17af66372145b0a4074dbddc0e3f7fa08b 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 374fde92b271ef2152ecae02a80c0dd211cce104..d35119343fe3b4a1444fb1e41060919b967feafa 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 efbf94a64b1b059d87645334eb67942c76328577..d9a3027512bdd3dd5bb6bc8eabadf99c510c0445 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 f43ab9f6d28dffa4bd873b77b6303201385cd340..21bb9f69399f70fe755e82ae5583b4304e918739 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 b720ab1a489d3ea769db586fc31839509f450b11..1dc21dea6885329cf619e2a5fb51615d3193649f 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 eae28bd106653577c0e5fffa5aa9b0a8a74a3188..6e41cfbe7d406af34da78d86526587b416ffc1c5 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