diff --git a/fproject/Zend/Amf/Server.php b/fproject/Zend/Amf/Server.php
index f03ddd7..484d39e 100644
--- a/fproject/Zend/Amf/Server.php
+++ b/fproject/Zend/Amf/Server.php
@@ -39,6 +39,7 @@
 use fproject\amf\Request;
 use fproject\amf\HttpRequest;
 use fproject\amf\Response;
+use fproject\amf\HttpResponse;
 
 /**
  * An AMF gateway server implementation to allow the connection of the Adobe Flash Player to
@@ -720,8 +721,7 @@ public function setResponse($response)
     public function getResponse()
     {
         if (null === ($response = $this->_response)) {
-            require_once 'Zend/Amf/Response/Http.php';
-            $this->setResponse(new Zend_Amf_Response_Http());
+            $this->setResponse(new HttpResponse());
         }
         return $this->_response;
     }
diff --git a/fproject/Zend/Amf/Response/Http.php b/fproject/amf/HttpResponse.php
similarity index 55%
rename from fproject/Zend/Amf/Response/Http.php
rename to fproject/amf/HttpResponse.php
index f470745..2d31870 100644
--- a/fproject/Zend/Amf/Response/Http.php
+++ b/fproject/amf/HttpResponse.php
@@ -1,36 +1,29 @@
 <?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Amf
- * @subpackage Response
- * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
+///////////////////////////////////////////////////////////////////////////////
+//
+// © Copyright f-project.net 2010-present.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+///////////////////////////////////////////////////////////////////////////////
 
-use fproject\amf\Response;
+namespace fproject\amf;
 
 /**
  * Creates the proper http headers and send the serialized AMF stream to standard out.
  *
- * @package    Zend_Amf
- * @subpackage Response
- * @copyright  Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Zend_Amf_Response_Http extends Response
+class HttpResponse extends Response
 {
     /**
      * Create the application response header for AMF and sends the serialized AMF string
diff --git a/tests/Zend/Amf/Response/HttpTest.php b/tests/Zend/Amf/Response/HttpTest.php
index 4ebb4b3..2b785fa 100644
--- a/tests/Zend/Amf/Response/HttpTest.php
+++ b/tests/Zend/Amf/Response/HttpTest.php
@@ -24,10 +24,7 @@
     define('PHPUnit_MAIN_METHOD', 'Zend_Amf_Response_HttpTest::main');
 }
 
-/**
- * @see Zend_Amf_Response_Http
- */
-require_once 'Zend/Amf/Response/Http.php';
+use fproject\amf\HttpResponse;
 
 /**
  * Test case for Response
@@ -68,10 +65,10 @@ public function testDoesNotEmitNoticeWhenHttpsServerKeyNotSet()
 }
 
 /**
- * Expose Zend_Amf_Response_Http::isIeOverSsl for testing
+ * Expose HttpResponse::isIeOverSsl for testing
  * @see ZF-11783
  */
-class ZF11783_ExposeIsIeOverSsl extends Zend_Amf_Response_Http
+class ZF11783_ExposeIsIeOverSsl extends HttpResponse
 {
     public function isIeOverSsl() {
         return parent::isIeOverSsl();
diff --git a/tests/Zend/Amf/ServerTest.php b/tests/Zend/Amf/ServerTest.php
index 26fd1ed..ee9238d 100644
--- a/tests/Zend/Amf/ServerTest.php
+++ b/tests/Zend/Amf/ServerTest.php
@@ -41,6 +41,7 @@
 use fproject\amf\Request;
 use fproject\amf\HttpRequest;
 use fproject\amf\Response;
+use fproject\amf\HttpResponse;
 
 /**
  * @category   Zend
@@ -759,7 +760,7 @@ public function testSetResponseShouldAllowValidStringClassNames()
         $this->_server->setResponse('fproject\amf\Response');
         $response = $this->_server->getResponse();
         $this->assertTrue($response instanceof Response);
-        $this->assertFalse($response instanceof Zend_Amf_Response_Http);
+        $this->assertFalse($response instanceof HttpResponse);
     }
 
     /**