diff --git a/.gitattributes b/.gitattributes
index 85dc9a8c..1abdf0f4 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,6 +1,8 @@
-/test export-ignore
-/vendor export-ignore
-.gitattributes export-ignore
-.gitignore export-ignore
-.travis.yml export-ignore
-.php_cs export-ignore
+/.coveralls.yml export-ignore
+/.gitattributes export-ignore
+/.gitignore export-ignore
+/.php_cs export-ignore
+/.travis.yml export-ignore
+/phpunit.xml.dist export-ignore
+/phpunit.xml.travis export-ignore
+/test/ export-ignore
diff --git a/.gitignore b/.gitignore
index 4cac0a21..d5e33e78 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,14 +1,5 @@
-.buildpath
-.DS_Store
-.idea
-.project
-.settings/
-.*.sw*
-.*.un~
-nbproject
-tmp/
-
-clover.xml
-coveralls-upload.json
-phpunit.xml
-vendor
+/clover.xml
+/composer.lock
+/coveralls-upload.json
+/phpunit.xml
+/vendor/
diff --git a/.travis.yml b/.travis.yml
index fe909ecb..a2f410ec 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,3 @@
-sudo: false
-
 language: php
 
 matrix:
@@ -17,7 +15,6 @@ matrix:
     - php: hhvm
 
 notifications:
-  irc: "irc.freenode.org#zftalk.dev"
   email: false
 
 before_install:
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
deleted file mode 100644
index 608075d4..00000000
--- a/CONTRIBUTING.md
+++ /dev/null
@@ -1,229 +0,0 @@
-# CONTRIBUTING
-
-## RESOURCES
-
-If you wish to contribute to Zend Framework, please be sure to
-read/subscribe to the following resources:
-
- -  [Coding Standards](https://github.com/zendframework/zf2/wiki/Coding-Standards)
- -  [Contributor's Guide](http://framework.zend.com/participate/contributor-guide)
- -  ZF Contributor's mailing list:
-    Archives: http://zend-framework-community.634137.n4.nabble.com/ZF-Contributor-f680267.html
-    Subscribe: zf-contributors-subscribe@lists.zend.com
- -  ZF Contributor's IRC channel:
-    #zftalk.dev on Freenode.net
-
-If you are working on new features or refactoring [create a proposal](https://github.com/zendframework/zend-service-manager/issues/new).
-
-## Reporting Potential Security Issues
-
-If you have encountered a potential security vulnerability, please **DO NOT** report it on the public
-issue tracker: send it to us at [zf-security@zend.com](mailto:zf-security@zend.com) instead.
-We will work with you to verify the vulnerability and patch it as soon as possible.
-
-When reporting issues, please provide the following information:
-
-- Component(s) affected
-- A description indicating how to reproduce the issue
-- A summary of the security vulnerability and impact
-
-We request that you contact us via the email address above and give the project
-contributors a chance to resolve the vulnerability and issue a new release prior
-to any public exposure; this helps protect users and provides them with a chance
-to upgrade and/or update in order to protect their applications.
-
-For sensitive email communications, please use [our PGP key](http://framework.zend.com/zf-security-pgp-key.asc).
-
-## RUNNING TESTS
-
-> ### Note: testing versions prior to 2.4
->
-> This component originates with Zend Framework 2. During the lifetime of ZF2,
-> testing infrastructure migrated from PHPUnit 3 to PHPUnit 4. In most cases, no
-> changes were necessary. However, due to the migration, tests may not run on
-> versions < 2.4. As such, you may need to change the PHPUnit dependency if
-> attempting a fix on such a version.
-
-To run tests:
-
-- Clone the repository:
-
-  ```console
-  $ git clone git@github.com:zendframework/zend-service-manager.git
-  $ cd
-  ```
-
-- Install dependencies via composer:
-
-  ```console
-  $ curl -sS https://getcomposer.org/installer | php --
-  $ ./composer.phar install
-  ```
-
-  If you don't have `curl` installed, you can also download `composer.phar` from https://getcomposer.org/
-
-- Run the tests via `phpunit` and the provided PHPUnit config, like in this example:
-
-  ```console
-  $ ./vendor/bin/phpunit
-  ```
-
-You can turn on conditional tests with the phpunit.xml file.
-To do so:
-
- -  Copy `phpunit.xml.dist` file to `phpunit.xml`
- -  Edit `phpunit.xml` to enable any specific functionality you
-    want to test, as well as to provide test values to utilize.
-
-## Running Coding Standards Checks
-
-This component uses [php-cs-fixer](http://cs.sensiolabs.org/) for coding
-standards checks, and provides configuration for our selected checks.
-`php-cs-fixer` is installed by default via Composer.
-
-To run checks only:
-
-```console
-$ ./vendor/bin/php-cs-fixer fix . -v --diff --dry-run --config-file=.php_cs
-```
-
-To have `php-cs-fixer` attempt to fix problems for you, omit the `--dry-run`
-flag:
-
-```console
-$ ./vendor/bin/php-cs-fixer fix . -v --diff --config-file=.php_cs
-```
-
-If you allow php-cs-fixer to fix CS issues, please re-run the tests to ensure
-they pass, and make sure you add and commit the changes after verification.
-
-## Recommended Workflow for Contributions
-
-Your first step is to establish a public repository from which we can
-pull your work into the master repository. We recommend using
-[GitHub](https://github.com), as that is where the component is already hosted.
-
-1. Setup a [GitHub account](http://github.com/), if you haven't yet
-2. Fork the repository (http://github.com/zendframework/zend-service-manager)
-3. Clone the canonical repository locally and enter it.
-
-   ```console
-   $ git clone git://github.com:zendframework/zend-service-manager.git
-   $ cd zend-service-manager
-   ```
-
-4. Add a remote to your fork; substitute your GitHub username in the command
-   below.
-
-   ```console
-   $ git remote add {username} git@github.com:{username}/zend-service-manager.git
-   $ git fetch {username}
-   ```
-
-### Keeping Up-to-Date
-
-Periodically, you should update your fork or personal repository to
-match the canonical ZF repository. Assuming you have setup your local repository
-per the instructions above, you can do the following:
-
-
-```console
-$ git checkout master
-$ git fetch origin
-$ git rebase origin/master
-# OPTIONALLY, to keep your remote up-to-date -
-$ git push {username} master:master
-```
-
-If you're tracking other branches -- for example, the "develop" branch, where
-new feature development occurs -- you'll want to do the same operations for that
-branch; simply substitute  "develop" for "master".
-
-### Working on a patch
-
-We recommend you do each new feature or bugfix in a new branch. This simplifies
-the task of code review as well as the task of merging your changes into the
-canonical repository.
-
-A typical workflow will then consist of the following:
-
-1. Create a new local branch based off either your master or develop branch.
-2. Switch to your new local branch. (This step can be combined with the
-   previous step with the use of `git checkout -b`.)
-3. Do some work, commit, repeat as necessary.
-4. Push the local branch to your remote repository.
-5. Send a pull request.
-
-The mechanics of this process are actually quite trivial. Below, we will
-create a branch for fixing an issue in the tracker.
-
-```console
-$ git checkout -b hotfix/9295
-Switched to a new branch 'hotfix/9295'
-```
-
-... do some work ...
-
-
-```console
-$ git commit
-```
-
-... write your log message ...
-
-
-```console
-$ git push {username} hotfix/9295:hotfix/9295
-Counting objects: 38, done.
-Delta compression using up to 2 threads.
-Compression objects: 100% (18/18), done.
-Writing objects: 100% (20/20), 8.19KiB, done.
-Total 20 (delta 12), reused 0 (delta 0)
-To ssh://git@github.com/{username}/zend-service-manager.git
-   b5583aa..4f51698  HEAD -> master
-```
-
-To send a pull request, you have two options.
-
-If using GitHub, you can do the pull request from there. Navigate to
-your repository, select the branch you just created, and then select the
-"Pull Request" button in the upper right. Select the user/organization
-"zendframework" as the recipient.
-
-If using your own repository - or even if using GitHub - you can use `git
-format-patch` to create a patchset for us to apply; in fact, this is
-**recommended** for security-related patches. If you use `format-patch`, please
-send the patches as attachments to:
-
--  zf-devteam@zend.com for patches without security implications
--  zf-security@zend.com for security patches
-
-#### What branch to issue the pull request against?
-
-Which branch should you issue a pull request against?
-
-- For fixes against the stable release, issue the pull request against the
-  "master" branch.
-- For new features, or fixes that introduce new elements to the public API (such
-  as new public methods or properties), issue the pull request against the
-  "develop" branch.
-
-### Branch Cleanup
-
-As you might imagine, if you are a frequent contributor, you'll start to
-get a ton of branches both locally and on your remote.
-
-Once you know that your changes have been accepted to the master
-repository, we suggest doing some cleanup of these branches.
-
--  Local branch cleanup
-
-   ```console
-   $ git branch -d <branchname>
-   ```
-
--  Remote branch removal
-
-   ```console
-   $ git push {username} :<branchname>
-   ```
diff --git a/COPYRIGHT.md b/COPYRIGHT.md
new file mode 100644
index 00000000..c4fc4fee
--- /dev/null
+++ b/COPYRIGHT.md
@@ -0,0 +1,2 @@
+Copyright (c) 2019, Laminas Foundation.
+All rights reserved. (https://getlaminas.org/)
diff --git a/LICENSE.txt b/LICENSE.md
similarity index 54%
rename from LICENSE.txt
rename to LICENSE.md
index 6eab5aa1..09f53edc 100644
--- a/LICENSE.txt
+++ b/LICENSE.md
@@ -1,19 +1,19 @@
-Copyright (c) 2005-2015, Zend Technologies USA, Inc.
+Copyright (c) 2019, Laminas Foundation
 All rights reserved.
 
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
 
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
+- Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
 
-    * Redistributions in binary form must reproduce the above copyright notice,
-      this list of conditions and the following disclaimer in the documentation
-      and/or other materials provided with the distribution.
+- Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
 
-    * Neither the name of Zend Technologies USA, Inc. nor the names of its
-      contributors may be used to endorse or promote products derived from this
-      software without specific prior written permission.
+- Neither the name of Laminas Foundation nor the names of its contributors may
+  be used to endorse or promote products derived from this software without
+  specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
diff --git a/README.md b/README.md
index 7c8a5f17..e4b9047d 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
-# zend-servicemanager
+# laminas-servicemanager
 
-The Service Locator design pattern is implemented by the `Zend\ServiceManager`
+The Service Locator design pattern is implemented by the `Laminas\ServiceManager`
 component. The Service Locator is a service/object locator, tasked with
 retrieving other objects.
 
 
-- File issues at https://github.com/zendframework/zend-servicemanager/issues
-- Documentation is at http://framework.zend.com/manual/current/en/index.html#zend-servicemanager
+- File issues at https://github.com/laminas/laminas-servicemanager/issues
+- Documentation is at https://docs.laminas.dev/laminas-servicemanager
diff --git a/composer.json b/composer.json
index 7348b0d8..c16e548c 100644
--- a/composer.json
+++ b/composer.json
@@ -1,21 +1,22 @@
 {
-    "name": "zendframework/zend-servicemanager",
+    "name": "laminas/laminas-servicemanager",
     "description": " ",
     "license": "BSD-3-Clause",
     "keywords": [
-        "zf2",
+        "laminas",
         "servicemanager"
     ],
-    "autoload": {
-        "psr-4": {
-            "Zend\\ServiceManager\\": "src/"
-        }
-    },
-    "require": {
-        "php": ">=5.3.3"
+    "homepage": "https://laminas.dev",
+    "support": {
+        "docs": "https://docs.laminas.dev/laminas-servicemanager/",
+        "issues": "https://github.com/laminas/laminas-servicemanager/issues",
+        "source": "https://github.com/laminas/laminas-servicemanager",
+        "rss": "https://github.com/laminas/laminas-servicemanager/releases.atom",
+        "chat": "https://laminas.dev/chat",
+        "forum": "https://discourse.laminas.dev"
     },
-    "suggest": {
-        "zendframework/zend-di": "Zend\\Di component"
+    "config": {
+        "sort-packages": true
     },
     "extra": {
         "branch-alias": {
@@ -23,15 +24,29 @@
             "dev-develop": "2.3-dev"
         }
     },
-    "homepage": "https://github.com/zendframework/zend-service-manager",
+    "require": {
+        "php": ">=5.3.3",
+        "laminas/laminas-zendframework-bridge": "^1.0"
+    },
+    "require-dev": {
+        "fabpot/php-cs-fixer": "1.7.*",
+        "phpunit/phpunit": "~4.0",
+        "satooshi/php-coveralls": "dev-master"
+    },
+    "suggest": {
+        "laminas/laminas-di": "Laminas\\Di component"
+    },
+    "autoload": {
+        "psr-4": {
+            "Laminas\\ServiceManager\\": "src/"
+        }
+    },
     "autoload-dev": {
         "psr-4": {
-            "ZendTest\\ServiceManager\\": "test/"
+            "LaminasTest\\ServiceManager\\": "test/"
         }
     },
-    "require-dev": {
-        "fabpot/php-cs-fixer": "1.7.*",
-        "satooshi/php-coveralls": "dev-master",
-        "phpunit/PHPUnit": "~4.0"
+    "replace": {
+        "zendframework/zend-servicemanager": "self.version"
     }
-}
\ No newline at end of file
+}
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 31e7b179..81c29e2c 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -4,7 +4,7 @@
          bootstrap="./test/bootstrap.php"
          colors="true">
     <testsuites>
-        <testsuite name="zend-servicemanager Test Suite">
+        <testsuite name="laminas-servicemanager Test Suite">
             <directory>./test/</directory>
         </testsuite>
     </testsuites>
@@ -26,9 +26,9 @@
 
         <!-- OB_ENABLED should be enabled for some tests to check if all
              functionality works as expected. Such tests include those for
-             Zend\Soap and Zend\Session, which require that headers not be sent
+             Laminas\Soap and Laminas\Session, which require that headers not be sent
              in order to work. -->
-        <const name="TESTS_ZEND_OB_ENABLED" value="false" />
+        <const name="TESTS_LAMINAS_OB_ENABLED" value="false" />
 
     </php>
 </phpunit>
diff --git a/phpunit.xml.travis b/phpunit.xml.travis
index 31e7b179..81c29e2c 100644
--- a/phpunit.xml.travis
+++ b/phpunit.xml.travis
@@ -4,7 +4,7 @@
          bootstrap="./test/bootstrap.php"
          colors="true">
     <testsuites>
-        <testsuite name="zend-servicemanager Test Suite">
+        <testsuite name="laminas-servicemanager Test Suite">
             <directory>./test/</directory>
         </testsuite>
     </testsuites>
@@ -26,9 +26,9 @@
 
         <!-- OB_ENABLED should be enabled for some tests to check if all
              functionality works as expected. Such tests include those for
-             Zend\Soap and Zend\Session, which require that headers not be sent
+             Laminas\Soap and Laminas\Session, which require that headers not be sent
              in order to work. -->
-        <const name="TESTS_ZEND_OB_ENABLED" value="false" />
+        <const name="TESTS_LAMINAS_OB_ENABLED" value="false" />
 
     </php>
 </phpunit>
diff --git a/src/AbstractFactoryInterface.php b/src/AbstractFactoryInterface.php
index 64ab7598..a41feaa8 100644
--- a/src/AbstractFactoryInterface.php
+++ b/src/AbstractFactoryInterface.php
@@ -1,13 +1,12 @@
 <?php
+
 /**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @see       https://github.com/laminas/laminas-servicemanager for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-servicemanager/blob/master/COPYRIGHT.md
+ * @license   https://github.com/laminas/laminas-servicemanager/blob/master/LICENSE.md New BSD License
  */
 
-namespace Zend\ServiceManager;
+namespace Laminas\ServiceManager;
 
 interface AbstractFactoryInterface
 {
diff --git a/src/AbstractPluginManager.php b/src/AbstractPluginManager.php
index 3fb7f8df..69c601fd 100644
--- a/src/AbstractPluginManager.php
+++ b/src/AbstractPluginManager.php
@@ -1,13 +1,12 @@
 <?php
+
 /**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @see       https://github.com/laminas/laminas-servicemanager for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-servicemanager/blob/master/COPYRIGHT.md
+ * @license   https://github.com/laminas/laminas-servicemanager/blob/master/LICENSE.md New BSD License
  */
 
-namespace Zend\ServiceManager;
+namespace Laminas\ServiceManager;
 
 /**
  * ServiceManager implementation for managing plugins
diff --git a/src/Config.php b/src/Config.php
index f0a3e3ee..88c0fbad 100644
--- a/src/Config.php
+++ b/src/Config.php
@@ -1,13 +1,12 @@
 <?php
+
 /**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @see       https://github.com/laminas/laminas-servicemanager for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-servicemanager/blob/master/COPYRIGHT.md
+ * @license   https://github.com/laminas/laminas-servicemanager/blob/master/LICENSE.md New BSD License
  */
 
-namespace Zend\ServiceManager;
+namespace Laminas\ServiceManager;
 
 class Config implements ConfigInterface
 {
diff --git a/src/ConfigInterface.php b/src/ConfigInterface.php
index 68e7d275..f5289e19 100644
--- a/src/ConfigInterface.php
+++ b/src/ConfigInterface.php
@@ -1,13 +1,12 @@
 <?php
+
 /**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @see       https://github.com/laminas/laminas-servicemanager for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-servicemanager/blob/master/COPYRIGHT.md
+ * @license   https://github.com/laminas/laminas-servicemanager/blob/master/LICENSE.md New BSD License
  */
 
-namespace Zend\ServiceManager;
+namespace Laminas\ServiceManager;
 
 interface ConfigInterface
 {
diff --git a/src/DelegatorFactoryInterface.php b/src/DelegatorFactoryInterface.php
index 4180a94d..03c6468a 100644
--- a/src/DelegatorFactoryInterface.php
+++ b/src/DelegatorFactoryInterface.php
@@ -1,13 +1,12 @@
 <?php
+
 /**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @see       https://github.com/laminas/laminas-servicemanager for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-servicemanager/blob/master/COPYRIGHT.md
+ * @license   https://github.com/laminas/laminas-servicemanager/blob/master/LICENSE.md New BSD License
  */
 
-namespace Zend\ServiceManager;
+namespace Laminas\ServiceManager;
 
 /**
  * Interface for factories that can create delegates for services
diff --git a/src/Di/DiAbstractServiceFactory.php b/src/Di/DiAbstractServiceFactory.php
index 71bf7670..1fdae05d 100644
--- a/src/Di/DiAbstractServiceFactory.php
+++ b/src/Di/DiAbstractServiceFactory.php
@@ -1,25 +1,24 @@
 <?php
+
 /**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @see       https://github.com/laminas/laminas-servicemanager for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-servicemanager/blob/master/COPYRIGHT.md
+ * @license   https://github.com/laminas/laminas-servicemanager/blob/master/LICENSE.md New BSD License
  */
 
-namespace Zend\ServiceManager\Di;
+namespace Laminas\ServiceManager\Di;
 
-use Zend\Di\Di;
-use Zend\ServiceManager\AbstractFactoryInterface;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Laminas\Di\Di;
+use Laminas\ServiceManager\AbstractFactoryInterface;
+use Laminas\ServiceManager\ServiceLocatorInterface;
 
 class DiAbstractServiceFactory extends DiServiceFactory implements AbstractFactoryInterface
 {
     /**
      * Constructor
      *
-     * @param \Zend\Di\Di $di
-     * @param null|string|\Zend\Di\InstanceManager $useServiceLocator
+     * @param \Laminas\Di\Di $di
+     * @param null|string|\Laminas\Di\InstanceManager $useServiceLocator
      */
     public function __construct(Di $di, $useServiceLocator = self::USE_SL_NONE)
     {
diff --git a/src/Di/DiInstanceManagerProxy.php b/src/Di/DiInstanceManagerProxy.php
index 4f1cdb1e..4b55448b 100644
--- a/src/Di/DiInstanceManagerProxy.php
+++ b/src/Di/DiInstanceManagerProxy.php
@@ -1,16 +1,15 @@
 <?php
+
 /**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @see       https://github.com/laminas/laminas-servicemanager for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-servicemanager/blob/master/COPYRIGHT.md
+ * @license   https://github.com/laminas/laminas-servicemanager/blob/master/LICENSE.md New BSD License
  */
 
-namespace Zend\ServiceManager\Di;
+namespace Laminas\ServiceManager\Di;
 
-use Zend\Di\InstanceManager as DiInstanceManager;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Laminas\Di\InstanceManager as DiInstanceManager;
+use Laminas\ServiceManager\ServiceLocatorInterface;
 
 class DiInstanceManagerProxy extends DiInstanceManager
 {
diff --git a/src/Di/DiServiceFactory.php b/src/Di/DiServiceFactory.php
index 0139f1ce..34bba218 100644
--- a/src/Di/DiServiceFactory.php
+++ b/src/Di/DiServiceFactory.php
@@ -1,19 +1,18 @@
 <?php
+
 /**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @see       https://github.com/laminas/laminas-servicemanager for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-servicemanager/blob/master/COPYRIGHT.md
+ * @license   https://github.com/laminas/laminas-servicemanager/blob/master/LICENSE.md New BSD License
  */
 
-namespace Zend\ServiceManager\Di;
+namespace Laminas\ServiceManager\Di;
 
-use Zend\Di\Di;
-use Zend\Di\Exception\ClassNotFoundException as DiClassNotFoundException;
-use Zend\ServiceManager\Exception;
-use Zend\ServiceManager\FactoryInterface;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Laminas\Di\Di;
+use Laminas\Di\Exception\ClassNotFoundException as DiClassNotFoundException;
+use Laminas\ServiceManager\Exception;
+use Laminas\ServiceManager\FactoryInterface;
+use Laminas\ServiceManager\ServiceLocatorInterface;
 
 class DiServiceFactory extends Di implements FactoryInterface
 {
@@ -26,12 +25,12 @@ class DiServiceFactory extends Di implements FactoryInterface
     /**@#-*/
 
     /**
-     * @var \Zend\Di\Di
+     * @var \Laminas\Di\Di
      */
     protected $di = null;
 
     /**
-     * @var \Zend\Di\InstanceManager
+     * @var \Laminas\Di\InstanceManager
      */
     protected $name = null;
 
@@ -53,8 +52,8 @@ class DiServiceFactory extends Di implements FactoryInterface
     /**
      * Constructor
      *
-     * @param \Zend\Di\Di $di
-     * @param null|\Zend\Di\InstanceManager $name
+     * @param \Laminas\Di\Di $di
+     * @param null|\Laminas\Di\InstanceManager $name
      * @param array $parameters
      * @param string $useServiceLocator
      */
diff --git a/src/Di/DiServiceInitializer.php b/src/Di/DiServiceInitializer.php
index f3c0627c..6a4e2ad5 100644
--- a/src/Di/DiServiceInitializer.php
+++ b/src/Di/DiServiceInitializer.php
@@ -1,18 +1,17 @@
 <?php
+
 /**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @see       https://github.com/laminas/laminas-servicemanager for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-servicemanager/blob/master/COPYRIGHT.md
+ * @license   https://github.com/laminas/laminas-servicemanager/blob/master/LICENSE.md New BSD License
  */
 
-namespace Zend\ServiceManager\Di;
+namespace Laminas\ServiceManager\Di;
 
-use Zend\Di\Di;
-use Zend\ServiceManager\Exception;
-use Zend\ServiceManager\InitializerInterface;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Laminas\Di\Di;
+use Laminas\ServiceManager\Exception;
+use Laminas\ServiceManager\InitializerInterface;
+use Laminas\ServiceManager\ServiceLocatorInterface;
 
 class DiServiceInitializer extends Di implements InitializerInterface
 {
@@ -34,8 +33,8 @@ class DiServiceInitializer extends Di implements InitializerInterface
     /**
      * Constructor
      *
-     * @param \Zend\Di\Di $di
-     * @param \Zend\ServiceManager\ServiceLocatorInterface $serviceLocator
+     * @param \Laminas\Di\Di $di
+     * @param \Laminas\ServiceManager\ServiceLocatorInterface $serviceLocator
      * @param null|DiInstanceManagerProxy $diImProxy
      */
     public function __construct(Di $di, ServiceLocatorInterface $serviceLocator, DiInstanceManagerProxy $diImProxy = null)
diff --git a/src/Exception/CircularDependencyFoundException.php b/src/Exception/CircularDependencyFoundException.php
index fa6d1f10..91e89cf7 100644
--- a/src/Exception/CircularDependencyFoundException.php
+++ b/src/Exception/CircularDependencyFoundException.php
@@ -1,13 +1,12 @@
 <?php
+
 /**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @see       https://github.com/laminas/laminas-servicemanager for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-servicemanager/blob/master/COPYRIGHT.md
+ * @license   https://github.com/laminas/laminas-servicemanager/blob/master/LICENSE.md New BSD License
  */
 
-namespace Zend\ServiceManager\Exception;
+namespace Laminas\ServiceManager\Exception;
 
 class CircularDependencyFoundException extends RuntimeException
 {
diff --git a/src/Exception/ExceptionInterface.php b/src/Exception/ExceptionInterface.php
index 8c9869db..c3f61783 100644
--- a/src/Exception/ExceptionInterface.php
+++ b/src/Exception/ExceptionInterface.php
@@ -1,13 +1,12 @@
 <?php
+
 /**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @see       https://github.com/laminas/laminas-servicemanager for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-servicemanager/blob/master/COPYRIGHT.md
+ * @license   https://github.com/laminas/laminas-servicemanager/blob/master/LICENSE.md New BSD License
  */
 
-namespace Zend\ServiceManager\Exception;
+namespace Laminas\ServiceManager\Exception;
 
 interface ExceptionInterface
 {
diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
index 64f59ed4..d0eac09a 100644
--- a/src/Exception/InvalidArgumentException.php
+++ b/src/Exception/InvalidArgumentException.php
@@ -1,13 +1,12 @@
 <?php
+
 /**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @see       https://github.com/laminas/laminas-servicemanager for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-servicemanager/blob/master/COPYRIGHT.md
+ * @license   https://github.com/laminas/laminas-servicemanager/blob/master/LICENSE.md New BSD License
  */
 
-namespace Zend\ServiceManager\Exception;
+namespace Laminas\ServiceManager\Exception;
 
 class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
 {
diff --git a/src/Exception/InvalidServiceNameException.php b/src/Exception/InvalidServiceNameException.php
index 6e44f9c9..c8411460 100644
--- a/src/Exception/InvalidServiceNameException.php
+++ b/src/Exception/InvalidServiceNameException.php
@@ -1,13 +1,12 @@
 <?php
+
 /**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @see       https://github.com/laminas/laminas-servicemanager for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-servicemanager/blob/master/COPYRIGHT.md
+ * @license   https://github.com/laminas/laminas-servicemanager/blob/master/LICENSE.md New BSD License
  */
 
-namespace Zend\ServiceManager\Exception;
+namespace Laminas\ServiceManager\Exception;
 
 class InvalidServiceNameException extends RuntimeException
 {
diff --git a/src/Exception/RuntimeException.php b/src/Exception/RuntimeException.php
index 822a895b..72e6f8a1 100644
--- a/src/Exception/RuntimeException.php
+++ b/src/Exception/RuntimeException.php
@@ -1,13 +1,12 @@
 <?php
+
 /**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @see       https://github.com/laminas/laminas-servicemanager for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-servicemanager/blob/master/COPYRIGHT.md
+ * @license   https://github.com/laminas/laminas-servicemanager/blob/master/LICENSE.md New BSD License
  */
 
-namespace Zend\ServiceManager\Exception;
+namespace Laminas\ServiceManager\Exception;
 
 class RuntimeException extends \RuntimeException implements ExceptionInterface
 {
diff --git a/src/Exception/ServiceNotCreatedException.php b/src/Exception/ServiceNotCreatedException.php
index 4226e75b..49360d7d 100644
--- a/src/Exception/ServiceNotCreatedException.php
+++ b/src/Exception/ServiceNotCreatedException.php
@@ -1,13 +1,12 @@
 <?php
+
 /**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @see       https://github.com/laminas/laminas-servicemanager for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-servicemanager/blob/master/COPYRIGHT.md
+ * @license   https://github.com/laminas/laminas-servicemanager/blob/master/LICENSE.md New BSD License
  */
 
-namespace Zend\ServiceManager\Exception;
+namespace Laminas\ServiceManager\Exception;
 
 class ServiceNotCreatedException extends RuntimeException
 {
diff --git a/src/Exception/ServiceNotFoundException.php b/src/Exception/ServiceNotFoundException.php
index 877aa629..47748a34 100644
--- a/src/Exception/ServiceNotFoundException.php
+++ b/src/Exception/ServiceNotFoundException.php
@@ -1,13 +1,12 @@
 <?php
+
 /**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @see       https://github.com/laminas/laminas-servicemanager for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-servicemanager/blob/master/COPYRIGHT.md
+ * @license   https://github.com/laminas/laminas-servicemanager/blob/master/LICENSE.md New BSD License
  */
 
-namespace Zend\ServiceManager\Exception;
+namespace Laminas\ServiceManager\Exception;
 
 class ServiceNotFoundException extends InvalidArgumentException
 {
diff --git a/src/FactoryInterface.php b/src/FactoryInterface.php
index 6b681225..6c87b08d 100644
--- a/src/FactoryInterface.php
+++ b/src/FactoryInterface.php
@@ -1,13 +1,12 @@
 <?php
+
 /**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @see       https://github.com/laminas/laminas-servicemanager for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-servicemanager/blob/master/COPYRIGHT.md
+ * @license   https://github.com/laminas/laminas-servicemanager/blob/master/LICENSE.md New BSD License
  */
 
-namespace Zend\ServiceManager;
+namespace Laminas\ServiceManager;
 
 interface FactoryInterface
 {
diff --git a/src/InitializerInterface.php b/src/InitializerInterface.php
index 0db23f34..521235a7 100644
--- a/src/InitializerInterface.php
+++ b/src/InitializerInterface.php
@@ -1,15 +1,14 @@
 <?php
+
 /**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @see       https://github.com/laminas/laminas-servicemanager for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-servicemanager/blob/master/COPYRIGHT.md
+ * @license   https://github.com/laminas/laminas-servicemanager/blob/master/LICENSE.md New BSD License
  */
 
-namespace Zend\ServiceManager;
+namespace Laminas\ServiceManager;
 
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Laminas\ServiceManager\ServiceLocatorInterface;
 
 interface InitializerInterface
 {
diff --git a/src/MutableCreationOptionsInterface.php b/src/MutableCreationOptionsInterface.php
index fe91532b..9243a35d 100644
--- a/src/MutableCreationOptionsInterface.php
+++ b/src/MutableCreationOptionsInterface.php
@@ -1,13 +1,12 @@
 <?php
+
 /**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @see       https://github.com/laminas/laminas-servicemanager for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-servicemanager/blob/master/COPYRIGHT.md
+ * @license   https://github.com/laminas/laminas-servicemanager/blob/master/LICENSE.md New BSD License
  */
 
-namespace Zend\ServiceManager;
+namespace Laminas\ServiceManager;
 
 interface MutableCreationOptionsInterface
 {
diff --git a/src/Proxy/LazyServiceFactory.php b/src/Proxy/LazyServiceFactory.php
index eb033680..aa76b943 100644
--- a/src/Proxy/LazyServiceFactory.php
+++ b/src/Proxy/LazyServiceFactory.php
@@ -1,20 +1,18 @@
 <?php
+
 /**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @see       https://github.com/laminas/laminas-servicemanager for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-servicemanager/blob/master/COPYRIGHT.md
+ * @license   https://github.com/laminas/laminas-servicemanager/blob/master/LICENSE.md New BSD License
  */
 
-namespace Zend\ServiceManager\Proxy;
+namespace Laminas\ServiceManager\Proxy;
 
+use Laminas\ServiceManager\DelegatorFactoryInterface;
+use Laminas\ServiceManager\Exception;
+use Laminas\ServiceManager\ServiceLocatorInterface;
 use ProxyManager\Factory\LazyLoadingValueHolderFactory;
-
 use ProxyManager\Proxy\LazyLoadingInterface;
-use Zend\ServiceManager\DelegatorFactoryInterface;
-use Zend\ServiceManager\Exception;
-use Zend\ServiceManager\ServiceLocatorInterface;
 
 /**
  * Delegator factory responsible of instantiating lazy loading value holder proxies of
diff --git a/src/Proxy/LazyServiceFactoryFactory.php b/src/Proxy/LazyServiceFactoryFactory.php
index 6861d6e9..be98f958 100644
--- a/src/Proxy/LazyServiceFactoryFactory.php
+++ b/src/Proxy/LazyServiceFactoryFactory.php
@@ -1,23 +1,22 @@
 <?php
+
 /**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @see       https://github.com/laminas/laminas-servicemanager for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-servicemanager/blob/master/COPYRIGHT.md
+ * @license   https://github.com/laminas/laminas-servicemanager/blob/master/LICENSE.md New BSD License
  */
 
-namespace Zend\ServiceManager\Proxy;
+namespace Laminas\ServiceManager\Proxy;
 
+use Laminas\ServiceManager\Exception;
+use Laminas\ServiceManager\FactoryInterface;
+use Laminas\ServiceManager\ServiceLocatorInterface;
 use ProxyManager\Configuration;
 use ProxyManager\Factory\LazyLoadingValueHolderFactory;
 use ProxyManager\GeneratorStrategy\EvaluatingGeneratorStrategy;
-use Zend\ServiceManager\FactoryInterface;
-use Zend\ServiceManager\ServiceLocatorInterface;
-use Zend\ServiceManager\Exception;
 
 /**
- * Service factory responsible of instantiating {@see \Zend\ServiceManager\Proxy\LazyServiceFactory}
+ * Service factory responsible of instantiating {@see \Laminas\ServiceManager\Proxy\LazyServiceFactory}
  * and configuring it starting from application configuration
  */
 class LazyServiceFactoryFactory implements FactoryInterface
@@ -25,7 +24,7 @@ class LazyServiceFactoryFactory implements FactoryInterface
     /**
      * {@inheritDoc}
      *
-     * @return \Zend\ServiceManager\Proxy\LazyServiceFactory
+     * @return \Laminas\ServiceManager\Proxy\LazyServiceFactory
      */
     public function createService(ServiceLocatorInterface $serviceLocator)
     {
diff --git a/src/ServiceLocatorAwareInterface.php b/src/ServiceLocatorAwareInterface.php
index cd666803..d896325d 100644
--- a/src/ServiceLocatorAwareInterface.php
+++ b/src/ServiceLocatorAwareInterface.php
@@ -1,13 +1,12 @@
 <?php
+
 /**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @see       https://github.com/laminas/laminas-servicemanager for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-servicemanager/blob/master/COPYRIGHT.md
+ * @license   https://github.com/laminas/laminas-servicemanager/blob/master/LICENSE.md New BSD License
  */
 
-namespace Zend\ServiceManager;
+namespace Laminas\ServiceManager;
 
 interface ServiceLocatorAwareInterface
 {
diff --git a/src/ServiceLocatorAwareTrait.php b/src/ServiceLocatorAwareTrait.php
index fdc155ab..8a240bdd 100644
--- a/src/ServiceLocatorAwareTrait.php
+++ b/src/ServiceLocatorAwareTrait.php
@@ -1,15 +1,14 @@
 <?php
+
 /**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @see       https://github.com/laminas/laminas-servicemanager for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-servicemanager/blob/master/COPYRIGHT.md
+ * @license   https://github.com/laminas/laminas-servicemanager/blob/master/LICENSE.md New BSD License
  */
 
-namespace Zend\ServiceManager;
+namespace Laminas\ServiceManager;
 
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Laminas\ServiceManager\ServiceLocatorInterface;
 
 trait ServiceLocatorAwareTrait
 {
diff --git a/src/ServiceLocatorInterface.php b/src/ServiceLocatorInterface.php
index 46064c84..ebe2ef2e 100644
--- a/src/ServiceLocatorInterface.php
+++ b/src/ServiceLocatorInterface.php
@@ -1,13 +1,12 @@
 <?php
+
 /**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @see       https://github.com/laminas/laminas-servicemanager for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-servicemanager/blob/master/COPYRIGHT.md
+ * @license   https://github.com/laminas/laminas-servicemanager/blob/master/LICENSE.md New BSD License
  */
 
-namespace Zend\ServiceManager;
+namespace Laminas\ServiceManager;
 
 /**
  * Service locator interface
diff --git a/src/ServiceManager.php b/src/ServiceManager.php
index f284698a..5a704d66 100644
--- a/src/ServiceManager.php
+++ b/src/ServiceManager.php
@@ -1,13 +1,12 @@
 <?php
+
 /**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @see       https://github.com/laminas/laminas-servicemanager for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-servicemanager/blob/master/COPYRIGHT.md
+ * @license   https://github.com/laminas/laminas-servicemanager/blob/master/LICENSE.md New BSD License
  */
 
-namespace Zend\ServiceManager;
+namespace Laminas\ServiceManager;
 
 use ReflectionClass;
 
@@ -632,7 +631,7 @@ public function doCreate($rName, $cName)
      * @param  bool         $checkAbstractFactories
      * @return bool
      *
-     * @deprecated this method is being deprecated as of zendframework 2.2, and may be removed in future major versions
+     * @deprecated this method is being deprecated as of laminas 2.2, and may be removed in future major versions
      */
     public function canCreate($name, $checkAbstractFactories = true)
     {
@@ -1056,7 +1055,7 @@ protected function createFromAbstractFactory($canonicalName, $requestedName)
      * @param string $type
      * @return bool
      *
-     * @deprecated this method is being deprecated as of zendframework 2.2, and may be removed in future major versions
+     * @deprecated this method is being deprecated as of laminas 2.2, and may be removed in future major versions
      */
     protected static function isSubclassOf($className, $type)
     {
diff --git a/src/ServiceManagerAwareInterface.php b/src/ServiceManagerAwareInterface.php
index 4f6a0cc9..b64640ff 100644
--- a/src/ServiceManagerAwareInterface.php
+++ b/src/ServiceManagerAwareInterface.php
@@ -1,13 +1,12 @@
 <?php
+
 /**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @see       https://github.com/laminas/laminas-servicemanager for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-servicemanager/blob/master/COPYRIGHT.md
+ * @license   https://github.com/laminas/laminas-servicemanager/blob/master/LICENSE.md New BSD License
  */
 
-namespace Zend\ServiceManager;
+namespace Laminas\ServiceManager;
 
 interface ServiceManagerAwareInterface
 {
diff --git a/test/AbstractPluginManagerTest.php b/test/AbstractPluginManagerTest.php
index 6d151221..5b71f7e1 100644
--- a/test/AbstractPluginManagerTest.php
+++ b/test/AbstractPluginManagerTest.php
@@ -1,23 +1,20 @@
 <?php
+
 /**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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_ServiceManager
+ * @see       https://github.com/laminas/laminas-servicemanager for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-servicemanager/blob/master/COPYRIGHT.md
+ * @license   https://github.com/laminas/laminas-servicemanager/blob/master/LICENSE.md New BSD License
  */
 
-namespace ZendTest\ServiceManager;
+namespace LaminasTest\ServiceManager;
 
+use Laminas\ServiceManager\Config;
+use Laminas\ServiceManager\Exception;
+use Laminas\ServiceManager\ServiceManager;
+use LaminasTest\ServiceManager\TestAsset\FooCounterAbstractFactory;
+use LaminasTest\ServiceManager\TestAsset\FooPluginManager;
 use ReflectionClass;
 use ReflectionObject;
-use Zend\ServiceManager\Exception;
-use Zend\ServiceManager\ServiceManager;
-use Zend\ServiceManager\Config;
-
-use ZendTest\ServiceManager\TestAsset\FooCounterAbstractFactory;
-use ZendTest\ServiceManager\TestAsset\FooPluginManager;
 
 class AbstractPluginManagerTest extends \PHPUnit_Framework_TestCase
 {
@@ -32,7 +29,7 @@ public function setup()
         $this->serviceManager = new ServiceManager;
         $this->pluginManager = new FooPluginManager(new Config(array(
             'factories' => array(
-                'Foo' => 'ZendTest\ServiceManager\TestAsset\FooFactory',
+                'Foo' => 'LaminasTest\ServiceManager\TestAsset\FooFactory',
             ),
             'shared' => array(
                 'Foo' => false,
@@ -44,7 +41,7 @@ public function testSetMultipleCreationOptions()
     {
         $pluginManager = new FooPluginManager(new Config(array(
             'factories' => array(
-                'Foo' => 'ZendTest\ServiceManager\TestAsset\FooFactory'
+                'Foo' => 'LaminasTest\ServiceManager\TestAsset\FooFactory'
             ),
             'shared' => array(
                 'Foo' => false
@@ -61,20 +58,20 @@ public function testSetMultipleCreationOptions()
         $pluginManager->get('Foo', array('key1' => 'value1'));
 
         $value = $reflProperty->getValue($pluginManager);
-        $this->assertInstanceOf('ZendTest\ServiceManager\TestAsset\FooFactory', $value['foo']);
+        $this->assertInstanceOf('LaminasTest\ServiceManager\TestAsset\FooFactory', $value['foo']);
         $this->assertEquals(array('key1' => 'value1'), $value['foo']->getCreationOptions());
 
         $pluginManager->get('Foo', array('key2' => 'value2'));
 
         $value = $reflProperty->getValue($pluginManager);
-        $this->assertInstanceOf('ZendTest\ServiceManager\TestAsset\FooFactory', $value['foo']);
+        $this->assertInstanceOf('LaminasTest\ServiceManager\TestAsset\FooFactory', $value['foo']);
         $this->assertEquals(array('key2' => 'value2'), $value['foo']->getCreationOptions());
     }
 
     public function testAbstractFactoryWithMutableCreationOptions()
     {
         $creationOptions = array('key1' => 'value1');
-        $mock = 'ZendTest\ServiceManager\TestAsset\AbstractFactoryWithMutableCreationOptions';
+        $mock = 'LaminasTest\ServiceManager\TestAsset\AbstractFactoryWithMutableCreationOptions';
         $abstractFactory = $this->getMock($mock, array('setCreationOptions'));
         $abstractFactory->expects($this->once())
             ->method('setCreationOptions')
@@ -87,7 +84,7 @@ public function testAbstractFactoryWithMutableCreationOptions()
 
     public function testMutableMethodNeverCalledWithoutCreationOptions()
     {
-        $mock = 'ZendTest\ServiceManager\TestAsset\CallableWithMutableCreationOptions';
+        $mock = 'LaminasTest\ServiceManager\TestAsset\CallableWithMutableCreationOptions';
         $callable = $this->getMock($mock, array('setCreationOptions'));
         $callable->expects($this->never())
             ->method('setCreationOptions');
@@ -102,7 +99,7 @@ public function testMutableMethodNeverCalledWithoutCreationOptions()
     public function testCallableObjectWithMutableCreationOptions()
     {
         $creationOptions = array('key1' => 'value1');
-        $mock = 'ZendTest\ServiceManager\TestAsset\CallableWithMutableCreationOptions';
+        $mock = 'LaminasTest\ServiceManager\TestAsset\CallableWithMutableCreationOptions';
         $callable = $this->getMock($mock, array('setCreationOptions'));
         $callable->expects($this->once())
             ->method('setCreationOptions')
diff --git a/test/Di/DiAbstractServiceFactoryTest.php b/test/Di/DiAbstractServiceFactoryTest.php
index c73ba4f8..0ea9fdcb 100644
--- a/test/Di/DiAbstractServiceFactoryTest.php
+++ b/test/Di/DiAbstractServiceFactoryTest.php
@@ -1,19 +1,18 @@
 <?php
+
 /**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @see       https://github.com/laminas/laminas-servicemanager for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-servicemanager/blob/master/COPYRIGHT.md
+ * @license   https://github.com/laminas/laminas-servicemanager/blob/master/LICENSE.md New BSD License
  */
 
-namespace ZendTest\ServiceManager\Di;
+namespace LaminasTest\ServiceManager\Di;
 
-use Zend\ServiceManager\Di\DiAbstractServiceFactory;
-use Zend\ServiceManager\ServiceManager;
+use Laminas\ServiceManager\Di\DiAbstractServiceFactory;
+use Laminas\ServiceManager\ServiceManager;
 
 /**
- * @group Zend_ServiceManager
+ * @group Laminas_ServiceManager
  */
 class DiAbstractServiceFactoryTest extends \PHPUnit_Framework_TestCase
 {
@@ -34,10 +33,10 @@ class DiAbstractServiceFactoryTest extends \PHPUnit_Framework_TestCase
 
     public function setup()
     {
-        $instanceManager = new \Zend\Di\InstanceManager();
+        $instanceManager = new \Laminas\Di\InstanceManager();
         $instanceManager->addSharedInstance($this->fooInstance = new \stdClass(), 'foo');
-        $this->mockDi = $this->getMock('Zend\Di\Di', array(), array(null, $instanceManager));
-        $this->mockServiceLocator = $this->getMock('Zend\ServiceManager\ServiceLocatorInterface');
+        $this->mockDi = $this->getMock('Laminas\Di\Di', array(), array(null, $instanceManager));
+        $this->mockServiceLocator = $this->getMock('Laminas\ServiceManager\ServiceLocatorInterface');
         $this->diAbstractServiceFactory = new DiAbstractServiceFactory(
             $this->mockDi
         );
@@ -45,19 +44,19 @@ public function setup()
 
 
     /**
-     * @covers Zend\ServiceManager\Di\DiAbstractServiceFactory::__construct
+     * @covers Laminas\ServiceManager\Di\DiAbstractServiceFactory::__construct
      */
     public function testConstructor()
     {
         $instance = new DiAbstractServiceFactory(
-            $this->getMock('Zend\Di\Di')
+            $this->getMock('Laminas\Di\Di')
         );
-        $this->assertInstanceOf('Zend\ServiceManager\Di\DiAbstractServiceFactory', $instance);
+        $this->assertInstanceOf('Laminas\ServiceManager\Di\DiAbstractServiceFactory', $instance);
     }
 
     /**
-     * @covers Zend\ServiceManager\Di\DiAbstractServiceFactory::createServiceWithName
-     * @covers Zend\ServiceManager\Di\DiAbstractServiceFactory::get
+     * @covers Laminas\ServiceManager\Di\DiAbstractServiceFactory::createServiceWithName
+     * @covers Laminas\ServiceManager\Di\DiAbstractServiceFactory::get
      */
     public function testCreateServiceWithName()
     {
@@ -66,11 +65,11 @@ public function testCreateServiceWithName()
     }
 
     /**
-     * @covers Zend\ServiceManager\Di\DiAbstractServiceFactory::canCreateServiceWithName
+     * @covers Laminas\ServiceManager\Di\DiAbstractServiceFactory::canCreateServiceWithName
      */
     public function testCanCreateServiceWithName()
     {
-        $instance = new DiAbstractServiceFactory($this->getMock('Zend\Di\Di'));
+        $instance = new DiAbstractServiceFactory($this->getMock('Laminas\Di\Di'));
         $im = $instance->instanceManager();
 
         $locator = new ServiceManager();
@@ -98,7 +97,7 @@ public function testCanCreateServiceWithName()
         // will check definitions
         $def = $instance->definitions();
         $this->assertFalse($instance->canCreateServiceWithName($locator, __NAMESPACE__ . '\Other\Non\Existing', __NAMESPACE__ . '\Other\Non\Existing'));
-        $classDefinition = $this->getMock('Zend\Di\Definition\DefinitionInterface');
+        $classDefinition = $this->getMock('Laminas\Di\Definition\DefinitionInterface');
         $classDefinition
             ->expects($this->any())
             ->method('hasClass')
diff --git a/test/Di/DiServiceFactoryTest.php b/test/Di/DiServiceFactoryTest.php
index 35597fb8..814f72e2 100644
--- a/test/Di/DiServiceFactoryTest.php
+++ b/test/Di/DiServiceFactoryTest.php
@@ -1,20 +1,19 @@
 <?php
+
 /**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @see       https://github.com/laminas/laminas-servicemanager for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-servicemanager/blob/master/COPYRIGHT.md
+ * @license   https://github.com/laminas/laminas-servicemanager/blob/master/LICENSE.md New BSD License
  */
 
-namespace ZendTest\ServiceManager\Di;
+namespace LaminasTest\ServiceManager\Di;
 
-use Zend\Di\Di;
-use Zend\ServiceManager\Di\DiServiceFactory;
-use Zend\ServiceManager\ServiceManager;
+use Laminas\Di\Di;
+use Laminas\ServiceManager\Di\DiServiceFactory;
+use Laminas\ServiceManager\ServiceManager;
 
 /**
- * @group Zend_ServiceManager
+ * @group Laminas_ServiceManager
  */
 class DiServiceFactoryTest extends \PHPUnit_Framework_TestCase
 {
@@ -35,14 +34,14 @@ class DiServiceFactoryTest extends \PHPUnit_Framework_TestCase
 
     public function setup()
     {
-        $instanceManager = new \Zend\Di\InstanceManager();
+        $instanceManager = new \Laminas\Di\InstanceManager();
         $instanceManager->addSharedInstanceWithParameters(
             $this->fooInstance = new \stdClass(),
             'foo',
             array('bar' => 'baz')
         );
-        $this->mockDi = $this->getMock('Zend\Di\Di', array(), array(null, $instanceManager));
-        $this->mockServiceLocator = $this->getMock('Zend\ServiceManager\ServiceLocatorInterface');
+        $this->mockDi = $this->getMock('Laminas\Di\Di', array(), array(null, $instanceManager));
+        $this->mockServiceLocator = $this->getMock('Laminas\ServiceManager\ServiceLocatorInterface');
         $this->diServiceFactory = new DiServiceFactory(
             $this->mockDi,
             'foo',
@@ -51,21 +50,21 @@ public function setup()
     }
 
     /**
-     * @covers Zend\ServiceManager\Di\DiServiceFactory::__construct
+     * @covers Laminas\ServiceManager\Di\DiServiceFactory::__construct
      */
     public function testConstructor()
     {
         $instance = new DiServiceFactory(
-            $this->getMock('Zend\Di\Di'),
+            $this->getMock('Laminas\Di\Di'),
             'string',
             array('foo' => 'bar')
         );
-        $this->assertInstanceOf('Zend\ServiceManager\Di\DiServiceFactory', $instance);
+        $this->assertInstanceOf('Laminas\ServiceManager\Di\DiServiceFactory', $instance);
     }
 
     /**
-     * @covers Zend\ServiceManager\Di\DiServiceFactory::createService
-     * @covers Zend\ServiceManager\Di\DiServiceFactory::get
+     * @covers Laminas\ServiceManager\Di\DiServiceFactory::createService
+     * @covers Laminas\ServiceManager\Di\DiServiceFactory::get
      */
     public function testCreateService()
     {
diff --git a/test/Di/DiServiceInitializerTest.php b/test/Di/DiServiceInitializerTest.php
index a72675e1..c84c998b 100644
--- a/test/Di/DiServiceInitializerTest.php
+++ b/test/Di/DiServiceInitializerTest.php
@@ -1,19 +1,18 @@
 <?php
+
 /**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @see       https://github.com/laminas/laminas-servicemanager for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-servicemanager/blob/master/COPYRIGHT.md
+ * @license   https://github.com/laminas/laminas-servicemanager/blob/master/LICENSE.md New BSD License
  */
 
-namespace ZendTest\ServiceManager\Di;
+namespace LaminasTest\ServiceManager\Di;
 
-use Zend\ServiceManager\Di\DiServiceInitializer;
-use Zend\ServiceManager\Di\DiInstanceManagerProxy;
+use Laminas\ServiceManager\Di\DiInstanceManagerProxy;
+use Laminas\ServiceManager\Di\DiServiceInitializer;
 
 /**
- * @group Zend_ServiceManager
+ * @group Laminas_ServiceManager
  */
 class DiServiceInitializerTest extends \PHPUnit_Framework_TestCase
 {
@@ -33,10 +32,10 @@ class DiServiceInitializerTest extends \PHPUnit_Framework_TestCase
 
     public function setup()
     {
-        $this->mockDi = $this->getMock('Zend\Di\Di', array('injectDependencies'));
-        $this->mockServiceLocator = $this->getMock('Zend\ServiceManager\ServiceLocatorInterface');
+        $this->mockDi = $this->getMock('Laminas\Di\Di', array('injectDependencies'));
+        $this->mockServiceLocator = $this->getMock('Laminas\ServiceManager\ServiceLocatorInterface');
         $this->mockDiInstanceManagerProxy = new DiInstanceManagerProxy(
-            $this->mockDiInstanceManager = $this->getMock('Zend\Di\InstanceManager'),
+            $this->mockDiInstanceManager = $this->getMock('Laminas\Di\InstanceManager'),
             $this->mockServiceLocator
         );
         $this->diServiceInitializer = new DiServiceInitializer(
@@ -48,7 +47,7 @@ public function setup()
     }
 
     /**
-     * @covers Zend\ServiceManager\Di\DiServiceInitializer::initialize
+     * @covers Laminas\ServiceManager\Di\DiServiceInitializer::initialize
      */
     public function testInitialize()
     {
@@ -61,12 +60,12 @@ public function testInitialize()
     }
 
     /**
-     * @covers Zend\ServiceManager\Di\DiServiceInitializer::initialize
+     * @covers Laminas\ServiceManager\Di\DiServiceInitializer::initialize
      * @todo this needs to be moved into its own class
      */
     public function testProxyInstanceManagersStayInSync()
     {
-        $instanceManager = new \Zend\Di\InstanceManager();
+        $instanceManager = new \Laminas\Di\InstanceManager();
         $proxy = new DiInstanceManagerProxy($instanceManager, $this->mockServiceLocator);
         $instanceManager->addAlias('foo', 'bar');
 
diff --git a/test/Proxy/LazyServiceFactoryFactoryTest.php b/test/Proxy/LazyServiceFactoryFactoryTest.php
index 8942f33e..b9884c89 100644
--- a/test/Proxy/LazyServiceFactoryFactoryTest.php
+++ b/test/Proxy/LazyServiceFactoryFactoryTest.php
@@ -1,22 +1,20 @@
 <?php
+
 /**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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_ServiceManager
+ * @see       https://github.com/laminas/laminas-servicemanager for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-servicemanager/blob/master/COPYRIGHT.md
+ * @license   https://github.com/laminas/laminas-servicemanager/blob/master/LICENSE.md New BSD License
  */
 
-namespace ZendTest\ServiceManager\Proxy;
+namespace LaminasTest\ServiceManager\Proxy;
 
-use Zend\ServiceManager\Proxy\LazyServiceFactoryFactory;
-use Zend\ServiceManager\ServiceManager;
+use Laminas\ServiceManager\Proxy\LazyServiceFactoryFactory;
+use Laminas\ServiceManager\ServiceManager;
 
 /**
- * Tests for {@see \Zend\ServiceManager\Proxy\LazyServiceFactoryFactory}
+ * Tests for {@see \Laminas\ServiceManager\Proxy\LazyServiceFactoryFactory}
  *
- * @covers \Zend\ServiceManager\Proxy\LazyServiceFactoryFactory
+ * @covers \Laminas\ServiceManager\Proxy\LazyServiceFactoryFactory
  */
 class LazyServiceFactoryFactoryTest extends \PHPUnit_Framework_TestCase
 {
@@ -35,11 +33,11 @@ public function setUp()
      */
     public function testInvalidConfiguration($config)
     {
-        $locator  = $this->getMock('Zend\\ServiceManager\\ServiceLocatorInterface');
+        $locator  = $this->getMock('Laminas\\ServiceManager\\ServiceLocatorInterface');
         $factory  = new LazyServiceFactoryFactory();
 
         $locator->expects($this->any())->method('get')->with('Config')->will($this->returnValue($config));
-        $this->setExpectedException('Zend\\ServiceManager\\Exception\\InvalidArgumentException');
+        $this->setExpectedException('Laminas\\ServiceManager\\Exception\\InvalidArgumentException');
 
         $factory->createService($locator);
     }
@@ -47,7 +45,7 @@ public function testInvalidConfiguration($config)
     public function testAutoGenerateProxyFiles()
     {
         $serviceManager = new ServiceManager();
-        $namespace      = 'ZendTestProxy' . uniqid();
+        $namespace      = 'LaminasTestProxy' . uniqid();
 
         $serviceManager->setService(
             'Config',
@@ -59,7 +57,7 @@ public function testAutoGenerateProxyFiles()
                  ),
             )
         );
-        $serviceManager->setFactory('foo-delegator', 'Zend\ServiceManager\Proxy\LazyServiceFactoryFactory');
+        $serviceManager->setFactory('foo-delegator', 'Laminas\ServiceManager\Proxy\LazyServiceFactoryFactory');
         $serviceManager->setInvokableClass('foo', __CLASS__);
         $serviceManager->addDelegator('foo', 'foo-delegator');
 
@@ -69,11 +67,11 @@ public function testAutoGenerateProxyFiles()
         $this->assertInstanceOf('ProxyManager\\Proxy\\LazyLoadingInterface', $proxy);
         $this->assertInstanceOf(__CLASS__, $proxy);
         $this->assertSame(
-            $namespace . '\__PM__\ZendTest\ServiceManager\Proxy\LazyServiceFactoryFactoryTest',
+            $namespace . '\__PM__\LaminasTest\ServiceManager\Proxy\LazyServiceFactoryFactoryTest',
             get_class($proxy)
         );
         $this->assertFileExists(
-            sys_get_temp_dir() . '/' . $namespace . '__PM__ZendTestServiceManagerProxyLazyServiceFactoryFactoryTest.php'
+            sys_get_temp_dir() . '/' . $namespace . '__PM__LaminasTestServiceManagerProxyLazyServiceFactoryFactoryTest.php'
         );
         $this->assertFalse($proxy->isProxyInitialized());
         $this->assertEquals($this->invalidConfigProvider(), $proxy->invalidConfigProvider());
@@ -83,7 +81,7 @@ public function testAutoGenerateProxyFiles()
     public function testAutoGenerateAndEvaluateProxies()
     {
         $serviceManager = new ServiceManager();
-        $namespace      = 'ZendTestProxy' . uniqid();
+        $namespace      = 'LaminasTestProxy' . uniqid();
 
         $serviceManager->setService(
             'Config',
@@ -94,7 +92,7 @@ public function testAutoGenerateAndEvaluateProxies()
                  ),
             )
         );
-        $serviceManager->setFactory('foo-delegator', 'Zend\ServiceManager\Proxy\LazyServiceFactoryFactory');
+        $serviceManager->setFactory('foo-delegator', 'Laminas\ServiceManager\Proxy\LazyServiceFactoryFactory');
         $serviceManager->setInvokableClass('foo', __CLASS__);
         $serviceManager->addDelegator('foo', 'foo-delegator');
 
@@ -104,11 +102,11 @@ public function testAutoGenerateAndEvaluateProxies()
         $this->assertInstanceOf('ProxyManager\\Proxy\\LazyLoadingInterface', $proxy);
         $this->assertInstanceOf(__CLASS__, $proxy);
         $this->assertSame(
-            $namespace . '\__PM__\ZendTest\ServiceManager\Proxy\LazyServiceFactoryFactoryTest',
+            $namespace . '\__PM__\LaminasTest\ServiceManager\Proxy\LazyServiceFactoryFactoryTest',
             get_class($proxy)
         );
         $this->assertFileNotExists(
-            sys_get_temp_dir() . '/' . $namespace . '__PM__ZendTestServiceManagerProxyLazyServiceFactoryFactoryTest.php'
+            sys_get_temp_dir() . '/' . $namespace . '__PM__LaminasTestServiceManagerProxyLazyServiceFactoryFactoryTest.php'
         );
         $this->assertFalse($proxy->isProxyInitialized());
         $this->assertEquals($this->invalidConfigProvider(), $proxy->invalidConfigProvider());
@@ -119,7 +117,7 @@ public function testRegistersAutoloader()
     {
         $autoloaders    = spl_autoload_functions();
         $serviceManager = new ServiceManager();
-        $namespace      = 'ZendTestProxy' . uniqid();
+        $namespace      = 'LaminasTestProxy' . uniqid();
 
         $serviceManager->setService(
             'Config',
@@ -131,7 +129,7 @@ public function testRegistersAutoloader()
                  ),
             )
         );
-        $serviceManager->setFactory('foo-delegator', 'Zend\ServiceManager\Proxy\LazyServiceFactoryFactory');
+        $serviceManager->setFactory('foo-delegator', 'Laminas\ServiceManager\Proxy\LazyServiceFactoryFactory');
         $serviceManager->create('foo-delegator');
 
         $currentAutoloaders = spl_autoload_functions();
diff --git a/test/Proxy/LazyServiceFactoryTest.php b/test/Proxy/LazyServiceFactoryTest.php
index 0a328989..7554318e 100644
--- a/test/Proxy/LazyServiceFactoryTest.php
+++ b/test/Proxy/LazyServiceFactoryTest.php
@@ -1,21 +1,19 @@
 <?php
+
 /**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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_ServiceManager
+ * @see       https://github.com/laminas/laminas-servicemanager for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-servicemanager/blob/master/COPYRIGHT.md
+ * @license   https://github.com/laminas/laminas-servicemanager/blob/master/LICENSE.md New BSD License
  */
 
-namespace ZendTest\ServiceManager\Proxy;
+namespace LaminasTest\ServiceManager\Proxy;
 
-use Zend\ServiceManager\Proxy\LazyServiceFactory;
+use Laminas\ServiceManager\Proxy\LazyServiceFactory;
 
 /**
- * Tests for {@see \Zend\ServiceManager\Proxy\LazyServiceFactory}
+ * Tests for {@see \Laminas\ServiceManager\Proxy\LazyServiceFactory}
  *
- * @covers \Zend\ServiceManager\Proxy\LazyServiceFactory
+ * @covers \Laminas\ServiceManager\Proxy\LazyServiceFactory
  */
 class LazyServiceFactoryTest extends \PHPUnit_Framework_TestCase
 {
@@ -35,7 +33,7 @@ public function setUp()
             $this->markTestSkipped('Please install `ocramius/proxy-manager` to run these tests');
         }
 
-        $this->locator      = $this->getMock('Zend\\ServiceManager\\ServiceLocatorInterface');
+        $this->locator      = $this->getMock('Laminas\\ServiceManager\\ServiceLocatorInterface');
         $this->proxyFactory = $this
             ->getMockBuilder('ProxyManager\\Factory\\LazyLoadingValueHolderFactory')
             ->disableOriginalConstructor()
@@ -78,7 +76,7 @@ public function testCannotCreateDelegatorWithNoMappedServiceClass()
     {
         $factory = new LazyServiceFactory($this->proxyFactory, array());
 
-        $this->setExpectedException('Zend\\ServiceManager\\Exception\\InvalidServiceNameException');
+        $this->setExpectedException('Laminas\\ServiceManager\\Exception\\InvalidServiceNameException');
 
         $factory->createDelegatorWithName($this->locator, 'foo', 'baz', function () {});
     }
diff --git a/test/ServiceLocatorAwareTraitTest.php b/test/ServiceLocatorAwareTraitTest.php
index e7a4172b..72bbd8c8 100644
--- a/test/ServiceLocatorAwareTraitTest.php
+++ b/test/ServiceLocatorAwareTraitTest.php
@@ -1,26 +1,25 @@
 <?php
+
 /**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @see       https://github.com/laminas/laminas-servicemanager for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-servicemanager/blob/master/COPYRIGHT.md
+ * @license   https://github.com/laminas/laminas-servicemanager/blob/master/LICENSE.md New BSD License
  */
 
-namespace ZendTest\ServiceManager;
+namespace LaminasTest\ServiceManager;
 
+use \Laminas\ServiceManager\ServiceManager;
 use \PHPUnit_Framework_TestCase as TestCase;
-use \Zend\ServiceManager\ServiceManager;
 
 /**
  * @requires PHP 5.4
- * @group    Zend_ServiceManager
+ * @group    Laminas_ServiceManager
  */
 class ServiceLocatorAwareTraitTest extends TestCase
 {
     public function testSetServiceLocator()
     {
-        $object = $this->getObjectForTrait('\Zend\ServiceManager\ServiceLocatorAwareTrait');
+        $object = $this->getObjectForTrait('\Laminas\ServiceManager\ServiceLocatorAwareTrait');
 
         $this->assertAttributeEquals(null, 'serviceLocator', $object);
 
@@ -33,7 +32,7 @@ public function testSetServiceLocator()
 
     public function testGetServiceLocator()
     {
-        $object = $this->getObjectForTrait('\Zend\ServiceManager\ServiceLocatorAwareTrait');
+        $object = $this->getObjectForTrait('\Laminas\ServiceManager\ServiceLocatorAwareTrait');
 
         $this->assertNull($object->getServiceLocator());
 
diff --git a/test/ServiceManagerTest.php b/test/ServiceManagerTest.php
index e4357a71..30be7eaf 100644
--- a/test/ServiceManagerTest.php
+++ b/test/ServiceManagerTest.php
@@ -1,27 +1,25 @@
 <?php
+
 /**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @see       https://github.com/laminas/laminas-servicemanager for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-servicemanager/blob/master/COPYRIGHT.md
+ * @license   https://github.com/laminas/laminas-servicemanager/blob/master/LICENSE.md New BSD License
  */
 
-namespace ZendTest\ServiceManager;
+namespace LaminasTest\ServiceManager;
 
+use Laminas\Di\Di;
+use Laminas\Mvc\Service\DiFactory;
+use Laminas\ServiceManager\Config;
+use Laminas\ServiceManager\Di\DiAbstractServiceFactory;
+use Laminas\ServiceManager\Exception;
+use Laminas\ServiceManager\ServiceManager;
+use LaminasTest\ServiceManager\TestAsset\FooCounterAbstractFactory;
+use LaminasTest\ServiceManager\TestAsset\MockSelfReturningDelegatorFactory;
 use PHPUnit_Framework_TestCase as TestCase;
-use Zend\Di\Di;
-use Zend\Mvc\Service\DiFactory;
-use Zend\ServiceManager\Di\DiAbstractServiceFactory;
-use Zend\ServiceManager\Exception;
-use Zend\ServiceManager\ServiceManager;
-use Zend\ServiceManager\Config;
-
-use ZendTest\ServiceManager\TestAsset\FooCounterAbstractFactory;
-use ZendTest\ServiceManager\TestAsset\MockSelfReturningDelegatorFactory;
 
 /**
- * @group Zend_ServiceManager
+ * @group Laminas_ServiceManager
  */
 class ServiceManagerTest extends TestCase
 {
@@ -37,7 +35,7 @@ public function setup()
     }
 
     /**
-     * @covers Zend\ServiceManager\ServiceManager::__construct
+     * @covers Laminas\ServiceManager\ServiceManager::__construct
      */
     public function testConstructorConfig()
     {
@@ -47,8 +45,8 @@ public function testConstructorConfig()
     }
 
     /**
-     * @covers Zend\ServiceManager\ServiceManager::setAllowOverride
-     * @covers Zend\ServiceManager\ServiceManager::getAllowOverride
+     * @covers Laminas\ServiceManager\ServiceManager::setAllowOverride
+     * @covers Laminas\ServiceManager\ServiceManager::getAllowOverride
      */
     public function testAllowOverride()
     {
@@ -59,8 +57,8 @@ public function testAllowOverride()
     }
 
     /**
-     * @covers Zend\ServiceManager\ServiceManager::setThrowExceptionInCreate
-     * @covers Zend\ServiceManager\ServiceManager::getThrowExceptionInCreate
+     * @covers Laminas\ServiceManager\ServiceManager::setThrowExceptionInCreate
+     * @covers Laminas\ServiceManager\ServiceManager::getThrowExceptionInCreate
      */
     public function testThrowExceptionInCreate()
     {
@@ -71,7 +69,7 @@ public function testThrowExceptionInCreate()
     }
 
     /**
-     * @covers Zend\ServiceManager\ServiceManager::setInvokableClass
+     * @covers Laminas\ServiceManager\ServiceManager::setInvokableClass
      */
     public function testSetInvokableClass()
     {
@@ -80,7 +78,7 @@ public function testSetInvokableClass()
     }
 
     /**
-     * @covers Zend\ServiceManager\ServiceManager::setFactory
+     * @covers Laminas\ServiceManager\ServiceManager::setFactory
      */
     public function testSetFactory()
     {
@@ -89,32 +87,32 @@ public function testSetFactory()
     }
 
     /**
-     * @covers Zend\ServiceManager\ServiceManager::setFactory
+     * @covers Laminas\ServiceManager\ServiceManager::setFactory
      */
     public function testSetFactoryThrowsExceptionOnDuplicate()
     {
         $this->serviceManager->setFactory('foo', 'bar');
-        $this->setExpectedException('Zend\ServiceManager\Exception\InvalidServiceNameException');
+        $this->setExpectedException('Laminas\ServiceManager\Exception\InvalidServiceNameException');
         $this->serviceManager->setFactory('foo', 'bar');
     }
 
     /**
-     * @covers Zend\ServiceManager\ServiceManager::addAbstractFactory
+     * @covers Laminas\ServiceManager\ServiceManager::addAbstractFactory
      */
     public function testAddAbstractFactory()
     {
-        $this->serviceManager->addAbstractFactory('ZendTest\ServiceManager\TestAsset\FooAbstractFactory');
+        $this->serviceManager->addAbstractFactory('LaminasTest\ServiceManager\TestAsset\FooAbstractFactory');
 
         $ret = $this->serviceManager->addAbstractFactory(new TestAsset\FooAbstractFactory());
         $this->assertSame($this->serviceManager, $ret);
     }
 
     /**
-     * @covers Zend\ServiceManager\ServiceManager::addAbstractFactory
+     * @covers Laminas\ServiceManager\ServiceManager::addAbstractFactory
      */
     public function testAddAbstractFactoryThrowsExceptionOnInvalidFactory()
     {
-        $this->setExpectedException('Zend\ServiceManager\Exception\InvalidArgumentException');
+        $this->setExpectedException('Laminas\ServiceManager\Exception\InvalidArgumentException');
         $this->serviceManager->addAbstractFactory(10);
     }
 
@@ -130,7 +128,7 @@ public function testServiceManagerIsPassedToInitializer()
     }
 
     /**
-     * @covers Zend\ServiceManager\ServiceManager::addInitializer
+     * @covers Laminas\ServiceManager\ServiceManager::addInitializer
      */
     public function testAddInitializer()
     {
@@ -139,16 +137,16 @@ public function testAddInitializer()
     }
 
     /**
-     * @covers Zend\ServiceManager\ServiceManager::addInitializer
+     * @covers Laminas\ServiceManager\ServiceManager::addInitializer
      */
     public function testAddInitializerThrowsExceptionOnInvalidInitializer()
     {
-        $this->setExpectedException('Zend\ServiceManager\Exception\InvalidArgumentException');
+        $this->setExpectedException('Laminas\ServiceManager\Exception\InvalidArgumentException');
         $this->serviceManager->addInitializer(5);
     }
 
     /**
-     * @covers Zend\ServiceManager\ServiceManager::setService
+     * @covers Laminas\ServiceManager\ServiceManager::setService
      */
     public function testSetService()
     {
@@ -157,7 +155,7 @@ public function testSetService()
     }
 
     /**
-     * @covers Zend\ServiceManager\ServiceManager::setShared
+     * @covers Laminas\ServiceManager\ServiceManager::setShared
      */
     public function testSetShared()
     {
@@ -167,26 +165,26 @@ public function testSetShared()
     }
 
     /**
-     * @covers Zend\ServiceManager\ServiceManager::setShared
+     * @covers Laminas\ServiceManager\ServiceManager::setShared
      */
     public function testSetSharedAbstractFactory()
     {
-        $this->serviceManager->addAbstractFactory('ZendTest\ServiceManager\TestAsset\FooAbstractFactory');
+        $this->serviceManager->addAbstractFactory('LaminasTest\ServiceManager\TestAsset\FooAbstractFactory');
         $ret = $this->serviceManager->setShared('foo', false);
         $this->assertSame($this->serviceManager, $ret);
     }
 
     /**
-     * @covers Zend\ServiceManager\ServiceManager::setShared
+     * @covers Laminas\ServiceManager\ServiceManager::setShared
      */
     public function testSetSharedThrowsExceptionOnUnregisteredService()
     {
-        $this->setExpectedException('Zend\ServiceManager\Exception\ServiceNotFoundException');
+        $this->setExpectedException('Laminas\ServiceManager\Exception\ServiceNotFoundException');
         $this->serviceManager->setShared('foo', true);
     }
 
     /**
-     * @covers Zend\ServiceManager\ServiceManager::get
+     * @covers Laminas\ServiceManager\ServiceManager::get
      */
     public function testGet()
     {
@@ -195,7 +193,7 @@ public function testGet()
     }
 
     /**
-     * @covers Zend\ServiceManager\ServiceManager::get
+     * @covers Laminas\ServiceManager\ServiceManager::get
      */
     public function testGetDoesNotThrowExceptionOnEmptyArray()
     {
@@ -204,33 +202,33 @@ public function testGetDoesNotThrowExceptionOnEmptyArray()
     }
 
     /**
-     * @covers Zend\ServiceManager\ServiceManager::get
+     * @covers Laminas\ServiceManager\ServiceManager::get
      */
     public function testGetThrowsExceptionOnUnknownService()
     {
-        $this->setExpectedException('Zend\ServiceManager\Exception\ServiceNotFoundException');
+        $this->setExpectedException('Laminas\ServiceManager\Exception\ServiceNotFoundException');
         $this->assertEquals('bar', $this->serviceManager->get('foo'));
     }
 
     /**
-     * @covers Zend\ServiceManager\ServiceManager::get
+     * @covers Laminas\ServiceManager\ServiceManager::get
      */
     public function testGetUsesIndivualSharedSettingWhenSetAndDeviatesFromShareByDefaultSetting()
     {
         $this->serviceManager->setAllowOverride(true);
         $this->serviceManager->setShareByDefault(false);
-        $this->serviceManager->setInvokableClass('foo', 'ZendTest\ServiceManager\TestAsset\Foo');
+        $this->serviceManager->setInvokableClass('foo', 'LaminasTest\ServiceManager\TestAsset\Foo');
         $this->serviceManager->setShared('foo', true);
         $this->assertSame($this->serviceManager->get('foo'), $this->serviceManager->get('foo'));
 
         $this->serviceManager->setShareByDefault(true);
-        $this->serviceManager->setInvokableClass('foo', 'ZendTest\ServiceManager\TestAsset\Foo');
+        $this->serviceManager->setInvokableClass('foo', 'LaminasTest\ServiceManager\TestAsset\Foo');
         $this->serviceManager->setShared('foo', false);
         $this->assertNotSame($this->serviceManager->get('foo'), $this->serviceManager->get('foo'));
     }
 
     /**
-     * @covers Zend\ServiceManager\ServiceManager::get
+     * @covers Laminas\ServiceManager\ServiceManager::get
      */
     public function testGetWithAlias()
     {
@@ -240,7 +238,7 @@ public function testGetWithAlias()
     }
 
     /**
-     * @covers Zend\ServiceManager\ServiceManager::get
+     * @covers Laminas\ServiceManager\ServiceManager::get
      */
     public function testGetWithScopedContainer()
     {
@@ -283,50 +281,50 @@ public function testAllowsRetrievingFromPeeringContainerFirst()
     }
 
     /**
-     * @covers Zend\ServiceManager\ServiceManager::create
+     * @covers Laminas\ServiceManager\ServiceManager::create
      */
     public function testCreateWithInvokableClass()
     {
-        $this->serviceManager->setInvokableClass('foo', 'ZendTest\ServiceManager\TestAsset\Foo');
-        $this->assertInstanceOf('ZendTest\ServiceManager\TestAsset\Foo', $this->serviceManager->get('foo'));
+        $this->serviceManager->setInvokableClass('foo', 'LaminasTest\ServiceManager\TestAsset\Foo');
+        $this->assertInstanceOf('LaminasTest\ServiceManager\TestAsset\Foo', $this->serviceManager->get('foo'));
     }
 
     /**
-     * @covers Zend\ServiceManager\ServiceManager::create
+     * @covers Laminas\ServiceManager\ServiceManager::create
      */
     public function testCreateWithFactoryInstance()
     {
-        $this->serviceManager->setFactory('foo', 'ZendTest\ServiceManager\TestAsset\FooFactory');
-        $this->assertInstanceOf('ZendTest\ServiceManager\TestAsset\Foo', $this->serviceManager->get('foo'));
+        $this->serviceManager->setFactory('foo', 'LaminasTest\ServiceManager\TestAsset\FooFactory');
+        $this->assertInstanceOf('LaminasTest\ServiceManager\TestAsset\Foo', $this->serviceManager->get('foo'));
     }
 
     /**
-     * @covers Zend\ServiceManager\ServiceManager::create
+     * @covers Laminas\ServiceManager\ServiceManager::create
      */
     public function testCreateWithCallableFactory()
     {
         $this->serviceManager->setFactory('foo', function () { return new TestAsset\Foo; });
-        $this->assertInstanceOf('ZendTest\ServiceManager\TestAsset\Foo', $this->serviceManager->get('foo'));
+        $this->assertInstanceOf('LaminasTest\ServiceManager\TestAsset\Foo', $this->serviceManager->get('foo'));
     }
 
     /**
-     * @covers Zend\ServiceManager\ServiceManager::create
+     * @covers Laminas\ServiceManager\ServiceManager::create
      */
     public function testCreateWithAbstractFactory()
     {
-        $this->serviceManager->addAbstractFactory('ZendTest\ServiceManager\TestAsset\FooAbstractFactory');
-        $this->assertInstanceOf('ZendTest\ServiceManager\TestAsset\Foo', $this->serviceManager->get('foo'));
+        $this->serviceManager->addAbstractFactory('LaminasTest\ServiceManager\TestAsset\FooAbstractFactory');
+        $this->assertInstanceOf('LaminasTest\ServiceManager\TestAsset\Foo', $this->serviceManager->get('foo'));
     }
 
     /**
-     * @covers Zend\ServiceManager\ServiceManager::create
+     * @covers Laminas\ServiceManager\ServiceManager::create
      */
     public function testCreateWithMultipleAbstractFactories()
     {
-        $this->serviceManager->addAbstractFactory('ZendTest\ServiceManager\TestAsset\BarAbstractFactory');
-        $this->serviceManager->addAbstractFactory('ZendTest\ServiceManager\TestAsset\FooAbstractFactory');
+        $this->serviceManager->addAbstractFactory('LaminasTest\ServiceManager\TestAsset\BarAbstractFactory');
+        $this->serviceManager->addAbstractFactory('LaminasTest\ServiceManager\TestAsset\FooAbstractFactory');
 
-        $this->assertInstanceOf('ZendTest\ServiceManager\TestAsset\Bar', $this->serviceManager->get('bar'));
+        $this->assertInstanceOf('LaminasTest\ServiceManager\TestAsset\Bar', $this->serviceManager->get('bar'));
     }
 
     public function testCreateWithInitializerObject()
@@ -340,7 +338,7 @@ public function testCreateWithInitializerObject()
     }
 
     /**
-     * @covers Zend\ServiceManager\ServiceManager::has
+     * @covers Laminas\ServiceManager\ServiceManager::has
      */
     public function testHas()
     {
@@ -350,7 +348,7 @@ public function testHas()
     }
 
     /**
-     * @covers Zend\ServiceManager\ServiceManager::setAlias
+     * @covers Laminas\ServiceManager\ServiceManager::setAlias
      */
     public function testSetAlias()
     {
@@ -360,37 +358,37 @@ public function testSetAlias()
     }
 
     /**
-     * @covers Zend\ServiceManager\ServiceManager::setAlias
+     * @covers Laminas\ServiceManager\ServiceManager::setAlias
      */
     public function testSetAliasThrowsExceptionOnInvalidAliasName()
     {
-        $this->setExpectedException('Zend\ServiceManager\Exception\InvalidServiceNameException');
+        $this->setExpectedException('Laminas\ServiceManager\Exception\InvalidServiceNameException');
         $this->serviceManager->setAlias(5, 10);
     }
 
     /**
-     * @covers Zend\ServiceManager\ServiceManager::setAlias
+     * @covers Laminas\ServiceManager\ServiceManager::setAlias
      */
     public function testSetAliasThrowsExceptionOnEmptyAliasName()
     {
-        $this->setExpectedException('Zend\ServiceManager\Exception\InvalidServiceNameException');
+        $this->setExpectedException('Laminas\ServiceManager\Exception\InvalidServiceNameException');
         $this->serviceManager->setAlias('', 'foo');
     }
 
     /**
-     * @covers Zend\ServiceManager\ServiceManager::setAlias
+     * @covers Laminas\ServiceManager\ServiceManager::setAlias
      */
     public function testSetAliasThrowsExceptionOnDuplicateAlias()
     {
         $this->serviceManager->setService('foo', 'bar');
         $this->serviceManager->setAlias('baz', 'foo');
 
-        $this->setExpectedException('Zend\ServiceManager\Exception\InvalidServiceNameException');
+        $this->setExpectedException('Laminas\ServiceManager\Exception\InvalidServiceNameException');
         $this->serviceManager->setAlias('baz', 'foo');
     }
 
     /**
-     * @covers Zend\ServiceManager\ServiceManager::setAlias
+     * @covers Laminas\ServiceManager\ServiceManager::setAlias
      */
     public function testSetAliasDoesNotThrowExceptionOnServiceNotFound()
     {
@@ -398,28 +396,28 @@ public function testSetAliasDoesNotThrowExceptionOnServiceNotFound()
     }
 
     /**
-     * @covers Zend\ServiceManager\ServiceManager::get
+     * @covers Laminas\ServiceManager\ServiceManager::get
      */
     public function testGetServiceThrowsExceptionOnAliasWithNoSetService()
     {
-        $this->setExpectedException('Zend\ServiceManager\Exception\ServiceNotFoundException');
+        $this->setExpectedException('Laminas\ServiceManager\Exception\ServiceNotFoundException');
         $this->serviceManager->setAlias('foo', 'bar');
         $this->serviceManager->get('foo');
     }
 
     /**
-     * @cover Zend\ServiceManager\ServiceManager::get
+     * @cover Laminas\ServiceManager\ServiceManager::get
      */
     public function testGetServiceThrowsExceptionOnMultipleAliasesWithNoSetService()
     {
-        $this->setExpectedException('Zend\ServiceManager\Exception\ServiceNotFoundException');
+        $this->setExpectedException('Laminas\ServiceManager\Exception\ServiceNotFoundException');
         $this->serviceManager->setAlias('foo', 'bar');
         $this->serviceManager->setAlias('baz', 'foo');
         $this->serviceManager->get('foo');
     }
 
     /**
-     * @covers Zend\ServiceManager\ServiceManager::hasAlias
+     * @covers Laminas\ServiceManager\ServiceManager::hasAlias
      */
     public function testHasAlias()
     {
@@ -431,7 +429,7 @@ public function testHasAlias()
     }
 
     /**
-     * @covers Zend\ServiceManager\ServiceManager::createScopedServiceManager
+     * @covers Laminas\ServiceManager\ServiceManager::createScopedServiceManager
      */
     public function testCreateScopedServiceManager()
     {
@@ -451,66 +449,66 @@ public function testConfigureWithInvokableClass()
     {
         $config = new Config(array(
             'invokables' => array(
-                'foo' => 'ZendTest\ServiceManager\TestAsset\Foo',
+                'foo' => 'LaminasTest\ServiceManager\TestAsset\Foo',
             ),
         ));
         $serviceManager = new ServiceManager($config);
         $foo = $serviceManager->get('foo');
-        $this->assertInstanceOf('ZendTest\ServiceManager\TestAsset\Foo', $foo);
+        $this->assertInstanceOf('LaminasTest\ServiceManager\TestAsset\Foo', $foo);
     }
 
     public function testPeeringService()
     {
         $di = new Di();
-        $di->instanceManager()->setParameters('ZendTest\ServiceManager\TestAsset\Bar', array('foo' => array('a')));
+        $di->instanceManager()->setParameters('LaminasTest\ServiceManager\TestAsset\Bar', array('foo' => array('a')));
         $this->serviceManager->addAbstractFactory(new DiAbstractServiceFactory($di));
         $sm = $this->serviceManager->createScopedServiceManager(ServiceManager::SCOPE_PARENT);
         $sm->setFactory('di', new DiFactory());
-        $bar = $sm->get('ZendTest\ServiceManager\TestAsset\Bar', true);
-        $this->assertInstanceOf('ZendTest\ServiceManager\TestAsset\Bar', $bar);
+        $bar = $sm->get('LaminasTest\ServiceManager\TestAsset\Bar', true);
+        $this->assertInstanceOf('LaminasTest\ServiceManager\TestAsset\Bar', $bar);
     }
 
     public function testDiAbstractServiceFactory()
     {
-        $di = $this->getMock('Zend\Di\Di');
+        $di = $this->getMock('Laminas\Di\Di');
         $factory = new DiAbstractServiceFactory($di);
-        $factory->instanceManager()->setConfig('ZendTest\ServiceManager\TestAsset\Bar', array('parameters' => array('foo' => array('a'))));
+        $factory->instanceManager()->setConfig('LaminasTest\ServiceManager\TestAsset\Bar', array('parameters' => array('foo' => array('a'))));
         $this->serviceManager->addAbstractFactory($factory);
 
-        $this->assertTrue($this->serviceManager->has('ZendTest\ServiceManager\TestAsset\Bar', true));
+        $this->assertTrue($this->serviceManager->has('LaminasTest\ServiceManager\TestAsset\Bar', true));
 
-        $bar = $this->serviceManager->get('ZendTest\ServiceManager\TestAsset\Bar', true);
-        $this->assertInstanceOf('ZendTest\ServiceManager\TestAsset\Bar', $bar);
+        $bar = $this->serviceManager->get('LaminasTest\ServiceManager\TestAsset\Bar', true);
+        $this->assertInstanceOf('LaminasTest\ServiceManager\TestAsset\Bar', $bar);
     }
 
     public function testExceptionThrowingFactory()
     {
-        $this->serviceManager->setFactory('foo', 'ZendTest\ServiceManager\TestAsset\ExceptionThrowingFactory');
+        $this->serviceManager->setFactory('foo', 'LaminasTest\ServiceManager\TestAsset\ExceptionThrowingFactory');
         try {
             $this->serviceManager->get('foo');
             $this->fail("No exception thrown");
         } catch (Exception\ServiceNotCreatedException $e) {
-            $this->assertInstanceOf('ZendTest\ServiceManager\TestAsset\FooException', $e->getPrevious());
+            $this->assertInstanceOf('LaminasTest\ServiceManager\TestAsset\FooException', $e->getPrevious());
         }
     }
 
     /**
-     * @expectedException Zend\ServiceManager\Exception\ServiceNotFoundException
+     * @expectedException Laminas\ServiceManager\Exception\ServiceNotFoundException
      */
     public function testCannotUseUnknownServiceNameForAbstractFactory()
     {
         $config = new Config(array(
             'abstract_factories' => array(
-                'ZendTest\ServiceManager\TestAsset\FooAbstractFactory',
+                'LaminasTest\ServiceManager\TestAsset\FooAbstractFactory',
             ),
         ));
         $serviceManager = new ServiceManager($config);
-        $serviceManager->setFactory('foo', 'ZendTest\ServiceManager\TestAsset\FooFactory');
+        $serviceManager->setFactory('foo', 'LaminasTest\ServiceManager\TestAsset\FooFactory');
         $foo = $serviceManager->get('unknownObject');
     }
 
     /**
-     * @expectedException Zend\ServiceManager\Exception\ServiceNotCreatedException
+     * @expectedException Laminas\ServiceManager\Exception\ServiceNotCreatedException
      */
     public function testDoNotFallbackToAbstractFactory()
     {
@@ -518,19 +516,19 @@ public function testDoNotFallbackToAbstractFactory()
             return new TestAsset\Bar();
         };
         $serviceManager = new ServiceManager();
-        $serviceManager->setFactory('ZendTest\ServiceManager\TestAsset\Bar', $factory);
+        $serviceManager->setFactory('LaminasTest\ServiceManager\TestAsset\Bar', $factory);
         $di = new Di();
-        $di->instanceManager()->setParameters('ZendTest\ServiceManager\TestAsset\Bar', array('foo' => array('a')));
+        $di->instanceManager()->setParameters('LaminasTest\ServiceManager\TestAsset\Bar', array('foo' => array('a')));
         $serviceManager->addAbstractFactory(new DiAbstractServiceFactory($di));
-        $bar = $serviceManager->get('ZendTest\ServiceManager\TestAsset\Bar');
+        $bar = $serviceManager->get('LaminasTest\ServiceManager\TestAsset\Bar');
     }
 
     /**
-     * @expectedException Zend\ServiceManager\Exception\InvalidServiceNameException
+     * @expectedException Laminas\ServiceManager\Exception\InvalidServiceNameException
      */
     public function testAssignAliasWithExistingServiceName()
     {
-        $this->serviceManager->setFactory('foo', 'ZendTest\ServiceManager\TestAsset\FooFactory');
+        $this->serviceManager->setFactory('foo', 'LaminasTest\ServiceManager\TestAsset\FooFactory');
         $this->serviceManager->setFactory('bar', function ($sm) {
                 return new Bar(array('a'));
             });
@@ -540,8 +538,8 @@ public function testAssignAliasWithExistingServiceName()
     }
 
     /**
-     * @covers Zend\ServiceManager\ServiceManager::createFromAbstractFactory
-     * @covers Zend\ServiceManager\ServiceManager::has
+     * @covers Laminas\ServiceManager\ServiceManager::createFromAbstractFactory
+     * @covers Laminas\ServiceManager\ServiceManager::has
      */
     public function testWillNotCreateCircularReferences()
     {
@@ -572,13 +570,13 @@ public function testCallingANonExistingServiceFromAnAbstractServiceDoesNotMakeTh
 
     public function testShouldAllowAddingInitializersAsClassNames()
     {
-        $result = $this->serviceManager->addInitializer('ZendTest\ServiceManager\TestAsset\FooInitializer');
+        $result = $this->serviceManager->addInitializer('LaminasTest\ServiceManager\TestAsset\FooInitializer');
         $this->assertSame($this->serviceManager, $result);
     }
 
     public function testShouldRaiseExceptionIfInitializerClassIsNotAnInitializerInterfaceImplementation()
     {
-        $this->setExpectedException('Zend\ServiceManager\Exception\InvalidArgumentException');
+        $this->setExpectedException('Laminas\ServiceManager\Exception\InvalidArgumentException');
         $result = $this->serviceManager->addInitializer(get_class($this));
     }
 
@@ -586,12 +584,12 @@ public function testGetGlobIteratorServiceWorksProperly()
     {
         $config = new Config(array(
             'invokables' => array(
-                'foo' => 'ZendTest\ServiceManager\TestAsset\GlobIteratorService',
+                'foo' => 'LaminasTest\ServiceManager\TestAsset\GlobIteratorService',
             ),
         ));
         $serviceManager = new ServiceManager($config);
         $foo = $serviceManager->get('foo');
-        $this->assertInstanceOf('ZendTest\ServiceManager\TestAsset\GlobIteratorService', $foo);
+        $this->assertInstanceOf('LaminasTest\ServiceManager\TestAsset\GlobIteratorService', $foo);
     }
 
     public function duplicateService()
@@ -640,7 +638,7 @@ public function testWithAllowOverrideOnRegisteringAServiceDuplicatingAnExistingA
     }
 
     /**
-     * @covers Zend\ServiceManager\ServiceManager::canonicalizeName
+     * @covers Laminas\ServiceManager\ServiceManager::canonicalizeName
      */
     public function testCanonicalizeName()
     {
@@ -653,7 +651,7 @@ public function testCanonicalizeName()
     }
 
     /**
-     * @covers Zend\ServiceManager\ServiceManager::canCreateFromAbstractFactory
+     * @covers Laminas\ServiceManager\ServiceManager::canCreateFromAbstractFactory
      */
     public function testWanCreateFromAbstractFactoryWillNotInstantiateAbstractFactoryOnce()
     {
@@ -667,18 +665,18 @@ public function testWanCreateFromAbstractFactoryWillNotInstantiateAbstractFactor
     }
 
     /**
-     * @covers Zend\ServiceManager\ServiceManager::canCreateFromAbstractFactory
-     * @covers Zend\ServiceManager\ServiceManager::create
+     * @covers Laminas\ServiceManager\ServiceManager::canCreateFromAbstractFactory
+     * @covers Laminas\ServiceManager\ServiceManager::create
      */
     public function testAbstractFactoryNotUsedIfNotAbleToCreate()
     {
         $service = new \stdClass;
 
-        $af1 = $this->getMock('Zend\ServiceManager\AbstractFactoryInterface');
+        $af1 = $this->getMock('Laminas\ServiceManager\AbstractFactoryInterface');
         $af1->expects($this->any())->method('canCreateServiceWithName')->will($this->returnValue(true));
         $af1->expects($this->any())->method('createServiceWithName')->will($this->returnValue($service));
 
-        $af2 = $this->getMock('Zend\ServiceManager\AbstractFactoryInterface');
+        $af2 = $this->getMock('Laminas\ServiceManager\AbstractFactoryInterface');
         $af2->expects($this->any())->method('canCreateServiceWithName')->will($this->returnValue(false));
         $af2->expects($this->never())->method('createServiceWithName');
 
@@ -689,9 +687,9 @@ public function testAbstractFactoryNotUsedIfNotAbleToCreate()
     }
 
     /**
-     * @covers Zend\ServiceManager\ServiceManager::setAlias
-     * @covers Zend\ServiceManager\ServiceManager::get
-     * @covers Zend\ServiceManager\ServiceManager::retrieveFromPeeringManager
+     * @covers Laminas\ServiceManager\ServiceManager::setAlias
+     * @covers Laminas\ServiceManager\ServiceManager::get
+     * @covers Laminas\ServiceManager\ServiceManager::retrieveFromPeeringManager
      */
     public function testCanGetAliasedServicesFromPeeringServiceManagers()
     {
@@ -707,24 +705,24 @@ public function testCanGetAliasedServicesFromPeeringServiceManagers()
     }
 
     /**
-     * @covers Zend\ServiceManager\ServiceManager::get
+     * @covers Laminas\ServiceManager\ServiceManager::get
      */
     public function testDuplicateNewInstanceMultipleAbstractFactories()
     {
         $this->serviceManager->setAllowOverride(true);
         $this->serviceManager->setShareByDefault(false);
-        $this->serviceManager->addAbstractFactory('ZendTest\ServiceManager\TestAsset\BarAbstractFactory');
-        $this->serviceManager->addAbstractFactory('ZendTest\ServiceManager\TestAsset\FooAbstractFactory');
-        $this->assertInstanceOf('ZendTest\ServiceManager\TestAsset\Bar', $this->serviceManager->get('bar'));
-        $this->assertInstanceOf('ZendTest\ServiceManager\TestAsset\Bar', $this->serviceManager->get('bar'));
+        $this->serviceManager->addAbstractFactory('LaminasTest\ServiceManager\TestAsset\BarAbstractFactory');
+        $this->serviceManager->addAbstractFactory('LaminasTest\ServiceManager\TestAsset\FooAbstractFactory');
+        $this->assertInstanceOf('LaminasTest\ServiceManager\TestAsset\Bar', $this->serviceManager->get('bar'));
+        $this->assertInstanceOf('LaminasTest\ServiceManager\TestAsset\Bar', $this->serviceManager->get('bar'));
     }
 
     /**
-     * @covers Zend\ServiceManager\ServiceManager::setService
-     * @covers Zend\ServiceManager\ServiceManager::get
-     * @covers Zend\ServiceManager\ServiceManager::retrieveFromPeeringManagerFirst
-     * @covers Zend\ServiceManager\ServiceManager::setRetrieveFromPeeringManagerFirst
-     * @covers Zend\ServiceManager\ServiceManager::addPeeringServiceManager
+     * @covers Laminas\ServiceManager\ServiceManager::setService
+     * @covers Laminas\ServiceManager\ServiceManager::get
+     * @covers Laminas\ServiceManager\ServiceManager::retrieveFromPeeringManagerFirst
+     * @covers Laminas\ServiceManager\ServiceManager::setRetrieveFromPeeringManagerFirst
+     * @covers Laminas\ServiceManager\ServiceManager::addPeeringServiceManager
      */
     public function testRetrieveServiceFromPeeringServiceManagerIfretrieveFromPeeringManagerFirstSetToTrueAndServiceNamesAreSame()
     {
@@ -752,13 +750,13 @@ public function testRetrieveServiceFromPeeringServiceManagerIfretrieveFromPeerin
     }
 
     /**
-     * @covers Zend\ServiceManager\ServiceManager::create
-     * @covers Zend\ServiceManager\ServiceManager::createDelegatorCallback
-     * @covers Zend\ServiceManager\ServiceManager::addDelegator
+     * @covers Laminas\ServiceManager\ServiceManager::create
+     * @covers Laminas\ServiceManager\ServiceManager::createDelegatorCallback
+     * @covers Laminas\ServiceManager\ServiceManager::addDelegator
      */
     public function testUsesDelegatorWhenAvailable()
     {
-        $delegator = $this->getMock('Zend\\ServiceManager\\DelegatorFactoryInterface');
+        $delegator = $this->getMock('Laminas\\ServiceManager\\DelegatorFactoryInterface');
 
         $this->serviceManager->setService('foo-delegator', $delegator);
         $this->serviceManager->addDelegator('foo-service', 'foo-delegator');
@@ -789,9 +787,9 @@ public function testUsesDelegatorWhenAvailable()
     }
 
     /**
-     * @covers Zend\ServiceManager\ServiceManager::create
-     * @covers Zend\ServiceManager\ServiceManager::createDelegatorCallback
-     * @covers Zend\ServiceManager\ServiceManager::addDelegator
+     * @covers Laminas\ServiceManager\ServiceManager::create
+     * @covers Laminas\ServiceManager\ServiceManager::createDelegatorCallback
+     * @covers Laminas\ServiceManager\ServiceManager::addDelegator
      */
     public function testUsesMultipleDelegates()
     {
diff --git a/test/TestAsset/AbstractFactoryWithMutableCreationOptions.php b/test/TestAsset/AbstractFactoryWithMutableCreationOptions.php
index 8e9dcab7..6f8a2729 100644
--- a/test/TestAsset/AbstractFactoryWithMutableCreationOptions.php
+++ b/test/TestAsset/AbstractFactoryWithMutableCreationOptions.php
@@ -1,18 +1,17 @@
 <?php
+
 /**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @see       https://github.com/laminas/laminas-servicemanager for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-servicemanager/blob/master/COPYRIGHT.md
+ * @license   https://github.com/laminas/laminas-servicemanager/blob/master/LICENSE.md New BSD License
  */
 
-namespace ZendTest\ServiceManager\TestAsset;
+namespace LaminasTest\ServiceManager\TestAsset;
 
+use Laminas\ServiceManager\AbstractFactoryInterface;
+use Laminas\ServiceManager\MutableCreationOptionsInterface;
+use Laminas\ServiceManager\ServiceLocatorInterface;
 use stdClass;
-use Zend\ServiceManager\AbstractFactoryInterface;
-use Zend\ServiceManager\MutableCreationOptionsInterface;
-use Zend\ServiceManager\ServiceLocatorInterface;
 
 /**
  * implements multiple interface mock
diff --git a/test/TestAsset/Bar.php b/test/TestAsset/Bar.php
index a1241f77..4e62774d 100644
--- a/test/TestAsset/Bar.php
+++ b/test/TestAsset/Bar.php
@@ -1,13 +1,12 @@
 <?php
+
 /**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @see       https://github.com/laminas/laminas-servicemanager for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-servicemanager/blob/master/COPYRIGHT.md
+ * @license   https://github.com/laminas/laminas-servicemanager/blob/master/LICENSE.md New BSD License
  */
 
-namespace ZendTest\ServiceManager\TestAsset;
+namespace LaminasTest\ServiceManager\TestAsset;
 
 class Bar
 {
diff --git a/test/TestAsset/BarAbstractFactory.php b/test/TestAsset/BarAbstractFactory.php
index b70d67de..8a5d470e 100644
--- a/test/TestAsset/BarAbstractFactory.php
+++ b/test/TestAsset/BarAbstractFactory.php
@@ -1,16 +1,15 @@
 <?php
+
 /**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @see       https://github.com/laminas/laminas-servicemanager for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-servicemanager/blob/master/COPYRIGHT.md
+ * @license   https://github.com/laminas/laminas-servicemanager/blob/master/LICENSE.md New BSD License
  */
 
-namespace ZendTest\ServiceManager\TestAsset;
+namespace LaminasTest\ServiceManager\TestAsset;
 
-use Zend\ServiceManager\AbstractFactoryInterface;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Laminas\ServiceManager\AbstractFactoryInterface;
+use Laminas\ServiceManager\ServiceLocatorInterface;
 
 class BarAbstractFactory implements AbstractFactoryInterface
 {
diff --git a/test/TestAsset/CallableWithMutableCreationOptions.php b/test/TestAsset/CallableWithMutableCreationOptions.php
index 03a06420..4ec4b513 100644
--- a/test/TestAsset/CallableWithMutableCreationOptions.php
+++ b/test/TestAsset/CallableWithMutableCreationOptions.php
@@ -1,17 +1,16 @@
 <?php
+
 /**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @see       https://github.com/laminas/laminas-servicemanager for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-servicemanager/blob/master/COPYRIGHT.md
+ * @license   https://github.com/laminas/laminas-servicemanager/blob/master/LICENSE.md New BSD License
  */
 
-namespace ZendTest\ServiceManager\TestAsset;
+namespace LaminasTest\ServiceManager\TestAsset;
 
+use Laminas\ServiceManager\MutableCreationOptionsInterface;
+use Laminas\ServiceManager\ServiceLocatorInterface;
 use stdClass;
-use Zend\ServiceManager\MutableCreationOptionsInterface;
-use Zend\ServiceManager\ServiceLocatorInterface;
 
 /**
  * implements multiple interface invokable object mock
diff --git a/test/TestAsset/CircularDependencyAbstractFactory.php b/test/TestAsset/CircularDependencyAbstractFactory.php
index debba863..e6ecde97 100644
--- a/test/TestAsset/CircularDependencyAbstractFactory.php
+++ b/test/TestAsset/CircularDependencyAbstractFactory.php
@@ -1,16 +1,15 @@
 <?php
+
 /**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @see       https://github.com/laminas/laminas-servicemanager for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-servicemanager/blob/master/COPYRIGHT.md
+ * @license   https://github.com/laminas/laminas-servicemanager/blob/master/LICENSE.md New BSD License
  */
 
-namespace ZendTest\ServiceManager\TestAsset;
+namespace LaminasTest\ServiceManager\TestAsset;
 
-use Zend\ServiceManager\AbstractFactoryInterface;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Laminas\ServiceManager\AbstractFactoryInterface;
+use Laminas\ServiceManager\ServiceLocatorInterface;
 
 /**
  * Class used to try to simulate a cyclic dependency in ServiceManager.
diff --git a/test/TestAsset/ExceptionThrowingFactory.php b/test/TestAsset/ExceptionThrowingFactory.php
index 5807be39..b9cc042b 100644
--- a/test/TestAsset/ExceptionThrowingFactory.php
+++ b/test/TestAsset/ExceptionThrowingFactory.php
@@ -1,16 +1,15 @@
 <?php
+
 /**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @see       https://github.com/laminas/laminas-servicemanager for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-servicemanager/blob/master/COPYRIGHT.md
+ * @license   https://github.com/laminas/laminas-servicemanager/blob/master/LICENSE.md New BSD License
  */
 
-namespace ZendTest\ServiceManager\TestAsset;
+namespace LaminasTest\ServiceManager\TestAsset;
 
-use Zend\ServiceManager\FactoryInterface;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Laminas\ServiceManager\FactoryInterface;
+use Laminas\ServiceManager\ServiceLocatorInterface;
 
 class ExceptionThrowingFactory implements FactoryInterface
 {
diff --git a/test/TestAsset/Foo.php b/test/TestAsset/Foo.php
index 81eb5a1d..e64cb75c 100644
--- a/test/TestAsset/Foo.php
+++ b/test/TestAsset/Foo.php
@@ -1,13 +1,12 @@
 <?php
+
 /**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @see       https://github.com/laminas/laminas-servicemanager for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-servicemanager/blob/master/COPYRIGHT.md
+ * @license   https://github.com/laminas/laminas-servicemanager/blob/master/LICENSE.md New BSD License
  */
 
-namespace ZendTest\ServiceManager\TestAsset;
+namespace LaminasTest\ServiceManager\TestAsset;
 
 class Foo
 {
diff --git a/test/TestAsset/FooAbstractFactory.php b/test/TestAsset/FooAbstractFactory.php
index 65e71f9c..ad616570 100644
--- a/test/TestAsset/FooAbstractFactory.php
+++ b/test/TestAsset/FooAbstractFactory.php
@@ -1,16 +1,15 @@
 <?php
+
 /**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @see       https://github.com/laminas/laminas-servicemanager for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-servicemanager/blob/master/COPYRIGHT.md
+ * @license   https://github.com/laminas/laminas-servicemanager/blob/master/LICENSE.md New BSD License
  */
 
-namespace ZendTest\ServiceManager\TestAsset;
+namespace LaminasTest\ServiceManager\TestAsset;
 
-use Zend\ServiceManager\AbstractFactoryInterface;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Laminas\ServiceManager\AbstractFactoryInterface;
+use Laminas\ServiceManager\ServiceLocatorInterface;
 
 class FooAbstractFactory implements AbstractFactoryInterface
 {
diff --git a/test/TestAsset/FooCounterAbstractFactory.php b/test/TestAsset/FooCounterAbstractFactory.php
index 5517be86..c1704295 100644
--- a/test/TestAsset/FooCounterAbstractFactory.php
+++ b/test/TestAsset/FooCounterAbstractFactory.php
@@ -1,16 +1,15 @@
 <?php
+
 /**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @see       https://github.com/laminas/laminas-servicemanager for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-servicemanager/blob/master/COPYRIGHT.md
+ * @license   https://github.com/laminas/laminas-servicemanager/blob/master/LICENSE.md New BSD License
  */
 
-namespace ZendTest\ServiceManager\TestAsset;
+namespace LaminasTest\ServiceManager\TestAsset;
 
-use Zend\ServiceManager\AbstractFactoryInterface;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Laminas\ServiceManager\AbstractFactoryInterface;
+use Laminas\ServiceManager\ServiceLocatorInterface;
 
 /**
  * Abstract factory that keeps track of the number of times it is instantiated
diff --git a/test/TestAsset/FooException.php b/test/TestAsset/FooException.php
index f4d120e8..d1955ca7 100644
--- a/test/TestAsset/FooException.php
+++ b/test/TestAsset/FooException.php
@@ -1,13 +1,12 @@
 <?php
+
 /**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @see       https://github.com/laminas/laminas-servicemanager for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-servicemanager/blob/master/COPYRIGHT.md
+ * @license   https://github.com/laminas/laminas-servicemanager/blob/master/LICENSE.md New BSD License
  */
 
-namespace ZendTest\ServiceManager\TestAsset;
+namespace LaminasTest\ServiceManager\TestAsset;
 
 
 class FooException extends \Exception
diff --git a/test/TestAsset/FooFactory.php b/test/TestAsset/FooFactory.php
index afdde0fc..2b0ef181 100644
--- a/test/TestAsset/FooFactory.php
+++ b/test/TestAsset/FooFactory.php
@@ -1,17 +1,16 @@
 <?php
+
 /**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @see       https://github.com/laminas/laminas-servicemanager for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-servicemanager/blob/master/COPYRIGHT.md
+ * @license   https://github.com/laminas/laminas-servicemanager/blob/master/LICENSE.md New BSD License
  */
 
-namespace ZendTest\ServiceManager\TestAsset;
+namespace LaminasTest\ServiceManager\TestAsset;
 
-use Zend\ServiceManager\FactoryInterface;
-use Zend\ServiceManager\MutableCreationOptionsInterface;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Laminas\ServiceManager\FactoryInterface;
+use Laminas\ServiceManager\MutableCreationOptionsInterface;
+use Laminas\ServiceManager\ServiceLocatorInterface;
 
 class FooFactory implements FactoryInterface, MutableCreationOptionsInterface
 {
diff --git a/test/TestAsset/FooInitializer.php b/test/TestAsset/FooInitializer.php
index 5119d18b..6539b74c 100644
--- a/test/TestAsset/FooInitializer.php
+++ b/test/TestAsset/FooInitializer.php
@@ -1,16 +1,15 @@
 <?php
+
 /**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @see       https://github.com/laminas/laminas-servicemanager for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-servicemanager/blob/master/COPYRIGHT.md
+ * @license   https://github.com/laminas/laminas-servicemanager/blob/master/LICENSE.md New BSD License
  */
 
-namespace ZendTest\ServiceManager\TestAsset;
+namespace LaminasTest\ServiceManager\TestAsset;
 
-use Zend\ServiceManager\InitializerInterface;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Laminas\ServiceManager\InitializerInterface;
+use Laminas\ServiceManager\ServiceLocatorInterface;
 
 class FooInitializer implements InitializerInterface
 {
diff --git a/test/TestAsset/FooPluginManager.php b/test/TestAsset/FooPluginManager.php
index c756e0ac..6d064440 100644
--- a/test/TestAsset/FooPluginManager.php
+++ b/test/TestAsset/FooPluginManager.php
@@ -1,17 +1,15 @@
 <?php
+
 /**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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_ServiceManager
+ * @see       https://github.com/laminas/laminas-servicemanager for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-servicemanager/blob/master/COPYRIGHT.md
+ * @license   https://github.com/laminas/laminas-servicemanager/blob/master/LICENSE.md New BSD License
  */
 
-namespace ZendTest\ServiceManager\TestAsset;
+namespace LaminasTest\ServiceManager\TestAsset;
 
-use Zend\ServiceManager\AbstractPluginManager;
-use Zend\ServiceManager\Exception;
+use Laminas\ServiceManager\AbstractPluginManager;
+use Laminas\ServiceManager\Exception;
 
 class FooPluginManager extends AbstractPluginManager
 {
diff --git a/test/TestAsset/GlobIteratorService.php b/test/TestAsset/GlobIteratorService.php
index 7a80a172..3cb908bd 100644
--- a/test/TestAsset/GlobIteratorService.php
+++ b/test/TestAsset/GlobIteratorService.php
@@ -1,13 +1,12 @@
 <?php
+
 /**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @see       https://github.com/laminas/laminas-servicemanager for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-servicemanager/blob/master/COPYRIGHT.md
+ * @license   https://github.com/laminas/laminas-servicemanager/blob/master/LICENSE.md New BSD License
  */
 
-namespace ZendTest\ServiceManager\TestAsset;
+namespace LaminasTest\ServiceManager\TestAsset;
 
 class GlobIteratorService extends \GlobIterator
 {
diff --git a/test/TestAsset/MockSelfReturningDelegatorFactory.php b/test/TestAsset/MockSelfReturningDelegatorFactory.php
index 2bf70697..be27b455 100644
--- a/test/TestAsset/MockSelfReturningDelegatorFactory.php
+++ b/test/TestAsset/MockSelfReturningDelegatorFactory.php
@@ -1,17 +1,15 @@
 <?php
+
 /**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @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_ServiceManager
+ * @see       https://github.com/laminas/laminas-servicemanager for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-servicemanager/blob/master/COPYRIGHT.md
+ * @license   https://github.com/laminas/laminas-servicemanager/blob/master/LICENSE.md New BSD License
  */
 
-namespace ZendTest\ServiceManager\TestAsset;
+namespace LaminasTest\ServiceManager\TestAsset;
 
-use Zend\ServiceManager\DelegatorFactoryInterface;
-use Zend\ServiceManager\ServiceLocatorInterface;
+use Laminas\ServiceManager\DelegatorFactoryInterface;
+use Laminas\ServiceManager\ServiceLocatorInterface;
 
 /**
  * Mock factory that logs delegated service instances and returns itself instead of the original service
diff --git a/test/TestAsset/TrollAbstractFactory.php b/test/TestAsset/TrollAbstractFactory.php
index 04229976..c452fa64 100644
--- a/test/TestAsset/TrollAbstractFactory.php
+++ b/test/TestAsset/TrollAbstractFactory.php
@@ -1,17 +1,16 @@
 <?php
+
 /**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @see       https://github.com/laminas/laminas-servicemanager for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-servicemanager/blob/master/COPYRIGHT.md
+ * @license   https://github.com/laminas/laminas-servicemanager/blob/master/LICENSE.md New BSD License
  */
 
-namespace ZendTest\ServiceManager\TestAsset;
+namespace LaminasTest\ServiceManager\TestAsset;
 
+use Laminas\ServiceManager\AbstractFactoryInterface;
+use Laminas\ServiceManager\ServiceLocatorInterface;
 use stdClass;
-use Zend\ServiceManager\AbstractFactoryInterface;
-use Zend\ServiceManager\ServiceLocatorInterface;
 
 class TrollAbstractFactory implements AbstractFactoryInterface
 {
diff --git a/test/bootstrap.php b/test/bootstrap.php
index 2ab1230e..df2f700b 100644
--- a/test/bootstrap.php
+++ b/test/bootstrap.php
@@ -1,12 +1,13 @@
 <?php
+
 /**
- * @link      http://github.com/zendframework/zend-service-manager for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @see       https://github.com/laminas/laminas-servicemanager for the canonical source repository
+ * @copyright https://github.com/laminas/laminas-servicemanager/blob/master/COPYRIGHT.md
+ * @license   https://github.com/laminas/laminas-servicemanager/blob/master/LICENSE.md New BSD License
  */
 
 /*
- * Set error reporting to the level to which Zend Framework code must comply.
+ * Set error reporting to the level to which Laminas code must comply.
  */
 error_reporting(E_ALL | E_STRICT);
 
@@ -14,7 +15,7 @@
     $phpUnitVersion = PHPUnit_Runner_Version::id();
     if ('@package_version@' !== $phpUnitVersion && version_compare($phpUnitVersion, '4.0.0', '<')) {
         echo 'This version of PHPUnit (' . PHPUnit_Runner_Version::id() . ') is not supported'
-           . ' in the zend-service-manager unit tests. Supported is version 4.0.0 or higher.'
+           . ' in the laminas-service-manager unit tests. Supported is version 4.0.0 or higher.'
            . ' See also the CONTRIBUTING.md file in the component root.' . PHP_EOL;
         exit(1);
     }
@@ -29,6 +30,6 @@
 /**
  * Start output buffering, if enabled
  */
-if (defined('TESTS_ZEND_OB_ENABLED') && constant('TESTS_ZEND_OB_ENABLED')) {
+if (defined('TESTS_LAMINAS_OB_ENABLED') && constant('TESTS_LAMINAS_OB_ENABLED')) {
     ob_start();
 }