diff --git a/composer.json b/composer.json
index 39d4ba723bbddd6b07e6b647bbbc245464487ea3..ef86ef8963eae2ba8754b89dd1dd6a450d01141d 100644
--- a/composer.json
+++ b/composer.json
@@ -151,7 +151,6 @@
 			"TYPO3\\CMS\\Info\\": "typo3/sysext/info/Classes/",
 			"TYPO3\\CMS\\InfoPagetsconfig\\": "typo3/sysext/info_pagetsconfig/Classes/",
 			"TYPO3\\CMS\\Install\\": "typo3/sysext/install/Classes/",
-			"FoT3\\Jumpurl\\": "typo3/sysext/jumpurl/Classes/",
 			"TYPO3\\CMS\\Lang\\": "typo3/sysext/lang/Classes/",
 			"TYPO3\\CMS\\Linkvalidator\\": "typo3/sysext/linkvalidator/Classes/",
 			"TYPO3\\CMS\\Lowlevel\\": "typo3/sysext/lowlevel/Classes/",
@@ -201,11 +200,12 @@
 			"TYPO3\\CMS\\Impexp\\Tests\\": "typo3/sysext/impexp/Tests/",
 			"TYPO3\\CMS\\IndexedSearch\\Tests\\": "typo3/sysext/indexed_search/Tests/",
 			"TYPO3\\CMS\\Install\\Tests\\": "typo3/sysext/install/Tests/",
+			"FoT3\\Jumpurl\\": "typo3/sysext/jumpurl/Classes/",
 			"FoT3\\Jumpurl\\Tests\\": "typo3/sysext/jumpurl/Tests/",
 			"TYPO3\\CMS\\Lang\\Tests\\": "typo3/sysext/lang/Tests/",
 			"TYPO3\\CMS\\Lowlevel\\Tests\\": "typo3/sysext/lowlevel/Tests/",
-			"TYPO3\\CMS\\Mediace\\": "typo3/sysext/mediace/Classes/",
-			"TYPO3\\CMS\\Mediace\\Tests\\": "typo3/sysext/mediace/Tests/",
+			"FoT3\\Mediace\\": "typo3/sysext/mediace/Classes/",
+			"FoT3\\Mediace\\Tests\\": "typo3/sysext/mediace/Tests/",
 			"TYPO3\\CMS\\Recordlist\\Tests\\": "typo3/sysext/recordlist/Tests/",
 			"TYPO3\\CMS\\Reports\\Tests\\": "typo3/sysext/reports/Tests/",
 			"TYPO3\\CMS\\Rsaauth\\Tests\\": "typo3/sysext/rsaauth/Tests/",
diff --git a/composer.lock b/composer.lock
index af7e83a190c9bf3c1675f744e61485ec4f006a3c..5a266fa6bd3f8db35384d8332a027a7daaf27db7 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "e849bfdd07351089ccc5dfc6c0a9bdf2",
-    "content-hash": "261231e5b9831e0b744cfa3ec7e55315",
+    "hash": "5ddec795d6eef6b9142eac36815546a0",
     "packages": [
         {
             "name": "cogpowered/finediff",
diff --git a/typo3/sysext/mediace/Classes/ContentObject/FlowPlayerContentObject.php b/typo3/sysext/mediace/Classes/ContentObject/FlowPlayerContentObject.php
index 6d3a044441ab9d9b8267f08fe95ea1ea866325d5..8f3a7fc956e69800f4b9e529f738770dbc8e065f 100644
--- a/typo3/sysext/mediace/Classes/ContentObject/FlowPlayerContentObject.php
+++ b/typo3/sysext/mediace/Classes/ContentObject/FlowPlayerContentObject.php
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\CMS\Mediace\ContentObject;
+namespace FoT3\Mediace\ContentObject;
 
 /*
  * This file is part of the TYPO3 CMS project.
diff --git a/typo3/sysext/mediace/Classes/ContentObject/MediaContentObject.php b/typo3/sysext/mediace/Classes/ContentObject/MediaContentObject.php
index b11fc8be39b19c8f912a2311156bc87973875dd9..800f51537b9f13883351d965c438f8e1e18358ef 100644
--- a/typo3/sysext/mediace/Classes/ContentObject/MediaContentObject.php
+++ b/typo3/sysext/mediace/Classes/ContentObject/MediaContentObject.php
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\CMS\Mediace\ContentObject;
+namespace FoT3\Mediace\ContentObject;
 
 /*
  * This file is part of the TYPO3 CMS project.
@@ -168,7 +168,7 @@ class MediaContentObject extends \TYPO3\CMS\Frontend\ContentObject\AbstractConte
                 $conf['forcePlayer'] = 0;
                 $renderType = 'swf';
             } elseif (isset($conf['file']) && strpos($conf['file'], '://') !== false) {
-                $mediaWizard = \TYPO3\CMS\Mediace\MediaWizard\MediaWizardProviderManager::getValidMediaWizardProvider($conf['file']);
+                $mediaWizard = \FoT3\Mediace\MediaWizard\MediaWizardProviderManager::getValidMediaWizardProvider($conf['file']);
                 if ($mediaWizard !== null) {
                     $conf['installUrl'] = 'null';
                     $conf['forcePlayer'] = 0;
@@ -242,8 +242,8 @@ class MediaContentObject extends \TYPO3\CMS\Frontend\ContentObject\AbstractConte
         // because the file value can possibly have link parameters, use explode to split all values
         $fileParts = explode(' ', $file);
 
-        /** @var $mediaWizard \TYPO3\CMS\Mediace\MediaWizard\MediaWizardProviderInterface */
-        $mediaWizard = \TYPO3\CMS\Mediace\MediaWizard\MediaWizardProviderManager::getValidMediaWizardProvider($fileParts[0]);
+        /** @var $mediaWizard \FoT3\Mediace\MediaWizard\MediaWizardProviderInterface */
+        $mediaWizard = \FoT3\Mediace\MediaWizard\MediaWizardProviderManager::getValidMediaWizardProvider($fileParts[0]);
         // Get the path relative to the page currently outputted
         if (substr($fileParts[0], 0, 5) === 'file:') {
             $fileUid = substr($fileParts[0], 5);
diff --git a/typo3/sysext/mediace/Classes/ContentObject/MultimediaContentObject.php b/typo3/sysext/mediace/Classes/ContentObject/MultimediaContentObject.php
index 0f82e3f51499607c212222cc245d28f97a63039e..5284d7b2296cdac8156c74742208311b12fd7b47 100644
--- a/typo3/sysext/mediace/Classes/ContentObject/MultimediaContentObject.php
+++ b/typo3/sysext/mediace/Classes/ContentObject/MultimediaContentObject.php
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\CMS\Mediace\ContentObject;
+namespace FoT3\Mediace\ContentObject;
 
 /*
  * This file is part of the TYPO3 CMS project.
diff --git a/typo3/sysext/mediace/Classes/ContentObject/QuicktimeObjectContentObject.php b/typo3/sysext/mediace/Classes/ContentObject/QuicktimeObjectContentObject.php
index fa7b0d97d4ad7b1b0ac99914bb03e57df17e6cee..a23a0b8cfdddb93c5942aac0071091216d8f8471 100644
--- a/typo3/sysext/mediace/Classes/ContentObject/QuicktimeObjectContentObject.php
+++ b/typo3/sysext/mediace/Classes/ContentObject/QuicktimeObjectContentObject.php
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\CMS\Mediace\ContentObject;
+namespace FoT3\Mediace\ContentObject;
 
 /*
  * This file is part of the TYPO3 CMS project.
diff --git a/typo3/sysext/mediace/Classes/ContentObject/ShockwaveFlashObjectContentObject.php b/typo3/sysext/mediace/Classes/ContentObject/ShockwaveFlashObjectContentObject.php
index 7260cc7a51df1ed99ea23187d9d18dfebb6c9fa8..bfab9f51f1cfd2c58a16c7401743fe4b52b086d1 100644
--- a/typo3/sysext/mediace/Classes/ContentObject/ShockwaveFlashObjectContentObject.php
+++ b/typo3/sysext/mediace/Classes/ContentObject/ShockwaveFlashObjectContentObject.php
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\CMS\Mediace\ContentObject;
+namespace FoT3\Mediace\ContentObject;
 
 /*
  * This file is part of the TYPO3 CMS project.
diff --git a/typo3/sysext/mediace/Classes/Hooks/PageLayoutView/MultimediaPreviewRenderer.php b/typo3/sysext/mediace/Classes/Hooks/PageLayoutView/MultimediaPreviewRenderer.php
index 65221e946d2198e122bba5e662e28225a4baea66..daa4e48a30cdc514fa375eed0b94c86b2a925484 100644
--- a/typo3/sysext/mediace/Classes/Hooks/PageLayoutView/MultimediaPreviewRenderer.php
+++ b/typo3/sysext/mediace/Classes/Hooks/PageLayoutView/MultimediaPreviewRenderer.php
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\CMS\Mediace\Hooks\PageLayoutView;
+namespace FoT3\Mediace\Hooks\PageLayoutView;
 
 /*
  * This file is part of the TYPO3 CMS project.
diff --git a/typo3/sysext/mediace/Classes/MediaWizard/MediaWizardProvider.php b/typo3/sysext/mediace/Classes/MediaWizard/MediaWizardProvider.php
index 700157c96564366eb733b5ad9d7085d248931302..bca3d609fdc60f424e47ffdc8323c9aac3f68b58 100644
--- a/typo3/sysext/mediace/Classes/MediaWizard/MediaWizardProvider.php
+++ b/typo3/sysext/mediace/Classes/MediaWizard/MediaWizardProvider.php
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\CMS\Mediace\MediaWizard;
+namespace FoT3\Mediace\MediaWizard;
 
 /*
  * This file is part of the TYPO3 CMS project.
diff --git a/typo3/sysext/mediace/Classes/MediaWizard/MediaWizardProviderInterface.php b/typo3/sysext/mediace/Classes/MediaWizard/MediaWizardProviderInterface.php
index 8e85051385303e018647d4b7a23eb83c5db1b8f3..7807620ea9e960183c74316d5b62beb1769f2ee4 100644
--- a/typo3/sysext/mediace/Classes/MediaWizard/MediaWizardProviderInterface.php
+++ b/typo3/sysext/mediace/Classes/MediaWizard/MediaWizardProviderInterface.php
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\CMS\Mediace\MediaWizard;
+namespace FoT3\Mediace\MediaWizard;
 
 /*
  * This file is part of the TYPO3 CMS project.
diff --git a/typo3/sysext/mediace/Classes/MediaWizard/MediaWizardProviderManager.php b/typo3/sysext/mediace/Classes/MediaWizard/MediaWizardProviderManager.php
index ed3b2578775db828a3a3f335b434da5c6a59c17d..1cec3421cfda03753c514a67283e8340b10537fb 100644
--- a/typo3/sysext/mediace/Classes/MediaWizard/MediaWizardProviderManager.php
+++ b/typo3/sysext/mediace/Classes/MediaWizard/MediaWizardProviderManager.php
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\CMS\Mediace\MediaWizard;
+namespace FoT3\Mediace\MediaWizard;
 
 /*
  * This file is part of the TYPO3 CMS project.
diff --git a/typo3/sysext/mediace/Migrations/Code/ClassAliasMap.php b/typo3/sysext/mediace/Migrations/Code/ClassAliasMap.php
index c6ad3a8dc1d173c5aceebfea223eb36502bca234..14af46418c75816205c92251adf092ac252167d7 100644
--- a/typo3/sysext/mediace/Migrations/Code/ClassAliasMap.php
+++ b/typo3/sysext/mediace/Migrations/Code/ClassAliasMap.php
@@ -1,19 +1,28 @@
 <?php
 return array(
-    'TYPO3\\CMS\\Frontend\\ContentObject\\FlowplayerContentObject' => \TYPO3\CMS\Mediace\ContentObject\FlowplayerContentObject::class,
-    'TYPO3\\CMS\\Frontend\\ContentObject\\MediaContentObject' => \TYPO3\CMS\Mediace\ContentObject\MediaContentObject::class,
-    'TYPO3\\CMS\\Frontend\\ContentObject\\MultimediaContentObject' => \TYPO3\CMS\Mediace\ContentObject\MultimediaContentObject::class,
-    'TYPO3\\CMS\\Frontend\\ContentObject\\QuicktimeObjectContentObject' => \TYPO3\CMS\Mediace\ContentObject\QuicktimeObjectContentObject::class,
-    'TYPO3\\CMS\\Frontend\\ContentObject\\ShockwaveFlashObjectContentObject' => \TYPO3\CMS\Mediace\ContentObject\ShockwaveFlashObjectContentObject::class,
-    'TYPO3\\CMS\\Frontend\\MediaWizard\MediaWizardProvider' => \TYPO3\CMS\Mediace\MediaWizard\MediaWizardProvider::class,
-    'TYPO3\\CMS\\Frontend\\MediaWizard\MediaWizardProviderInterface' => \TYPO3\CMS\Mediace\MediaWizard\MediaWizardProviderInterface::class,
-    'TYPO3\\CMS\\Frontend\\MediaWizard\MediaWizardProviderManager' => \TYPO3\CMS\Mediace\MediaWizard\MediaWizardProviderManager::class,
-    'tslib_content_FlowPlayer' => \TYPO3\CMS\Mediace\ContentObject\FlowPlayerContentObject::class,
-    'tslib_content_Media' => \TYPO3\CMS\Mediace\ContentObject\MediaContentObject::class,
-    'tslib_content_Multimedia' => \TYPO3\CMS\Mediace\ContentObject\MultimediaContentObject::class,
-    'tslib_content_QuicktimeObject' => \TYPO3\CMS\Mediace\ContentObject\QuicktimeObjectContentObject::class,
-    'tslib_content_ShockwaveFlashObject' => \TYPO3\CMS\Mediace\ContentObject\ShockwaveFlashObjectContentObject::class,
-    'tslib_mediaWizardCoreProvider' => \TYPO3\CMS\Mediace\MediaWizard\MediaWizardProvider::class,
-    'tslib_mediaWizardProvider' => \TYPO3\CMS\Mediace\MediaWizard\MediaWizardProviderInterface::class,
-    'tslib_mediaWizardManager' => \TYPO3\CMS\Mediace\MediaWizard\MediaWizardProviderManager::class,
+    'TYPO3\\CMS\\Frontend\\ContentObject\\FlowplayerContentObject' => \FoT3\Mediace\ContentObject\FlowplayerContentObject::class,
+    'TYPO3\\CMS\\Frontend\\ContentObject\\MediaContentObject' => \FoT3\Mediace\ContentObject\MediaContentObject::class,
+    'TYPO3\\CMS\\Frontend\\ContentObject\\MultimediaContentObject' => \FoT3\Mediace\ContentObject\MultimediaContentObject::class,
+    'TYPO3\\CMS\\Frontend\\ContentObject\\QuicktimeObjectContentObject' => \FoT3\Mediace\ContentObject\QuicktimeObjectContentObject::class,
+    'TYPO3\\CMS\\Frontend\\ContentObject\\ShockwaveFlashObjectContentObject' => \FoT3\Mediace\ContentObject\ShockwaveFlashObjectContentObject::class,
+    'TYPO3\\CMS\\Frontend\\MediaWizard\MediaWizardProvider' => \FoT3\Mediace\MediaWizard\MediaWizardProvider::class,
+    'TYPO3\\CMS\\Frontend\\MediaWizard\MediaWizardProviderInterface' => \FoT3\Mediace\MediaWizard\MediaWizardProviderInterface::class,
+    'TYPO3\\CMS\\Frontend\\MediaWizard\MediaWizardProviderManager' => \FoT3\Mediace\MediaWizard\MediaWizardProviderManager::class,
+    'TYPO3\\CMS\\Mediace\\ContentObject\\FlowplayerContentObject' => \FoT3\Mediace\ContentObject\FlowplayerContentObject::class,
+    'TYPO3\\CMS\\Mediace\\ContentObject\\MediaContentObject' => \FoT3\Mediace\ContentObject\MediaContentObject::class,
+    'TYPO3\\CMS\\Mediace\\ContentObject\\MultimediaContentObject' => \FoT3\Mediace\ContentObject\MultimediaContentObject::class,
+    'TYPO3\\CMS\\Mediace\\ContentObject\\QuicktimeObjectContentObject' => \FoT3\Mediace\ContentObject\QuicktimeObjectContentObject::class,
+    'TYPO3\\CMS\\Mediace\\ContentObject\\ShockwaveFlashObjectContentObject' => \FoT3\Mediace\ContentObject\ShockwaveFlashObjectContentObject::class,
+    'TYPO3\\CMS\\Mediace\\Hooks\\PageLayoutView\\MultimediaPreviewRenderer' => \FoT3\Mediace\Hooks\PageLayoutView\MultimediaPreviewRenderer::class,
+    'TYPO3\\CMS\\Mediace\\MediaWizard\MediaWizardProvider' => \FoT3\Mediace\MediaWizard\MediaWizardProvider::class,
+    'TYPO3\\CMS\\Mediace\\MediaWizard\MediaWizardProviderInterface' => \FoT3\Mediace\MediaWizard\MediaWizardProviderInterface::class,
+    'TYPO3\\CMS\\Mediace\\MediaWizard\MediaWizardProviderManager' => \FoT3\Mediace\MediaWizard\MediaWizardProviderManager::class,
+    'tslib_content_FlowPlayer' => \FoT3\Mediace\ContentObject\FlowPlayerContentObject::class,
+    'tslib_content_Media' => \FoT3\Mediace\ContentObject\MediaContentObject::class,
+    'tslib_content_Multimedia' => \FoT3\Mediace\ContentObject\MultimediaContentObject::class,
+    'tslib_content_QuicktimeObject' => \FoT3\Mediace\ContentObject\QuicktimeObjectContentObject::class,
+    'tslib_content_ShockwaveFlashObject' => \FoT3\Mediace\ContentObject\ShockwaveFlashObjectContentObject::class,
+    'tslib_mediaWizardCoreProvider' => \FoT3\Mediace\MediaWizard\MediaWizardProvider::class,
+    'tslib_mediaWizardProvider' => \FoT3\Mediace\MediaWizard\MediaWizardProviderInterface::class,
+    'tslib_mediaWizardManager' => \FoT3\Mediace\MediaWizard\MediaWizardProviderManager::class,
 );
diff --git a/typo3/sysext/mediace/Migrations/Code/LegacyClassesForIde.php b/typo3/sysext/mediace/Migrations/Code/LegacyClassesForIde.php
index 9f734b9465baa68bce903e79cc3a3bbfc8a14f6f..fe41608ff54e9c3336d1cf0c061923ad8acf0359 100644
--- a/typo3/sysext/mediace/Migrations/Code/LegacyClassesForIde.php
+++ b/typo3/sysext/mediace/Migrations/Code/LegacyClassesForIde.php
@@ -3,55 +3,55 @@ die('Access denied');
 /**
  * @deprecated since 6.0, removed since 7.0
  */
-class tslib_content_FlowPlayer extends \TYPO3\CMS\Mediace\ContentObject\FlowPlayerContentObject
+class tslib_content_FlowPlayer extends \FoT3\Mediace\ContentObject\FlowPlayerContentObject
 {
 }
 
 /**
  * @deprecated since 6.0, removed since 7.0
  */
-class tslib_content_Media extends \TYPO3\CMS\Mediace\ContentObject\MediaContentObject
+class tslib_content_Media extends \FoT3\Mediace\ContentObject\MediaContentObject
 {
 }
 
 /**
  * @deprecated since 6.0, removed since 7.0
  */
-class tslib_content_Multimedia extends \TYPO3\CMS\Mediace\ContentObject\MultimediaContentObject
+class tslib_content_Multimedia extends \FoT3\Mediace\ContentObject\MultimediaContentObject
 {
 }
 
 /**
  * @deprecated since 6.0, removed since 7.0
  */
-class tslib_content_QuicktimeObject extends \TYPO3\CMS\Mediace\ContentObject\QuicktimeObjectContentObject
+class tslib_content_QuicktimeObject extends \FoT3\Mediace\ContentObject\QuicktimeObjectContentObject
 {
 }
 
 /**
  * @deprecated since 6.0, removed since 7.0
  */
-class tslib_content_ShockwaveFlashObject extends \TYPO3\CMS\Mediace\ContentObject\ShockwaveFlashObjectContentObject
+class tslib_content_ShockwaveFlashObject extends \FoT3\Mediace\ContentObject\ShockwaveFlashObjectContentObject
 {
 }
 
 /**
  * @deprecated since 6.0, removed since 7.0
  */
-class tslib_mediaWizardCoreProvider extends \TYPO3\CMS\Mediace\MediaWizard\MediaWizardProvider
+class tslib_mediaWizardCoreProvider extends \FoT3\Mediace\MediaWizard\MediaWizardProvider
 {
 }
 
 /**
  * @deprecated since 6.0, removed since 7.0
  */
-interface tslib_mediaWizardProvider extends \TYPO3\CMS\Mediace\MediaWizard\MediaWizardProviderInterface
+interface tslib_mediaWizardProvider extends \FoT3\Mediace\MediaWizard\MediaWizardProviderInterface
 {
 }
 
 /**
  * @deprecated since 6.0, removed since 7.0
  */
-class tslib_mediaWizardManager extends \TYPO3\CMS\Mediace\MediaWizard\MediaWizardProviderManager
+class tslib_mediaWizardManager extends \FoT3\Mediace\MediaWizard\MediaWizardProviderManager
 {
 }
diff --git a/typo3/sysext/mediace/Tests/Unit/MediaWizard/MediaWizardProviderTest.php b/typo3/sysext/mediace/Tests/Unit/MediaWizard/MediaWizardProviderTest.php
index 4dffdd06252abcf5b3f190c8a8d5e680059ff1dd..e56d9105f14fb193bb0770f46ee66ea1ac586943 100644
--- a/typo3/sysext/mediace/Tests/Unit/MediaWizard/MediaWizardProviderTest.php
+++ b/typo3/sysext/mediace/Tests/Unit/MediaWizard/MediaWizardProviderTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace TYPO3\CMS\Mediace\Tests\Unit\MediaWizard;
+namespace FoT3\Mediace\Tests\Unit\MediaWizard;
 
 /*
  * This file is part of the TYPO3 CMS project.
@@ -20,7 +20,7 @@ namespace TYPO3\CMS\Mediace\Tests\Unit\MediaWizard;
 class MediaWizardProviderTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
 {
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\TYPO3\CMS\Mediace\MediaWizard\MediaWizardProvider
+     * @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\FoT3\Mediace\MediaWizard\MediaWizardProvider
      */
     protected $subject;
 
@@ -29,7 +29,7 @@ class MediaWizardProviderTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     protected function setUp()
     {
-        $this->subject = $this->getAccessibleMock(\TYPO3\CMS\Mediace\MediaWizard\MediaWizardProvider::class, array('dummy'), array(), '', false);
+        $this->subject = $this->getAccessibleMock(\FoT3\Mediace\MediaWizard\MediaWizardProvider::class, array('dummy'), array(), '', false);
     }
 
     /**
diff --git a/typo3/sysext/mediace/composer.json b/typo3/sysext/mediace/composer.json
index b364840694f29b6383c3e4dd33bb43988bc470c0..d3441a246699c970bdef24b0b7f4f52a09f10fa6 100644
--- a/typo3/sysext/mediace/composer.json
+++ b/typo3/sysext/mediace/composer.json
@@ -1,12 +1,13 @@
 {
-	"name": "typo3/cms-mediace",
+	"name": "friendsoftypo3/mediace",
 	"type": "typo3-cms-extension",
-	"description": "TYPO3 Core",
+	"description": "Friends of TYPO3",
 	"homepage": "https://typo3.org",
 	"license": ["GPL-2.0+"],
 
 	"require": {
-		"typo3/cms-core": "*"
+		"typo3/cms-core": "7.5.0-7.99.99",
+		"typo3/cms-frontend": "7.5.0-7.99.99"
 	},
 	"replace": {
 		"mediace": "*"
@@ -20,12 +21,12 @@
 	},
 	"autoload": {
 		"psr-4": {
-			"TYPO3\\CMS\\Mediace\\": "Classes/"
+			"FoT3\\Mediace\\": "Classes/"
 		}
 	},
 	"autoload-dev": {
 		"psr-4": {
-			"TYPO3\\CMS\\Mediace\\Tests\\": "Tests/"
+			"FoT3\\Mediace\\Tests\\": "Tests/"
 		}
 	}
 }
diff --git a/typo3/sysext/mediace/ext_emconf.php b/typo3/sysext/mediace/ext_emconf.php
index f03823f4b7e35372e5e0d2c10e93fdd819b75e38..c44d5950514ac34c1fc7c9caf35b89ab93195248 100644
--- a/typo3/sysext/mediace/ext_emconf.php
+++ b/typo3/sysext/mediace/ext_emconf.php
@@ -3,8 +3,8 @@ $EM_CONF[$_EXTKEY] = array(
     'title' => 'Media Content Element',
     'description' => 'The media functionality from TYPO3 6.2 and earlier can be found here. This extension provides ContentObjects and Content Elements.',
     'category' => 'fe',
-    'author' => 'TYPO3 CMS Team',
-    'author_email' => 'info@typo3.org',
+    'author' => 'Friends of TYPO3',
+    'author_email' => 'friendsof@typo3.org',
     'state' => 'stable',
     'uploadfolder' => 0,
     'createDirs' => 'uploads/media',
diff --git a/typo3/sysext/mediace/ext_localconf.php b/typo3/sysext/mediace/ext_localconf.php
index 26e6851d0978ac7e007a185dec79b30851528b77..657351c053ea47808522afb31498a74f9398e5ac 100644
--- a/typo3/sysext/mediace/ext_localconf.php
+++ b/typo3/sysext/mediace/ext_localconf.php
@@ -2,11 +2,11 @@
 defined('TYPO3_MODE') or die();
 
 // Register additional content objects
-$GLOBALS['TYPO3_CONF_VARS']['FE']['ContentObjects']['MULTIMEDIA'] = \TYPO3\CMS\Mediace\ContentObject\MultimediaContentObject::class;
-$GLOBALS['TYPO3_CONF_VARS']['FE']['ContentObjects']['MEDIA']      = \TYPO3\CMS\Mediace\ContentObject\MediaContentObject::class;
-$GLOBALS['TYPO3_CONF_VARS']['FE']['ContentObjects']['SWFOBJECT']  = \TYPO3\CMS\Mediace\ContentObject\ShockwaveFlashObjectContentObject::class;
-$GLOBALS['TYPO3_CONF_VARS']['FE']['ContentObjects']['FLOWPLAYER'] = \TYPO3\CMS\Mediace\ContentObject\FlowPlayerContentObject::class;
-$GLOBALS['TYPO3_CONF_VARS']['FE']['ContentObjects']['QTOBJECT']   = \TYPO3\CMS\Mediace\ContentObject\QuicktimeObjectContentObject::class;
+$GLOBALS['TYPO3_CONF_VARS']['FE']['ContentObjects']['MULTIMEDIA'] = \FoT3\Mediace\ContentObject\MultimediaContentObject::class;
+$GLOBALS['TYPO3_CONF_VARS']['FE']['ContentObjects']['MEDIA']      = \FoT3\Mediace\ContentObject\MediaContentObject::class;
+$GLOBALS['TYPO3_CONF_VARS']['FE']['ContentObjects']['SWFOBJECT']  = \FoT3\Mediace\ContentObject\ShockwaveFlashObjectContentObject::class;
+$GLOBALS['TYPO3_CONF_VARS']['FE']['ContentObjects']['FLOWPLAYER'] = \FoT3\Mediace\ContentObject\FlowPlayerContentObject::class;
+$GLOBALS['TYPO3_CONF_VARS']['FE']['ContentObjects']['QTOBJECT']   = \FoT3\Mediace\ContentObject\QuicktimeObjectContentObject::class;
 
 // Register the "media" CType to the "New Content Element" wizard
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPageTSConfig('
@@ -27,11 +27,11 @@ $GLOBALS['TYPO3_CONF_VARS']['FE']['ContentObjects']['QTOBJECT']   = \TYPO3\CMS\M
 
 if (TYPO3_MODE === 'FE') {
     // Register the basic media wizard provider
-    \TYPO3\CMS\Mediace\MediaWizard\MediaWizardProviderManager::registerMediaWizardProvider(\TYPO3\CMS\Mediace\MediaWizard\MediaWizardProvider::class);
+    \FoT3\Mediace\MediaWizard\MediaWizardProviderManager::registerMediaWizardProvider(\FoT3\Mediace\MediaWizard\MediaWizardProvider::class);
 }
 
 if (TYPO3_MODE === 'BE') {
     // Register for hook to show preview of tt_content element of CType="multimedia" in page module
     $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['cms/layout/class.tx_cms_layout.php']['tt_content_drawItem']['multimedia'] =
-        \TYPO3\CMS\Mediace\Hooks\PageLayoutView\MultimediaPreviewRenderer::class;
+        \FoT3\Mediace\Hooks\PageLayoutView\MultimediaPreviewRenderer::class;
 }