diff --git a/src/Container/AbstractContainer.php b/src/Container/AbstractContainer.php
index a233d77..dc8bd38 100644
--- a/src/Container/AbstractContainer.php
+++ b/src/Container/AbstractContainer.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Memory
  */
diff --git a/src/Container/AccessController.php b/src/Container/AccessController.php
index 354d6ed..09a1aa0 100644
--- a/src/Container/AccessController.php
+++ b/src/Container/AccessController.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Memory
  */
@@ -97,7 +97,7 @@ public function unlock()
     /**
      * Return true if object is locked
      *
-     * @return boolean
+     * @return bool
      */
     public function isLocked()
     {
diff --git a/src/Container/ContainerInterface.php b/src/Container/ContainerInterface.php
index 8c54674..63ed176 100644
--- a/src/Container/ContainerInterface.php
+++ b/src/Container/ContainerInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Memory
  */
@@ -48,7 +48,7 @@ public function unlock();
     /**
      * Return true if object is locked
      *
-     * @return boolean
+     * @return bool
      */
     public function isLocked();
 }
diff --git a/src/Container/Locked.php b/src/Container/Locked.php
index f04a0a3..cfd705e 100644
--- a/src/Container/Locked.php
+++ b/src/Container/Locked.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Memory
  */
@@ -57,7 +57,7 @@ public function unlock()
     /**
      * Return true if object is locked
      *
-     * @return boolean
+     * @return bool
      */
     public function isLocked()
     {
diff --git a/src/Container/Movable.php b/src/Container/Movable.php
index 12c4f53..7483d63 100644
--- a/src/Container/Movable.php
+++ b/src/Container/Movable.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Memory
  */
@@ -102,7 +102,7 @@ public function unlock()
     /**
      * Return true if object is locked
      *
-     * @return boolean
+     * @return bool
      */
     public function isLocked()
     {
@@ -248,7 +248,7 @@ public function markAsSwapped()
      * Check if object is marked as swapped
      *
      * @internal
-     * @return boolean
+     * @return bool
      */
     public function isSwapped()
     {
diff --git a/src/Exception/ExceptionInterface.php b/src/Exception/ExceptionInterface.php
index b258e05..e3c78cc 100644
--- a/src/Exception/ExceptionInterface.php
+++ b/src/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Memory
  */
diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
index c8bf6f2..8d6b1ef 100644
--- a/src/Exception/InvalidArgumentException.php
+++ b/src/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Memory
  */
diff --git a/src/Exception/RuntimeException.php b/src/Exception/RuntimeException.php
index 5ecf244..230d959 100644
--- a/src/Exception/RuntimeException.php
+++ b/src/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Memory
  */
diff --git a/src/MemoryManager.php b/src/MemoryManager.php
index 4fa8f60..da0fa09 100644
--- a/src/MemoryManager.php
+++ b/src/MemoryManager.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Memory
  */
@@ -246,7 +246,7 @@ public function createLocked($value = '')
      * Create new Zend_Memory object
      *
      * @param string $value
-     * @param boolean $locked
+     * @param  bool $locked
      * @return \Zend\Memory\Container\ContainerInterface
      * @throws \Zend\Memory\Exception\ExceptionInterface
      */
diff --git a/src/Value.php b/src/Value.php
index 892dbf4..d3d4c67 100644
--- a/src/Value.php
+++ b/src/Value.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Memory
  */
@@ -41,7 +41,7 @@ class Value implements ArrayAccess, Countable
     /**
      * Boolean flag which signals to trace value modifications
      *
-     * @var boolean
+     * @var bool
      */
     private $trace;
 
@@ -84,7 +84,7 @@ public function count()
      * returns true if string offset exists
      *
      * @param integer $offset
-     * @return boolean
+     * @return bool
      */
     public function offsetExists($offset)
     {
diff --git a/test/AccessControllerTest.php b/test/AccessControllerTest.php
index 80274a9..d09b9f3 100644
--- a/test/AccessControllerTest.php
+++ b/test/AccessControllerTest.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Memory
  */
@@ -80,12 +80,12 @@ public function testLock()
         $memoryManager  = new Memory\MemoryManager($this->_cache);
         $memObject      = $memoryManager->create('012345678');
 
-        $this->assertFalse((boolean)$memObject->isLocked());
+        $this->assertFalse((bool) $memObject->isLocked());
 
         $memObject->lock();
-        $this->assertTrue((boolean)$memObject->isLocked());
+        $this->assertTrue((bool) $memObject->isLocked());
 
         $memObject->unlock();
-        $this->assertFalse((boolean)$memObject->isLocked());
+        $this->assertFalse((bool) $memObject->isLocked());
     }
 }
diff --git a/test/LockedTest.php b/test/LockedTest.php
index 4674218..ec9e2c9 100644
--- a/test/LockedTest.php
+++ b/test/LockedTest.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Memory
  */
@@ -62,14 +62,14 @@ public function testLock()
         $memObject = new Container\Locked('0123456789');
 
         // It's always locked
-        $this->assertTrue((boolean)$memObject->isLocked());
+        $this->assertTrue((bool) $memObject->isLocked());
 
         $memObject->lock();
-        $this->assertTrue((boolean)$memObject->isLocked());
+        $this->assertTrue((bool) $memObject->isLocked());
 
         $memObject->unlock();
         // It's always locked
-        $this->assertTrue((boolean)$memObject->isLocked());
+        $this->assertTrue((bool) $memObject->isLocked());
     }
 
     /**
diff --git a/test/MemoryManagerTest.php b/test/MemoryManagerTest.php
index f832210..6805429 100644
--- a/test/MemoryManagerTest.php
+++ b/test/MemoryManagerTest.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Memory
  */
diff --git a/test/MovableTest.php b/test/MovableTest.php
index f0a8b75..8fccc0c 100644
--- a/test/MovableTest.php
+++ b/test/MovableTest.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Memory
  */
@@ -66,13 +66,13 @@ public function testLock()
         $memoryManager = new DummyMemoryManager();
         $memObject = new Container\Movable($memoryManager, 10, '0123456789');
 
-        $this->assertFalse((boolean)$memObject->isLocked());
+        $this->assertFalse((bool) $memObject->isLocked());
 
         $memObject->lock();
-        $this->assertTrue((boolean)$memObject->isLocked());
+        $this->assertTrue((bool) $memObject->isLocked());
 
         $memObject->unlock();
-        $this->assertFalse((boolean)$memObject->isLocked());
+        $this->assertFalse((bool) $memObject->isLocked());
     }
 
     /**
@@ -136,7 +136,7 @@ public function testInvalidSetThrowException()
  */
 class DummyMemoryManager extends Memory\MemoryManager
 {
-    /** @var boolean */
+    /** @var bool */
     public $processUpdatePassed = false;
 
     /** @var integer */
diff --git a/test/ValueTest.php b/test/ValueTest.php
index c7747bf..07b3394 100644
--- a/test/ValueTest.php
+++ b/test/ValueTest.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Memory
  */