diff --git a/Classes/Factory/AbstractFormFactory.php b/Classes/Factory/AbstractFormFactory.php
index 1ccd0be..841979b 100644
--- a/Classes/Factory/AbstractFormFactory.php
+++ b/Classes/Factory/AbstractFormFactory.php
@@ -51,12 +51,12 @@
  * definition.
  *
  * The AbstractFormFactory loads the presets from the package settings, from the
- * YAML key *TYPO3: Form: presets: [presetName]*.
+ * YAML key *Neos: Form: presets: [presetName]*.
  *
  * The YAML preset definition has the following structure:
  *
  * <pre>
- * TYPO3:
+ * Neos:
  *   Form:
  *     presets:
  *       default:
@@ -130,7 +130,7 @@ public function initializeObject()
     public function getPresetConfiguration($presetName)
     {
         if (!isset($this->formSettings['presets'][$presetName])) {
-            throw new \Neos\Form\Exception\PresetNotFoundException(sprintf('The Preset "%s" was not found underneath TYPO3: Form: presets.', $presetName), 1325685498);
+            throw new \Neos\Form\Exception\PresetNotFoundException(sprintf('The Preset "%s" was not found underneath Neos: Form: presets.', $presetName), 1325685498);
         }
         $preset = $this->formSettings['presets'][$presetName];
         if (isset($preset['parentPreset'])) {
diff --git a/Classes/Finishers/EmailFinisher.php b/Classes/Finishers/EmailFinisher.php
index 42ddd98..cf7e4e0 100644
--- a/Classes/Finishers/EmailFinisher.php
+++ b/Classes/Finishers/EmailFinisher.php
@@ -96,7 +96,7 @@ protected function executeInternal()
             throw new FinisherException('The option "senderAddress" must be set for the EmailFinisher.', 1327060210);
         }
 
-        $mail = new \TYPO3\SwiftMailer\Message();
+        $mail = new \Neos\SwiftMailer\Message();
 
         $mail
             ->setFrom(array($senderAddress => $senderName))
diff --git a/Documentation/adjusting-form-output.rst b/Documentation/adjusting-form-output.rst
index d596ec6..dcaf640 100644
--- a/Documentation/adjusting-form-output.rst
+++ b/Documentation/adjusting-form-output.rst
@@ -35,7 +35,7 @@ file, like in the following example:
 
 .. code-block:: yaml
 
-	TYPO3:
+	Neos:
 	  Form:
 	    presets:
 	      preset1:
@@ -160,7 +160,7 @@ contents:
 
 .. code-block:: yaml
 
-	TYPO3:
+	Neos:
 	  Form:
 	    presets:
 	      myCustom:
@@ -221,7 +221,7 @@ Adjust ``Your.Package/Configuration/Settings.yaml`` accordingly:
 
 .. code-block:: yaml
 
-	TYPO3:
+	Neos:
 	  Form:
 	    presets:
 	      myCustom:
@@ -361,27 +361,27 @@ Now, you only need to adjust the form definition in order to use the new templat
 
 .. code-block:: yaml
 
-	TYPO3:
+	Neos:
 	  Form:
-	  presets:
-	    ########### CUSTOM PRESETS ###########
+	    presets:
+	      ########### CUSTOM PRESETS ###########
 
-	    myCustom:
-	      title: 'Custom Elements'
-	      parentPreset: 'default'
-	      formElementTypes:
+	      myCustom:
+	        title: 'Custom Elements'
+	        parentPreset: 'default'
+	        formElementTypes:
 
-	         # ...
+	           # ...
 
-	         ### override template path of Neos.Form:Form ###
-	        'Neos.Form:Form':
-	          renderingOptions:
-	            templatePathPattern: 'resource://Neos.FormExample/Private/CustomElements/Form.html'
+	           ### override template path of Neos.Form:Form ###
+	          'Neos.Form:Form':
+	            renderingOptions:
+	              templatePathPattern: 'resource://Neos.FormExample/Private/CustomElements/Form.html'
 
-	         ### override default layout path ###
-	        'Neos.Form:Base':
-	          renderingOptions:
-	            layoutPathPattern: 'resource://Neos.FormExample/Private/CustomElements/Layouts/{@type}.html'
+	           ### override default layout path ###
+	          'Neos.Form:Base':
+	            renderingOptions:
+	              layoutPathPattern: 'resource://Neos.FormExample/Private/CustomElements/Layouts/{@type}.html'
 
 .. tip:: You can use **placeholders** in ``templatePathPattern``, ``partialPathPattern`` and ``layoutPathPattern``:
    ``{@package}`` will be replaced by the package key and ``{@type}`` by the current form element type
@@ -402,7 +402,7 @@ two radio buttons for ``Female`` and ``Male``. That's just a matter of a few lin
 
 .. code-block:: yaml
 
-	TYPO3:
+	Neos:
 	  Form:
 	    presets:
 	       ########### CUSTOM PRESETS ###########
diff --git a/Documentation/configuring-form-builder.rst b/Documentation/configuring-form-builder.rst
index 9b33345..a4b74d2 100644
--- a/Documentation/configuring-form-builder.rst
+++ b/Documentation/configuring-form-builder.rst
@@ -10,7 +10,7 @@ Let's say you have created your form element, and want to make it available insi
 
 .. code-block:: yaml
 
-	# we are now inside TYPO3:Form:presets:[presetName]
+	# we are now inside Neos:Form:presets:[presetName]
 	formElementTypes:
 	  'Your.Package:YourFormElement':
 	    # the definitions for your form element
@@ -35,7 +35,7 @@ All form element groups are defined inside ``formElementGroups`` inside the pres
 
 .. code-block:: yaml
 
-	# we are now inside TYPO3:Form:presets:[presetName]
+	# we are now inside Neos:Form:presets:[presetName]
 	formElementGroups:
 	  specialCustom:
 	    sorting: 500
@@ -54,7 +54,7 @@ Here follows the full configuration for the ``ProgrammingLanguageSelect`` (which
 
 .. code-block:: yaml
 
-	# we are now inside TYPO3:Form:presets:[presetName]
+	# we are now inside Neos:Form:presets:[presetName]
 	formElementTypes:
 	  'Neos.FormExample:ProgrammingLanguageSelect':
 	    superTypes:
@@ -100,7 +100,7 @@ Choosing which strategy to use depends mostly on the expected usage patterns:
 
 	.. code-block:: yaml
 
-		# we are now inside TYPO3:Form:presets:[presetName]
+		# we are now inside Neos:Form:presets:[presetName]
 		formElementTypes:
 		  'Neos.FormExample:GenderSelect':
 		    formBuilder:
@@ -123,14 +123,14 @@ This can be configured as follows:
 
 .. code-block:: yaml
 
-	# we are now inside TYPO3:Form:presets:[presetName]
+	# we are now inside Neos:Form:presets:[presetName]
 	formElementTypes:
 	  'Neos.Form:TextMixin': # or any other type here
 	    formBuilder:
 	      editors:
 	        validation:
 	          availableValidators:
-	            'TYPO3.Flow:StringLength': # or any other validator
+	            'Neos.Flow:StringLength': # or any other validator
 	              # mark this validator required such that it is always shown.
 	              required: true
 
@@ -141,7 +141,7 @@ The same works for Finishers, for example the following configuration makes the
 
 .. code-block:: yaml
 
-	# we are now inside TYPO3:Form:presets:[presetName]
+	# we are now inside Neos:Form:presets:[presetName]
 	formElementTypes:
 	  'Neos.Form:Form':
 	    formBuilder:
diff --git a/Documentation/configuring-form-yaml.rst b/Documentation/configuring-form-yaml.rst
index f5f9099..11a5fa5 100644
--- a/Documentation/configuring-form-yaml.rst
+++ b/Documentation/configuring-form-yaml.rst
@@ -12,7 +12,7 @@ configuration is stored. This is done in ``Settings.yaml``:
 
 .. code-block:: yaml
 
-    TYPO3:
+    Neos:
       Form:
         yamlPersistenceManager:
           savePath: 'resource://AcmeCom.SomePackage/Private/Form/'
@@ -63,20 +63,20 @@ The following YAML is stored as ``contact.yaml``:
             identifier: name
             label: 'Name'
             validators:
-              - identifier: 'TYPO3.Flow:NotEmpty'
+              - identifier: 'Neos.Flow:NotEmpty'
           -
             type: 'Neos.Form:SingleLineText'
             identifier: email
             label: 'Email'
             validators:
-              - identifier: 'TYPO3.Flow:NotEmpty'
-              - identifier: 'TYPO3.Flow:EmailAddress'
+              - identifier: 'Neos.Flow:NotEmpty'
+              - identifier: 'Neos.Flow:EmailAddress'
           -
             type: 'Neos.Form:MultiLineText'
             identifier: message
             label: 'Message'
             validators:
-              - identifier: 'TYPO3.Flow:NotEmpty'
+              - identifier: 'Neos.Flow:NotEmpty'
     finishers:
       -
         identifier: 'Neos.Form:Email'
diff --git a/Documentation/extending-form-api.rst b/Documentation/extending-form-api.rst
index c0d9c02..1f7969a 100644
--- a/Documentation/extending-form-api.rst
+++ b/Documentation/extending-form-api.rst
@@ -89,7 +89,7 @@ For this create a new PHP class at ``Your.Package/Classes/FormElements/Condition
 	      if ($triggerValue === NULL || $triggerValue === '') {
 	         return;
 	      }
-	      $this->addValidator(new \TYPO3\Flow\Validation\Validator\NotEmptyValidator());
+	      $this->addValidator(new \Neos\Flow\Validation\Validator\NotEmptyValidator());
 	   }
 	}
 
@@ -106,7 +106,7 @@ In order to use the new Form Element type you first have to extend the Form Defi
 
 .. code-block:: yaml
 
-	TYPO3:
+	Neos:
 	  Form:
 	    presets:
 	      somePreset:
diff --git a/Documentation/extending-form-builder.rst b/Documentation/extending-form-builder.rst
index d792ae3..7cd30ca 100644
--- a/Documentation/extending-form-builder.rst
+++ b/Documentation/extending-form-builder.rst
@@ -21,7 +21,7 @@ Let's say you want to adjust the form builder with a custom CSS file inside ``Yo
 
 .. code-block:: yaml
 
-	TYPO3:
+	Neos:
 	  FormBuilder:
 	    stylesheets:
 	      customAdjustments:
@@ -50,18 +50,18 @@ The default template is located inside ``Neos.FormBuilder/Resources/Private/Form
 
 	<h1>Form Builder - {{Neos.FormBuilder.Model.Form.formDefinition.label}}</h1>
 	{{#if Neos.FormBuilder.Model.Form.currentlyLoadingPreview}}
-	   <span id="typo3-formbuilder-loading">Loading..</span>
+	   <span id="neos-formbuilder-loading">Loading..</span>
 	{{/if}}
 
-	<ul id="typo3-formbuilder-toolbar">
-	   <li class="typo3-formbuilder-preset">
+	<ul id="neos-formbuilder-toolbar">
+	   <li class="neos-formbuilder-preset">
 	      {{view Neos.FormBuilder.View.Header.PresetSelector}}
 	   </li>
-	   <li class="typo3-formbuilder-preview">
-	      {{#view Neos.FormBuilder.View.Header.PreviewButton class="typo3-formbuilder-button icon"}}Preview{{/view}}
+	   <li class="neos-formbuilder-preview">
+	      {{#view Neos.FormBuilder.View.Header.PreviewButton class="neos-formbuilder-button icon"}}Preview{{/view}}
 	   </li>
-	   <li class="typo3-formbuilder-save">
-		{{#view Neos.FormBuilder.View.Header.SaveButton class="typo3-formbuilder-button icon"}}Save{{/view}}
+	   <li class="neos-formbuilder-save">
+		{{#view Neos.FormBuilder.View.Header.SaveButton class="neos-formbuilder-button icon"}}Save{{/view}}
 	   </li>
 	</ul>
 
@@ -75,7 +75,7 @@ Then, we need to tell the form builder that we want to use a different handlebar
 
 .. code-block:: yaml
 
-	TYPO3:
+	Neos:
 	  FormBuilder:
 	    handlebarsTemplates:
 	      Header: resource://Your.Package/Private/FormBuilderTemplates/Header.html
@@ -91,7 +91,7 @@ All editors for a given form element are defined inside the ``formElementTypes``
 
 .. code-block:: yaml
 
-	# we are now inside TYPO3:Form:presets:[presetName]:formElementTypes
+	# we are now inside Neos:Form:presets:[presetName]:formElementTypes
 	'Neos.Form:TextMixin':
 	  formBuilder:
 	    editors:
@@ -122,9 +122,9 @@ Then, we will create a basic handlebars template and register it underneath ``El
 
 .. code-block:: html
 
-	<div class="typo3-formbuilder-controlGroup">
+	<div class="neos-formbuilder-controlGroup">
 	   <label>{{label}}:</label>
-	   <div class="typo3-formbuilder-controls">
+	   <div class="neos-formbuilder-controls">
 	      [select should come here]
 	   </div>
 	</div>
@@ -135,7 +135,7 @@ Now that we have all the pieces ready, let's actually use the editor inside the
 
 .. code-block:: yaml
 
-	# we are now inside TYPO3:Form:presets:[presetName]:formElementTypes
+	# we are now inside Neos:Form:presets:[presetName]:formElementTypes
 	'Neos.Form:FileUpload':
          formBuilder:
            editors:
@@ -228,7 +228,7 @@ You need to do three things:
 
 .. code-block:: yaml
 
-	TYPO3:
+	Neos:
 	  Form:
 	    presets:
 	      yourPresetName: # fill in your preset name here, or "default"
@@ -260,12 +260,12 @@ Now, you only need to include the appropriate Handlebars template, which could l
 	   {{label}}
 	   {{#view Ember.Button target="parentView" action="remove"
 	                        isVisibleBinding="notRequired"
-	                        class="typo3-formbuilder-removeButton"}}Remove{{/view}}
+	                        class="neos-formbuilder-removeButton"}}Remove{{/view}}
 	</h4>
 
-	<div class="typo3-formbuilder-controlGroup">
+	<div class="neos-formbuilder-controlGroup">
 	   <label>Database Table</label>
-	   <div class="typo3-formbuilder-controls">
+	   <div class="neos-formbuilder-controls">
 	      {{view Ember.TextField valueBinding="currentCollectionElement.options.databaseTable"}}
 	   </div>
 	</div>
diff --git a/Documentation/index.rst b/Documentation/index.rst
index 81222e1..239773d 100644
--- a/Documentation/index.rst
+++ b/Documentation/index.rst
@@ -17,7 +17,7 @@ It includes the following features:
 * highly **flexible rendering** of form elements, based on Fluid
 * **Extensible** with new form elements
 * robust, **object oriented API**
-* great integration into **TYPO3 Flow**
+* great integration into **Neos Flow**
 
 Furthermore, we built a **Form Builder** which is a web application for graphically
 assembling and modifying forms, displayed below:
diff --git a/Documentation/quickstart.rst b/Documentation/quickstart.rst
index a867cb0..5ef9163 100644
--- a/Documentation/quickstart.rst
+++ b/Documentation/quickstart.rst
@@ -61,7 +61,7 @@ If you want to build a form with PHP, the skeleton for building a form looks as
 
 	namespace Your\Package;
 
-	use TYPO3\Flow\Annotations as Flow;
+	use Neos\Flow\Annotations as Flow;
 	use Neos\Form\Core\Model\FormDefinition;
 
 	class QuickstartFactory extends \Neos\Form\Factory\AbstractFormFactory {
@@ -137,15 +137,15 @@ Validation
 ----------
 
 Every :api-core-model:`FormElement <AbstractFormElement>` implements the :api-core-model:`FormElementInterface`
-which provides a convenient way to work with TYPO3 Flow validators::
+which provides a convenient way to work with Neos Flow validators::
 
-	$name->addValidator(new \TYPO3\Flow\Validation\Validator\NotEmptyValidator());
+	$name->addValidator(new \Neos\Flow\Validation\Validator\NotEmptyValidator());
 
-	$email->addValidator(new \TYPO3\Flow\Validation\Validator\NotEmptyValidator());
-	$email->addValidator(new \TYPO3\Flow\Validation\Validator\EmailAddressValidator());
+	$email->addValidator(new \Neos\Flow\Validation\Validator\NotEmptyValidator());
+	$email->addValidator(new \Neos\Flow\Validation\Validator\EmailAddressValidator());
 
-	$comments->addValidator(new \TYPO3\Flow\Validation\Validator\NotEmptyValidator());
-	$comments->addValidator(new \TYPO3\Flow\Validation\Validator\StringLengthValidator(array('minimum' => 3)));
+	$comments->addValidator(new \Neos\Flow\Validation\Validator\NotEmptyValidator());
+	$comments->addValidator(new \Neos\Flow\Validation\Validator\StringLengthValidator(array('minimum' => 3)));
 
 With the ``addValidator($validator)`` method you can attach one or more validators to a form element.
 If you save the changes and reload the page where you embedded the form, you can see that
@@ -199,7 +199,7 @@ That's it for the quickstart. The complete code of your form factory should look
 
 	namespace Your\Package;
 
-	use TYPO3\Flow\Annotations as Flow;
+	use Neos\Flow\Annotations as Flow;
 	use Neos\Form\Core\Model\FormDefinition;
 
 	/**
@@ -220,17 +220,17 @@ That's it for the quickstart. The complete code of your form factory should look
 
 			$name = $page1->createElement('name', 'Neos.Form:SingleLineText');
 			$name->setLabel('Name');
-			$name->addValidator(new \TYPO3\Flow\Validation\Validator\NotEmptyValidator());
+			$name->addValidator(new \Neos\Flow\Validation\Validator\NotEmptyValidator());
 
 			$email = $page1->createElement('email', 'Neos.Form:SingleLineText');
 			$email->setLabel('Email');
-			$email->addValidator(new \TYPO3\Flow\Validation\Validator\NotEmptyValidator());
-			$email->addValidator(new \TYPO3\Flow\Validation\Validator\EmailAddressValidator());
+			$email->addValidator(new \Neos\Flow\Validation\Validator\NotEmptyValidator());
+			$email->addValidator(new \Neos\Flow\Validation\Validator\EmailAddressValidator());
 
 			$comments = $page1->createElement('message', 'Neos.Form:MultiLineText');
 			$comments->setLabel('Message');
-			$comments->addValidator(new \TYPO3\Flow\Validation\Validator\NotEmptyValidator());
-			$comments->addValidator(new \TYPO3\Flow\Validation\Validator\StringLengthValidator(array('minimum' => 3)));
+			$comments->addValidator(new \Neos\Flow\Validation\Validator\NotEmptyValidator());
+			$comments->addValidator(new \Neos\Flow\Validation\Validator\StringLengthValidator(array('minimum' => 3)));
 
 			$emailFinisher = new \Neos\Form\Finishers\EmailFinisher();
 			$emailFinisher->setOptions(array(
diff --git a/Documentation/translating-forms.rst b/Documentation/translating-forms.rst
index 8e473a6..57af061 100644
--- a/Documentation/translating-forms.rst
+++ b/Documentation/translating-forms.rst
@@ -15,7 +15,7 @@ way to configure it is this:
 
 .. code-block:: yaml
 
-    TYPO3:
+    Neos:
       Form:
         presets:
           default:
@@ -26,7 +26,7 @@ way to configure it is this:
 
 Of course it can be set in a custom preset in the same way.
 
-The translation of validation error messages uses the TYPO3.Flow package by default, to avoid having to
+The translation of validation error messages uses the Neos.Flow package by default, to avoid having to
 copy the validation errors message catalog to all packages used for form translation. If you want to
 adjust those error messages as well, copy ``ValidationErrors.xlf`` to your package and set the option
 ``validationErrorTranslationPackage`` to your package key.
@@ -129,7 +129,7 @@ Assume it is configured like this using YAML:
             identifier: name
             label: 'Name'
             validators:
-              - identifier: 'TYPO3.Flow:NotEmpty'
+              - identifier: 'Neos.Flow:NotEmpty'
             properties:
               placeholder: 'Please enter your full name'
           -
@@ -137,8 +137,8 @@ Assume it is configured like this using YAML:
             identifier: email
             label: 'Email'
             validators:
-              - identifier: 'TYPO3.Flow:NotEmpty'
-              - identifier: 'TYPO3.Flow:EmailAddress'
+              - identifier: 'Neos.Flow:NotEmpty'
+              - identifier: 'Neos.Flow:EmailAddress'
             properties:
               placeholder: 'Enter a valid email address'
           -
@@ -146,7 +146,7 @@ Assume it is configured like this using YAML:
             identifier: message
             label: 'Message'
             validators:
-              - identifier: 'TYPO3.Flow:NotEmpty'
+              - identifier: 'Neos.Flow:NotEmpty'
             properties:
               placeholder: 'Enter your message here'
 
diff --git a/Migrations/Code/Version20160601101500.php b/Migrations/Code/Version20160601101500.php
index 036428a..8b3677c 100644
--- a/Migrations/Code/Version20160601101500.php
+++ b/Migrations/Code/Version20160601101500.php
@@ -2,7 +2,7 @@
 namespace Neos\Flow\Core\Migrations;
 
 /*
- * This file is part of the TYPO3.Flow package.
+ * This file is part of the Neos.Flow package.
  *
  * (c) Contributors of the Neos Project - www.neos.io
  *
diff --git a/Tests/Unit/Core/Model/PageTest.php b/Tests/Unit/Core/Model/PageTest.php
index fbc2a4c..6e9d88f 100644
--- a/Tests/Unit/Core/Model/PageTest.php
+++ b/Tests/Unit/Core/Model/PageTest.php
@@ -47,8 +47,8 @@ public function defaultTypeIsCorrect()
      */
     public function typeCanBeOverridden()
     {
-        $page = new Page('foo', 'TYPO3.Foo:Bar');
-        $this->assertSame('TYPO3.Foo:Bar', $page->getType());
+        $page = new Page('foo', 'Neos.Foo:Bar');
+        $this->assertSame('Neos.Foo:Bar', $page->getType());
     }
 
     public function invalidIdentifiers()
diff --git a/composer.json b/composer.json
index 6ae5195..70cc444 100755
--- a/composer.json
+++ b/composer.json
@@ -4,7 +4,7 @@
     "license": "LGPL-3.0+",
     "description": "Extensible and flexible API for building web forms",
     "require": {
-        "neos/flow": "*"
+        "neos/flow": "~4.0 || dev-master"
     },
     "replace": {
         "typo3/form": "self.version"
@@ -79,4 +79,4 @@
             "Neos.Flow-20161125124112"
         ]
     }
-}
\ No newline at end of file
+}