diff --git a/src/Cookies.php b/src/Cookies.php
old mode 100755
new mode 100644
index 67b2b4100c..e7425696ba
--- a/src/Cookies.php
+++ b/src/Cookies.php
@@ -93,7 +93,7 @@ public function addCookie(Cookie $cookie, $ref_uri = null)
      */
     public function addCookiesFromResponse(Response $response, $ref_uri)
     {
-        $cookie_hdrs = $response->headers()->get('Set-Cookie');
+        $cookie_hdrs = $response->getHeaders()->get('Set-Cookie');
 
         if (is_array($cookie_hdrs)) {
             foreach ($cookie_hdrs as $cookie) {
diff --git a/src/Request.php b/src/Request.php
index d224196f0a..7ce8d39b89 100644
--- a/src/Request.php
+++ b/src/Request.php
@@ -300,9 +300,9 @@ public function getPost()
     }
 
     /**
-     * Return the Cookie header, this is the same as calling $request->headers()->get('Cookie');
+     * Return the Cookie header, this is the same as calling $request->getHeaders()->get('Cookie');
      *
-     * @convenience $request->headers()->get('Cookie');
+     * @convenience $request->getHeaders()->get('Cookie');
      * @return Header\Cookie
      */
     public function getCookie()
@@ -394,7 +394,7 @@ public function getEnv()
 
     /**
      * Provide an alternate Parameter Container implementation for headers in this object, (this is NOT the
-     * primary API for value setting, for that see headers())
+     * primary API for value setting, for that see getHeaders())
      *
      * @param \Zend\Http\Headers $headers
      * @return \Zend\Http\Request
diff --git a/test/Client/CommonHttpTests.php b/test/Client/CommonHttpTests.php
old mode 100755
new mode 100644
index d57b64a615..cd42aebf97
--- a/test/Client/CommonHttpTests.php
+++ b/test/Client/CommonHttpTests.php
@@ -957,7 +957,7 @@ public function testZF9404DoubleContentLengthHeader()
             throw new AdapterException\RuntimeException("Error requesting test URL");
         }
 
-        $clen = $response->headers()->get('Content-Length');
+        $clen = $response->getHeaders()->get('Content-Length');
 
         if (! (is_array($clen))) {
             $this->markTestSkipped("Didn't get multiple Content-length headers");
@@ -986,7 +986,7 @@ public function testContentTypeAdditionlInfo($params)
         $this->client->send();
         $request = Request::fromString($this->client->getLastRawRequest());
         $this->assertEquals($content_type,
-                            $request->headers()->get('Content-Type')->getFieldValue());
+                            $request->getHeaders()->get('Content-Type')->getFieldValue());
     }
 
     /**