diff --git a/.coveragerc b/.coveragerc
index 97f08df7c..2aab3963c 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -1,8 +1,8 @@
 [run]
 branch = True
-omit = *marconi/openstack*
+omit = *zaqar/openstack*
 
 [report]
 exclude_lines =
-    if __MARCONI_SETUP__:
+    if _ZAQAR_SETUP__:
     raise NotImplementedError
diff --git a/HACKING.rst b/HACKING.rst
index bd9648902..c705839ec 100644
--- a/HACKING.rst
+++ b/HACKING.rst
@@ -1,9 +1,9 @@
-Marconi Style Commandments
-==========================
+Zaqar Style Commandments
+========================
 
 - Step 1: Read the OpenStack Style Commandments
   http://docs.openstack.org/developer/hacking/
-- Step 2: Read on for Marconi specific commandments
+- Step 2: Read on for Zaqar specific commandments
 
 General
 -------
@@ -74,11 +74,11 @@ More Import Examples
 
 **INCORRECT** ::
 
-  import marconi.queues.transport.wsgi as wsgi
+  import zaqar.queues.transport.wsgi as wsgi
 
 **CORRECT** ::
 
-  from marconi.queues.transport import wsgi
+  from zaqar.queues.transport import wsgi
 
 Docstrings
 ----------
diff --git a/README.rst b/README.rst
index 23e467744..e713a3ac4 100644
--- a/README.rst
+++ b/README.rst
@@ -1,28 +1,28 @@
-Marconi
-=======
+Zaqar
+=====
 
 Message queuing service for `OpenStack`_.
 To find more information read our `wiki`_.
 
-Running a local Marconi server with MongoDB
--------------------------------------------
+Running a local Zaqar server with MongoDB
+-----------------------------------------
 
-**Note:** These instructions are for running a local instance of Marconi and
+**Note:** These instructions are for running a local instance of Zaqar and
 not all of these steps are required. It is assumed you have `MongoDB`_
 installed and running.
 
-1. From your home folder create the ``~/.marconi`` folder and clone the repo::
+1. From your home folder create the ``~/.zaqar`` folder and clone the repo::
 
     $ cd
-    $ mkdir .marconi
-    $ git clone https://github.com/openstack/marconi.git
+    $ mkdir .zaqar
+    $ git clone https://github.com/openstack/zaqar.git
 
-2. Copy the Marconi config files to the directory ``~/.marconi``::
+2. Copy the Zaqar config files to the directory ``~/.zaqar``::
 
-    $ cp marconi/etc/marconi.conf.sample ~/.marconi/marconi.conf
-    $ cp marconi/etc/logging.conf.sample ~/.marconi/logging.conf
+    $ cp zaqar/etc/zaqar.conf.sample ~/.zaqar/zaqar.conf
+    $ cp zaqar/etc/logging.conf.sample ~/.zaqar/logging.conf
 
-3. Find ``[drivers]`` section in ``~/.marconi/marconi.conf``
+3. Find ``[drivers]`` section in ``~/.zaqar/zaqar.conf``
    and specify to use mongodb storage::
 
     storage = mongodb
@@ -37,25 +37,25 @@ installed and running.
     uri = mongodb://127.0.0.1:27017
 
 4. For logging, find the ``[DEFAULT]`` section in
-   ``~/.marconi/marconi.conf`` and modify as desired::
+   ``~/.zaqar/zaqar.conf`` and modify as desired::
 
     log_file = server.log
 
 5. Change directories back to your local copy of the repo::
 
-    $ cd marconi
+    $ cd zaqar
 
 6. Run the following so you can see the results of any changes you
    make to the code without having to reinstall the package each time::
 
     $ pip install -e .
 
-7. Start the Marconi server with logging level set to INFO so you can see
+7. Start the Zaqar server with logging level set to INFO so you can see
    the port on which the server is listening::
 
-    $ marconi-server -v
+    $ zaqar-server -v
 
-8. Test out that Marconi is working by creating a queue::
+8. Test out that Zaqar is working by creating a queue::
 
     $ curl -i -X PUT http://127.0.0.1:8888/v1/queues/samplequeue -H
     "Content-type: application/json"
@@ -86,6 +86,6 @@ You can read more about running functional tests in separate `TESTS_README`_.
 .. _`MongoDB` : http://docs.mongodb.org/manual/installation/
 .. _`pyenv` : https://github.com/yyuu/pyenv/
 .. _`virtualenv` : https://pypi.python.org/pypi/virtualenv/
-.. _`wiki` : https://wiki.openstack.org/wiki/Marconi
-.. _`TESTS_README` : https://github.com/openstack/marconi/blob/master/tests/functional/README.rst
+.. _`wiki` : https://wiki.openstack.org/wiki/Zaqar
+.. _`TESTS_README` : https://github.com/openstack/zaqar/blob/master/tests/functional/README.rst
 
diff --git a/bench-requirements.txt b/bench-requirements.txt
index 14347ef8f..939afe982 100644
--- a/bench-requirements.txt
+++ b/bench-requirements.txt
@@ -2,4 +2,4 @@ argparse>=1.2.1
 gevent>=1.0.1
 marktime>=0.2.0
 psutil>=2.1.1
-python-marconiclient>=0.0.2
+python-zaqarclient>=0.0.2
diff --git a/doc-test.conf b/doc-test.conf
index 1e32a2dba..3245f4c87 100644
--- a/doc-test.conf
+++ b/doc-test.conf
@@ -1,6 +1,6 @@
 [DEFAULT]
 
-repo_name = marconi
+repo_name = zaqar
 api_site=True
 
 file_exception = includewars.xml
diff --git a/doc/pom.xml b/doc/pom.xml
index b5350a368..79e34c8b0 100644
--- a/doc/pom.xml
+++ b/doc/pom.xml
@@ -7,8 +7,8 @@
     <version>1.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <modules>
-        <module>marconi-api-ref</module>
-        <module>marconi-get-started</module>
+        <module>zaqar-api-ref</module>
+        <module>zaqar-get-started</module>
     </modules>
     <profiles>
         <profile>
diff --git a/doc/source/api.rst b/doc/source/api.rst
index 213443d0b..c59d74a1d 100644
--- a/doc/source/api.rst
+++ b/doc/source/api.rst
@@ -11,20 +11,20 @@
       License for the specific language governing permissions and limitations
       under the License.
 
-Using Marconi's Public APIs
-===========================
+Using Zaqar's Public APIs
+=========================
 
-Marconi fully implements version 1.0 of the OpenStack Messaging API by now. 
-Generally, you can use any HTTP client to talk with Marconi public REST API,
-though Marconi client is the recommended approach.
+Zaqar fully implements version 1.0 of the OpenStack Messaging API by now.
+Generally, you can use any HTTP client to talk with Zaqar public REST API,
+though Zaqar client is the recommended approach.
 
 
-Marconi Client
+Zaqar Client
 ############################################
-We can easily access the Marconi REST API via Marconi client. Below is an example
+We can easily access the Zaqar REST API via Zaqar client. Below is an example
 to create a queue, post messages to it and finally delete it::
 
-    from marconiclient.queues.v1 import client
+    from zaqarclient.queues.v1 import client
 
     URL = 'http://localhost:8888'
     messages = [{'body': {'id': idx}, 'ttl': 360} for idx in range(20)]
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 5730feea5..bc03247e9 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Marconi documentation build configuration file, created by
+# Zaqar documentation build configuration file, created by
 # sphinx-quickstart on Sat May  1 15:17:47 2010.
 #
 # This file is execfile()d with the current directory set
@@ -63,14 +63,14 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'marconi'
+project = u'zaqar'
 copyright = u'2010-present, OpenStack Foundation'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
-from marconi.version import version_info
+from zaqar.version import version_info
 # The full version, including alpha/beta/rc tags.
 release = version_info.release_string()
 # The short X.Y version.
@@ -115,7 +115,7 @@ show_authors = False
 pygments_style = 'sphinx'
 
 # A list of ignored prefixes for module index sorting.
-modindex_common_prefix = ['marconi.']
+modindex_common_prefix = ['zaqar.']
 
 # -- Options for man page output ----------------------------------------------
 
@@ -196,7 +196,7 @@ html_last_updated_fmt = os.popen(git_cmd).read()
 #html_file_suffix = ''
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'marconidoc'
+htmlhelp_basename = 'zaqardoc'
 
 
 # -- Options for LaTeX output -------------------------------------------------
@@ -211,7 +211,7 @@ htmlhelp_basename = 'marconidoc'
 # (source start file, target name, title, author, documentclass
 # [howto/manual]).
 latex_documents = [
-    ('index', 'Marconi.tex', u'Marconi Documentation',
+    ('index', 'Zaqar.tex', u'Zaqar Documentation',
      u'Anso Labs, LLC', 'manual'),
 ]
 
diff --git a/doc/source/index.rst b/doc/source/index.rst
index c1c766b69..0227fcdcf 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -11,12 +11,12 @@
       License for the specific language governing permissions and limitations
       under the License.
 
-Welcome to Marconi's documentation!
-===================================
+Welcome to Zaqar's documentation!
+=================================
 
-Marconi is an OpenStack project to provide "Messaging as a service".
+Zaqar is an OpenStack project to provide "Messaging as a service".
 
-Marconi, as with all OpenStack projects, is written with the following design
+Zaqar, as with all OpenStack projects, is written with the following design
 guidelines in mind:
 
 * **Component based architecture**: Quickly add new behaviors
@@ -26,7 +26,7 @@ guidelines in mind:
 * **Open standards**: Be a reference implementation for a community-driven api
 
 This documentation is generated by the Sphinx toolkit and lives in the source
-tree. Additional draft and project documentation on Marconi and other components of OpenStack can
+tree. Additional draft and project documentation on Zaqar and other components of OpenStack can
 be found on the `OpenStack wiki`_. Cloud administrators, refer to `docs.openstack.org`_.
 
 .. _`OpenStack wiki`: http://wiki.openstack.org
@@ -40,26 +40,26 @@ Concepts
 
    glossary
 
-Installing/Configuring Marconi
-==============================
+Installing/Configuring Zaqar
+============================
 
 .. toctree::
    :maxdepth: 1
 
    installing
 
-Operating Marconi
-=================
+Operating Zaqar
+===============
 
 .. toctree::
    :maxdepth: 1
 
    ha
 
-Using Marconi
-=============
+Using Zaqar
+===========
 
 .. toctree::
    :maxdepth: 1
 
-   api
\ No newline at end of file
+   api
diff --git a/doc/source/installing.rst b/doc/source/installing.rst
index 155a84fa6..bed1d04c8 100644
--- a/doc/source/installing.rst
+++ b/doc/source/installing.rst
@@ -115,39 +115,39 @@ Install uwsgi on web servers::
     web# yum -y install python-pip
     web# pip install uwsgi
 
-Configure OpenStack Marconi
-###########################
+Configure OpenStack Zaqar
+#########################
 
 On the web servers run these commands::
 
-    web# git clone https://github.com/openstack/marconi.git .
-    web# pip install . -r ./requirements.txt --upgrade --log /tmp/marconi-pip.log
+    web# git clone https://git.openstack.org/openstack/zaqar.git .
+    web# pip install . -r ./requirements.txt --upgrade --log /tmp/zaqar-pip.log
 
-Create ``/srv/marconi`` folder to store related configuration files.
+Create ``/srv/zaqar`` folder to store related configuration files.
 
-Create ``/srv/marconi/marconi_uwsgi.py`` with the following content::
+Create ``/srv/zaqar/zaqar_uwsgi.py`` with the following content::
 
     from keystoneclient.middleware import auth_token
-    from marconi.transport.wsgi import app
+    from zaqar.transport.wsgi import app
 
     app = auth_token.AuthProtocol(app.app, {})
 
-Create ``/srv/marconi/uwsgi.ini`` file with the following content::
+Create ``/srv/zaqar/uwsgi.ini`` file with the following content::
 
     [uwsgi]
     http = 192.168.192.168:80
-    daemonize = /var/log/marconi.log
-    pidfile = /var/run/marconi.pid
+    daemonize = /var/log/zaqar.log
+    pidfile = /var/run/zaqar.pid
     gevent = 2000
     gevent-monkey-patch = true
     listen = 1024
     enable-threads = true
-    module = marconi_uwsgi:app
+    module = zaqar_uwsgi:app
     workers = 4
 
 The uwsgi configuration options above can be modified for different performance requirements.
 
-Create a Marconi configuration file ``/etc/marconi.conf`` with the following content::
+Create a Zaqar configuration file ``/etc/zaqar.conf`` with the following content::
 
     [DEFAULT]
     # Show more verbose log output (sets INFO log level output)
@@ -161,7 +161,7 @@ Create a Marconi configuration file ``/etc/marconi.conf`` with the following con
     admin_mode    = True
 
     # Log to this file!
-    log_file = /var/log/marconi-queues.log
+    log_file = /var/log/zaqar-queues.log
     debug    = False
     verbose  = False
 
@@ -192,7 +192,7 @@ Create a Marconi configuration file ``/etc/marconi.conf`` with the following con
 
     [drivers:storage:mongodb]
     uri = mongodb://mydb0,mydb1,mydb2:27017/?replicaSet=catalog&w=2&readPreference=secondaryPreferred
-    database = marconi
+    database = zaqar
     partitions = 8
 
     # Maximum number of times to retry a failed operation. Currently
@@ -236,7 +236,7 @@ Create a Marconi configuration file ``/etc/marconi.conf`` with the following con
 
 Start the queuing service::
 
-    #/usr/bin/uwsgi --ini /srv/marconi/uwsgi.ini
+    #/usr/bin/uwsgi --ini /srv/zaqar/uwsgi.ini
 
 
 Configure Pools
diff --git a/doc/wadl/os-marconi-apiRef.wadl b/doc/wadl/os-zaqar-apiRef.wadl
similarity index 99%
rename from doc/wadl/os-marconi-apiRef.wadl
rename to doc/wadl/os-zaqar-apiRef.wadl
index 6ff504113..f8889c13f 100644
--- a/doc/wadl/os-marconi-apiRef.wadl
+++ b/doc/wadl/os-zaqar-apiRef.wadl
@@ -23,7 +23,7 @@
 
 
         <resources base="https://queues.api.openstack.org/"
-                   xml:id="os-marconi-v1">
+                   xml:id="os-zaqar-v1">
                 <resource id="version" path="{version}">
                         <!--    <remark> Project ID is now in a header, not in the URI.         </remark>
                                 <resource id="projectID" path="{projectId}">
diff --git a/doc/marconi-api-ref/os-marconi-apiRef.xml b/doc/zaqar-api-ref/os-zaqar-apiRef.xml
similarity index 98%
rename from doc/marconi-api-ref/os-marconi-apiRef.xml
rename to doc/zaqar-api-ref/os-zaqar-apiRef.xml
index 1837435b5..79cae5589 100644
--- a/doc/marconi-api-ref/os-marconi-apiRef.xml
+++ b/doc/zaqar-api-ref/os-zaqar-apiRef.xml
@@ -5,7 +5,7 @@
   xmlns:svg="http://www.w3.org/2000/svg"
   xmlns:m="http://www.w3.org/1998/Math/MathML"
   xmlns:html="http://www.w3.org/1999/xhtml"
-  version="5.0" xml:id="os-marconi-apiRef">
+  version="5.0" xml:id="os-zaqar-apiRef">
 
   <title>Message Queuing API v1 Reference</title>
   <titleabbrev>Message Queuing API Reference</titleabbrev>
@@ -1641,7 +1641,7 @@ Content-Type: application/json
           OpenStack and may change.</para>
       </note>
       <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
-        <wadl:resource href="../wadl/os-marconi-apiRef.wadl#version">
+        <wadl:resource href="../wadl/os-zaqar-apiRef.wadl#version">
           <wadl:method href="getHomeDocument"/>
         </wadl:resource>
       </wadl:resources>
@@ -1651,12 +1651,12 @@ Content-Type: application/json
       <para>This section describes queue operations that are supported by the Message Queuing
         API.</para>
       <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
-        <wadl:resource href="../wadl/os-marconi-apiRef.wadl#queues">
+        <wadl:resource href="../wadl/os-zaqar-apiRef.wadl#queues">
           <wadl:method href="listQueues"/>
         </wadl:resource>
-        <wadl:resource href="../wadl/os-marconi-apiRef.wadl#queue"/>
-        <wadl:resource href="../wadl/os-marconi-apiRef.wadl#metadata"/>
-        <wadl:resource href="../wadl/os-marconi-apiRef.wadl#stats"/>
+        <wadl:resource href="../wadl/os-zaqar-apiRef.wadl#queue"/>
+        <wadl:resource href="../wadl/os-zaqar-apiRef.wadl#metadata"/>
+        <wadl:resource href="../wadl/os-zaqar-apiRef.wadl#stats"/>
       </wadl:resources>
     </section>
     <section xml:id="message-operations-dle001">
@@ -1671,8 +1671,8 @@ Content-Type: application/json
           Client-ID in <xref linkend="commonHeaders"/>.</para>
       </note>
       <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
-        <wadl:resource href="../wadl/os-marconi-apiRef.wadl#messages"/>
-        <wadl:resource href="../wadl/os-marconi-apiRef.wadl#message"/>
+        <wadl:resource href="../wadl/os-zaqar-apiRef.wadl#messages"/>
+        <wadl:resource href="../wadl/os-zaqar-apiRef.wadl#message"/>
       </wadl:resources>
     </section>
     <section xml:id="claims-operations-dle001">
@@ -1680,8 +1680,8 @@ Content-Type: application/json
       <para>This section describes claim operations that are supported by the Message Queuing
         API.</para>
       <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
-        <wadl:resource href="../wadl/os-marconi-apiRef.wadl#claims"/>
-        <wadl:resource href="../wadl/os-marconi-apiRef.wadl#claim"/>
+        <wadl:resource href="../wadl/os-zaqar-apiRef.wadl#claims"/>
+        <wadl:resource href="../wadl/os-zaqar-apiRef.wadl#claim"/>
       </wadl:resources>
     </section>
   </chapter>
diff --git a/doc/marconi-api-ref/pom.xml b/doc/zaqar-api-ref/pom.xml
similarity index 89%
rename from doc/marconi-api-ref/pom.xml
rename to doc/zaqar-api-ref/pom.xml
index 8e95d721a..555e08861 100644
--- a/doc/marconi-api-ref/pom.xml
+++ b/doc/zaqar-api-ref/pom.xml
@@ -8,7 +8,7 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>marconi-api-ref</artifactId>
+    <artifactId>zaqar-api-ref</artifactId>
     <packaging>jar</packaging>
     <name>Message Queuing API v1 Reference</name>
     <properties>
@@ -30,7 +30,7 @@
                         </goals>
                         <phase>generate-sources</phase>
                         <configuration>
-                            <includes> os-marconi-apiRef.xml </includes>
+                            <includes> os-zaqar-apiRef.xml </includes>
                             <generateToc> appendix toc,title
                                 article/appendix nop
                                 article toc,title
@@ -42,8 +42,8 @@
                                 qandaset toc
                                 reference toc,title
                                 set toc,title </generateToc>
-                            <webhelpDirname>marconi-api-ref</webhelpDirname>
-                            <pdfFilenameBase>marconi-api-ref</pdfFilenameBase>
+                            <webhelpDirname>zaqar-api-ref</webhelpDirname>
+                            <pdfFilenameBase>zaqar-api-ref</pdfFilenameBase>
                         </configuration>
                     </execution>
                 </executions>
@@ -59,7 +59,7 @@
                     <highlightSource>false</highlightSource>
                     <xincludeSupported>true</xincludeSupported>
                     <sourceDirectory>.</sourceDirectory>
-                    <canonicalUrlBase>http://docs.openstack.org/marconi-api-ref/content/</canonicalUrlBase>
+                    <canonicalUrlBase>http://docs.openstack.org/zaqar-api-ref/content/</canonicalUrlBase>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/doc/marconi-get-started/os-marconi-apiGettingStarted.xml b/doc/zaqar-get-started/os-zaqar-apiGettingStarted.xml
similarity index 99%
rename from doc/marconi-get-started/os-marconi-apiGettingStarted.xml
rename to doc/zaqar-get-started/os-zaqar-apiGettingStarted.xml
index deee88962..9018b62cb 100644
--- a/doc/marconi-get-started/os-marconi-apiGettingStarted.xml
+++ b/doc/zaqar-get-started/os-zaqar-apiGettingStarted.xml
@@ -95,7 +95,7 @@
             them as the tasks are needed and performed.</para>
         <para>Message Queuing handles the distribution of tasks, but it does not necessarily manage
             the order of the tasks. Applications handle the workflow at a higher level.</para>
-        <para>Message Queuing is based on the OpenStack Marconi project.</para>
+        <para>Message Queuing is based on the OpenStack Zaqar project.</para>
         <para>This guide explains how to access and start using the API so that you can begin to use
             Message Queuing for your applications. Instructions are given for how to properly enter
             the necessary URLs, using cURL, to set up and use a basic set of Message Queuing
@@ -987,10 +987,10 @@ X-Project-Id: <emphasis role="bold">your_project_ID</emphasis>
         <para>For more information about using the API, see the <citetitle>Message Queuing API v1
                 Reference</citetitle>. All you need to get started with Message Queuing is the
             getting started guide, the reference, and your Cloud account.</para>
-        <para>For information about the OpenStack Marconi API, see
+        <para>For information about the OpenStack Zaqar API, see
                 <link
-                xlink:href="https://wiki.openstack.org/wiki/Marconi/specs/api/v1"
-                >wiki.openstack.org/wiki/Marconi/specs/api/v1</link>.</para>
+                xlink:href="https://wiki.openstack.org/wiki/Zaqar/specs/api/v1"
+                >wiki.openstack.org/wiki/Zaqar/specs/api/v1</link>.</para>
         <para>This API uses standard HTTP 1.1 response codes as
             documented at <link
                 xlink:href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html"
diff --git a/doc/marconi-get-started/pom.xml b/doc/zaqar-get-started/pom.xml
similarity index 89%
rename from doc/marconi-get-started/pom.xml
rename to doc/zaqar-get-started/pom.xml
index 45bd9f41f..6a2724ed2 100644
--- a/doc/marconi-get-started/pom.xml
+++ b/doc/zaqar-get-started/pom.xml
@@ -8,7 +8,7 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>marconi-get-started</artifactId>
+    <artifactId>zaqar-get-started</artifactId>
     <packaging>jar</packaging>
     <name>Message Queuing API v1 Getting Started</name>
     <properties>
@@ -31,7 +31,7 @@
                         <phase>generate-sources</phase>
                         <configuration>
                             <includes>
-                                os-marconi-apiGettingStarted.xml </includes>
+                                os-zaqar-apiGettingStarted.xml </includes>
                             <generateToc> appendix toc,title
                                 article/appendix nop
                                 article toc,title
@@ -43,8 +43,8 @@
                                 qandaset to
                                 reference toc,title
                                 set toc,title </generateToc>
-                            <webhelpDirname>marconi-get-started</webhelpDirname>
-                            <pdfFilenameBase>marconi-get-started</pdfFilenameBase>
+                            <webhelpDirname>zaqar-get-started</webhelpDirname>
+                            <pdfFilenameBase>zaqar-get-started</pdfFilenameBase>
                         </configuration>
                     </execution>
                 </executions>
@@ -60,7 +60,7 @@
                     <highlightSource>false</highlightSource>
                     <xincludeSupported>true</xincludeSupported>
                     <sourceDirectory>.</sourceDirectory>
-                    <canonicalUrlBase>http://docs.openstack.org/marconi-getting-started/content/</canonicalUrlBase>
+                    <canonicalUrlBase>http://docs.openstack.org/zaqar-getting-started/content/</canonicalUrlBase>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/etc/logging.conf.sample b/etc/logging.conf.sample
index 4c3f0f628..54d75b190 100644
--- a/etc/logging.conf.sample
+++ b/etc/logging.conf.sample
@@ -14,12 +14,12 @@ handlers=devel
 [logger_server]
 level=DEBUG
 handlers=devel
-qualname=marconi-server
+qualname=zaqar-server
 
 [logger_combined]
 level=DEBUG
 handlers=devel
-qualname=marconi-combined
+qualname=zaqar-combined
 
 [handler_production]
 class=handlers.SysLogHandler
@@ -31,7 +31,7 @@ args=(('localhost', handlers.SYSLOG_UDP_PORT), handlers.SysLogHandler.LOG_USER)
 class=FileHandler
 level=DEBUG
 formatter=normal_with_name
-args=('marconi.log', 'w')
+args=('zaqar.log', 'w')
 
 [handler_devel]
 class=StreamHandler
diff --git a/etc/marconi.conf.sample b/etc/marconi.conf.sample
index 850b4583e..a8cc0576e 100644
--- a/etc/marconi.conf.sample
+++ b/etc/marconi.conf.sample
@@ -1,7 +1,7 @@
 [DEFAULT]
 
 #
-# Options defined in marconi.transport.base
+# Options defined in zaqar.transport.base
 #
 
 # Backend to use for authentication. For no auth, keep it
@@ -11,7 +11,7 @@
 
 
 #
-# Options defined in marconi.bootstrap
+# Options defined in zaqar.bootstrap
 #
 
 # Enable pooling across multiple storage backends. If
@@ -25,7 +25,7 @@
 
 
 #
-# Options defined in marconi.openstack.common.lockutils
+# Options defined in zaqar.openstack.common.lockutils
 #
 
 # Whether to disable inter-process locks (boolean value)
@@ -36,7 +36,7 @@
 
 
 #
-# Options defined in marconi.openstack.common.log
+# Options defined in zaqar.openstack.common.log
 #
 
 # Print debugging output (set logging level to DEBUG instead
@@ -130,7 +130,7 @@
 [drivers]
 
 #
-# Options defined in marconi.bootstrap
+# Options defined in zaqar.bootstrap
 #
 
 # Transport driver to use. (string value)
@@ -143,7 +143,7 @@
 [drivers:storage:mongodb]
 
 #
-# Options defined in marconi.storage.mongodb
+# Options defined in zaqar.storage.mongodb
 #
 
 # Mongodb Connection URI. If ssl connection enabled,
@@ -177,7 +177,7 @@
 #ssl_ca_certs=<None>
 
 # Database name. (string value)
-#database=marconi
+#database=zaqar
 
 # Number of databases across which to partition message data,
 # in order to reduce writer lock %. DO NOT change this setting
@@ -216,7 +216,7 @@
 [drivers:storage:sqlalchemy]
 
 #
-# Options defined in marconi.storage.sqlalchemy
+# Options defined in zaqar.storage.sqlalchemy
 #
 
 # An sqlalchemy URL (string value)
@@ -357,7 +357,7 @@
 [pooling:catalog]
 
 #
-# Options defined in marconi.storage.pooling
+# Options defined in zaqar.storage.pooling
 #
 
 # Catalog storage driver. (integer value)
diff --git a/etc/zaqar.conf.sample b/etc/zaqar.conf.sample
new file mode 100644
index 000000000..a8cc0576e
--- /dev/null
+++ b/etc/zaqar.conf.sample
@@ -0,0 +1,363 @@
+[DEFAULT]
+
+#
+# Options defined in zaqar.transport.base
+#
+
+# Backend to use for authentication. For no auth, keep it
+# empty. Existing strategies: keystone. See also the
+# keystone_authtoken section below (string value)
+#auth_strategy=
+
+
+#
+# Options defined in zaqar.bootstrap
+#
+
+# Enable pooling across multiple storage backends. If
+# pooling is enabled, the storage driver configuration is
+# used to determine where the catalogue/control plane data
+# is kept. (boolean value)
+#pooling=false
+
+# Activate endpoints to manage pool registry. (boolean value)
+#admin_mode=false
+
+
+#
+# Options defined in zaqar.openstack.common.lockutils
+#
+
+# Whether to disable inter-process locks (boolean value)
+#disable_process_locking=false
+
+# Directory to use for lock files. (string value)
+#lock_path=<None>
+
+
+#
+# Options defined in zaqar.openstack.common.log
+#
+
+# Print debugging output (set logging level to DEBUG instead
+# of default WARNING level). (boolean value)
+#debug=false
+
+# Print more verbose output (set logging level to INFO instead
+# of default WARNING level). (boolean value)
+#verbose=false
+
+# Log output to standard error (boolean value)
+#use_stderr=true
+
+# Format string to use for log messages with context (string
+# value)
+#logging_context_format_string=%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s
+
+# Format string to use for log messages without context
+# (string value)
+#logging_default_format_string=%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s
+
+# Data to append to log format when level is DEBUG (string
+# value)
+#logging_debug_format_suffix=%(funcName)s %(pathname)s:%(lineno)d
+
+# Prefix each line of exception output with this format
+# (string value)
+#logging_exception_prefix=%(asctime)s.%(msecs)03d %(process)d TRACE %(name)s %(instance)s
+
+# List of logger=LEVEL pairs (list value)
+#default_log_levels=amqp=WARN,amqplib=WARN,boto=WARN,qpid=WARN,sqlalchemy=WARN,suds=INFO,iso8601=WARN,requests.packages.urllib3.connectionpool=WARN
+
+# Publish error events (boolean value)
+#publish_errors=false
+
+# Make deprecations fatal (boolean value)
+#fatal_deprecations=false
+
+# If an instance is passed with the log message, format it
+# like this (string value)
+#instance_format="[instance: %(uuid)s] "
+
+# If an instance UUID is passed with the log message, format
+# it like this (string value)
+#instance_uuid_format="[instance: %(uuid)s] "
+
+# The name of logging configuration file. It does not disable
+# existing loggers, but just appends specified logging
+# configuration to any other existing logging options. Please
+# see the Python logging module documentation for details on
+# logging configuration files. (string value)
+# Deprecated group/name - [DEFAULT]/log_config
+#log_config_append=<None>
+
+# DEPRECATED. A logging.Formatter log message format string
+# which may use any of the available logging.LogRecord
+# attributes. This option is deprecated.  Please use
+# logging_context_format_string and
+# logging_default_format_string instead. (string value)
+#log_format=<None>
+
+# Format string for %%(asctime)s in log records. Default:
+# %(default)s (string value)
+#log_date_format=%Y-%m-%d %H:%M:%S
+
+# (Optional) Name of log file to output to. If no default is
+# set, logging will go to stdout. (string value)
+# Deprecated group/name - [DEFAULT]/logfile
+#log_file=<None>
+
+# (Optional) The base directory used for relative --log-file
+# paths (string value)
+# Deprecated group/name - [DEFAULT]/logdir
+#log_dir=<None>
+
+# Use syslog for logging. Existing syslog format is DEPRECATED
+# during I, and then will be changed in J to honor RFC5424
+# (boolean value)
+#use_syslog=false
+
+# (Optional) Use syslog rfc5424 format for logging. If
+# enabled, will add APP-NAME (RFC5424) before the MSG part of
+# the syslog message.  The old format without APP-NAME is
+# deprecated in I, and will be removed in J. (boolean value)
+#use_syslog_rfc_format=false
+
+# Syslog facility to receive log lines (string value)
+#syslog_log_facility=LOG_USER
+
+
+[drivers]
+
+#
+# Options defined in zaqar.bootstrap
+#
+
+# Transport driver to use. (string value)
+#transport=wsgi
+
+# Storage driver to use. (string value)
+#storage=sqlite
+
+
+[drivers:storage:mongodb]
+
+#
+# Options defined in zaqar.storage.mongodb
+#
+
+# Mongodb Connection URI. If ssl connection enabled,
+# then the following 'ssl_keyfile', 'ssl_certfile',
+# 'ssl_cert_reqs', 'ssl_ca_certs' need to be set accordingly.
+# (string value)
+#uri=<None>
+
+# The private keyfile used to identify the local connection
+# against mongod. If included with the 'certifle' then only
+# the ssl_certfile is needed. (string value)
+#ssl_keyfile=<None>
+
+# The certificate file used to identify the local connection
+# against mongod. (string value)
+#ssl_certfile=<None>
+
+# Specifies whether a certificate is required from the other
+# side of the connection, and whether it will be validated
+# if provided. It must be one of the three values 'CERT_NONE'
+# (certificates ignored), 'CERT_OPTIONAL'(not required, but
+# validated if provided), or 'CERT_REQUIRED'(required and validated).
+# If the value of this parameter is not 'CERT_NONE', then the
+# 'ssl_ca_certs' parameter must point to a file of CA certificates.
+# (string value)
+#ssl_cert_reqs=CERT_REQUIRED
+
+# The ca_certs file contains a set of concatenated certification
+# authority certificates, which are used to validate certificates
+# passed from the other end of the connection. (string value)
+#ssl_ca_certs=<None>
+
+# Database name. (string value)
+#database=zaqar
+
+# Number of databases across which to partition message data,
+# in order to reduce writer lock %. DO NOT change this setting
+# after initial deployment. It MUST remain static. Also, you
+# should not need a large number of partitions to improve
+# performance, esp. if deploying MongoDB on SSD storage.
+# (integer value)
+#partitions=2
+
+# Maximum number of times to retry a failed operation.
+# Currently only used for retrying a message post. (integer
+# value)
+#max_attempts=1000
+
+# Maximum sleep interval between retries (actual sleep time
+# increases linearly according to number of attempts
+# performed). (floating point value)
+#max_retry_sleep=0.1
+
+# Maximum jitter interval, to be added to the sleep interval,
+# in order to decrease probability that parallel requests will
+# retry at the same instant. (floating point value)
+#max_retry_jitter=0.005
+
+# Maximum number of times to retry an operation that failed
+# due to a primary node failover. (integer value)
+#max_reconnect_attempts=10
+
+# Base sleep interval between attempts to reconnect after a
+# primary node failover. The actual sleep time increases
+# exponentially (power of 2) each time the operation is
+# retried. (floating point value)
+#reconnect_sleep=0.02
+
+
+[drivers:storage:sqlalchemy]
+
+#
+# Options defined in zaqar.storage.sqlalchemy
+#
+
+# An sqlalchemy URL (string value)
+#uri=sqlite:///:memory:
+
+
+[keystone_authtoken]
+
+#
+# Options defined in keystoneclient.middleware.auth_token
+#
+
+# Prefix to prepend at the beginning of the path (string
+# value)
+#auth_admin_prefix=
+
+# Host providing the admin Identity API endpoint (string
+# value)
+#auth_host=127.0.0.1
+
+# Port of the admin Identity API endpoint (integer value)
+#auth_port=35357
+
+# Protocol of the admin Identity API endpoint(http or https)
+# (string value)
+#auth_protocol=https
+
+# Complete public Identity API endpoint (string value)
+#auth_uri=<None>
+
+# API version of the admin Identity API endpoint (string
+# value)
+#auth_version=<None>
+
+# Do not handle authorization requests within the middleware,
+# but delegate the authorization decision to downstream WSGI
+# components (boolean value)
+#delay_auth_decision=false
+
+# Request timeout value for communicating with Identity API
+# server. (boolean value)
+#http_connect_timeout=<None>
+
+# How many times are we trying to reconnect when communicating
+# with Identity API Server. (integer value)
+#http_request_max_retries=3
+
+# Allows to pass in the name of a fake http_handler callback
+# function used instead of httplib.HTTPConnection or
+# httplib.HTTPSConnection. Useful for unit testing where
+# network is not available. (string value)
+#http_handler=<None>
+
+# Single shared secret with the Keystone configuration used
+# for bootstrapping a Keystone installation, or otherwise
+# bypassing the normal authentication process. (string value)
+#admin_token=<None>
+
+# Keystone account username (string value)
+#admin_user=<None>
+
+# Keystone account password (string value)
+#admin_password=<None>
+
+# Keystone service account tenant name to validate user tokens
+# (string value)
+#admin_tenant_name=admin
+
+# Env key for the swift cache (string value)
+#cache=<None>
+
+# Required if Keystone server requires client certificate
+# (string value)
+#certfile=<None>
+
+# Required if Keystone server requires client certificate
+# (string value)
+#keyfile=<None>
+
+# A PEM encoded Certificate Authority to use when verifying
+# HTTPs connections. Defaults to system CAs. (string value)
+#cafile=<None>
+
+# Verify HTTPS connections. (boolean value)
+#insecure=false
+
+# Directory used to cache files related to PKI tokens (string
+# value)
+#signing_dir=<None>
+
+# If defined, the memcache server(s) to use for caching (list
+# value)
+# Deprecated group/name - [DEFAULT]/memcache_servers
+#memcached_servers=<None>
+
+# In order to prevent excessive requests and validations, the
+# middleware uses an in-memory cache for the tokens the
+# Keystone API returns. This is only valid if memcache_servers
+# is defined. Set to -1 to disable caching completely.
+# (integer value)
+#token_cache_time=300
+
+# Value only used for unit testing (integer value)
+#revocation_cache_time=1
+
+# (optional) if defined, indicate whether token data should be
+# authenticated or authenticated and encrypted. Acceptable
+# values are MAC or ENCRYPT.  If MAC, token data is
+# authenticated (with HMAC) in the cache. If ENCRYPT, token
+# data is encrypted and authenticated in the cache. If the
+# value is not one of these options or empty, auth_token will
+# raise an exception on initialization. (string value)
+#memcache_security_strategy=<None>
+
+# (optional, mandatory if memcache_security_strategy is
+# defined) this string is used for key derivation. (string
+# value)
+#memcache_secret_key=<None>
+
+# (optional) indicate whether to set the X-Service-Catalog
+# header. If False, middleware will not ask for service
+# catalog on token validation and will not set the X-Service-
+# Catalog header. (boolean value)
+#include_service_catalog=true
+
+# Used to control the use and type of token binding. Can be
+# set to: "disabled" to not check token binding. "permissive"
+# (default) to validate binding information if the bind type
+# is of a form known to the server and ignore it if not.
+# "strict" like "permissive" but if the bind type is unknown
+# the token will be rejected. "required" any form of token
+# binding is needed to be allowed. Finally the name of a
+# binding method that must be present in tokens. (string
+# value)
+#enforce_token_bind=permissive
+
+
+[pooling:catalog]
+
+#
+# Options defined in zaqar.storage.pooling
+#
+
+# Catalog storage driver. (integer value)
diff --git a/openstack-common.conf b/openstack-common.conf
index 7bdc40943..74e1ce1ed 100644
--- a/openstack-common.conf
+++ b/openstack-common.conf
@@ -14,4 +14,4 @@ module=timeutils
 module=version
 
 # Base module
-base=marconi
+base=zaqar
diff --git a/setup.cfg b/setup.cfg
index 36fc576d1..f0da8256d 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [metadata]
-name = marconi
+name = zaqar
 
 # Juno
 version = 2014.2
@@ -23,7 +23,7 @@ classifier =
 
 [files]
 packages =
-    marconi
+    zaqar
 
 [build_sphinx]
 all_files = 1
@@ -32,41 +32,42 @@ source-dir = doc/source
 
 [entry_points]
 console_scripts =
-    marconi-bench-pc = marconi.bench.conductor:main
-    marconi-server = marconi.cmd.server:run
+    zaqar-bench-pc = zaqar.bench.conductor:main
+    zaqar-server = zaqar.cmd.server:run
+    marconi-server = zaqar.cmd.server:run
 
-marconi.queues.data.storage =
+zaqar.queues.data.storage =
     # NOTE(flaper87): sqlite points to sqla for backwards compatibility
-    sqlite = marconi.queues.storage.sqlalchemy.driver:DataDriver
-    sqlalchemy = marconi.queues.storage.sqlalchemy.driver:DataDriver
-    mongodb = marconi.queues.storage.mongodb.driver:DataDriver
-    faulty = marconi.tests.faulty_storage:DataDriver
+    sqlite = zaqar.queues.storage.sqlalchemy.driver:DataDriver
+    sqlalchemy = zaqar.queues.storage.sqlalchemy.driver:DataDriver
+    mongodb = zaqar.queues.storage.mongodb.driver:DataDriver
+    faulty = zaqar.tests.faulty_storage:DataDriver
 
-marconi.queues.control.storage =
-    sqlite = marconi.queues.storage.sqlalchemy.driver:ControlDriver
-    sqlalchemy = marconi.queues.storage.sqlalchemy.driver:ControlDriver
-    mongodb = marconi.queues.storage.mongodb.driver:ControlDriver
-    faulty = marconi.tests.faulty_storage:ControlDriver
+zaqar.queues.control.storage =
+    sqlite = zaqar.queues.storage.sqlalchemy.driver:ControlDriver
+    sqlalchemy = zaqar.queues.storage.sqlalchemy.driver:ControlDriver
+    mongodb = zaqar.queues.storage.mongodb.driver:ControlDriver
+    faulty = zaqar.tests.faulty_storage:ControlDriver
 
-marconi.queues.transport =
-    wsgi = marconi.queues.transport.wsgi.driver:Driver
+zaqar.queues.transport =
+    wsgi = zaqar.queues.transport.wsgi.driver:Driver
 
-marconi.openstack.common.cache.backends =
-    memory = marconi.openstack.common.cache._backends.memory:MemoryBackend
+zaqar.openstack.common.cache.backends =
+    memory = zaqar.openstack.common.cache._backends.memory:MemoryBackend
 
 oslo.config.opts =
-    marconi.bootstrap = marconi.queues.bootstrap:_config_options
-    marconi.storage.base = marconi.queues.storage.base:_config_options
-    marconi.storage.pipeline = marconi.queues.storage.pipeline:_config_options
-    marconi.storage.pooling = marconi.queues.storage.pooling:_config_options
-    marconi.storage.mongodb = marconi.queues.storage.mongodb.options:_config_options
+    zaqar.bootstrap = zaqar.queues.bootstrap:_config_options
+    zaqar.storage.base = zaqar.queues.storage.base:_config_options
+    zaqar.storage.pipeline = zaqar.queues.storage.pipeline:_config_options
+    zaqar.storage.pooling = zaqar.queues.storage.pooling:_config_options
+    zaqar.storage.mongodb = zaqar.queues.storage.mongodb.options:_config_options
 
     # NOTE(flaper87): sqlite points to sqla for backwards compatibility
-    marconi.storage.sqlite = marconi.queues.storage.sqlalchemy.options:_config_options
-    marconi.storage.sqlalchemy = marconi.queues.storage.sqlalchemy.options:_config_options
-    marconi.transport.wsgi = marconi.queues.transport.wsgi.v1_0.driver:_config_options
-    marconi.transport.base = marconi.queues.transport.base:_config_options
-    marconi.transport.validation = marconi.queues.transport.validation:_config_options
+    zaqar.storage.sqlite = zaqar.queues.storage.sqlalchemy.options:_config_options
+    zaqar.storage.sqlalchemy = zaqar.queues.storage.sqlalchemy.options:_config_options
+    zaqar.transport.wsgi = zaqar.queues.transport.wsgi.v1_0.driver:_config_options
+    zaqar.transport.base = zaqar.queues.transport.base:_config_options
+    zaqar.transport.validation = zaqar.queues.transport.validation:_config_options
 
 [nosetests]
 where=tests
@@ -74,7 +75,7 @@ verbosity=2
 
 with-doctest = true
 
-cover-package = marconi
+cover-package = zaqar
 cover-html = true
 cover-erase = true
 cover-inclusive = true
@@ -93,15 +94,15 @@ cover-inclusive = true
 warnerrors = True
 
 [compile_catalog]
-directory = marconi/locale
-domain = marconi
+directory = zaqar/locale
+domain = zaqar
 
 [update_catalog]
-domain = marconi
-output_dir = marconi/locale
-input_file = marconi/locale/marconi.pot
+domain = zaqar
+output_dir = zaqar/locale
+input_file = zaqar/locale/zaqar.pot
 
 [extract_messages]
 keywords = _ gettext ngettext l_ lazy_gettext
 mapping_file = babel.cfg
-output_file = marconi/locale/marconi.pot
+output_file = zaqar/locale/zaqar.pot
diff --git a/tests/__init__.py b/tests/__init__.py
index 93cf1580b..d69a0092d 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -17,7 +17,7 @@ import os
 
 
 tests_dir = os.path.abspath(os.path.dirname(__file__))
-os.environ.setdefault("MARCONI_TESTS_DIR", tests_dir)
+os.environ.setdefault("ZAQAR_TESTS_DIR", tests_dir)
 
-if "MARCONI_TESTS_CONFIGS_DIR" not in os.environ:
-    os.environ["MARCONI_TESTS_CONFIGS_DIR"] = os.path.join(tests_dir, "etc")
+if "ZAQAR_TESTS_CONFIGS_DIR" not in os.environ:
+    os.environ["ZAQAR_TESTS_CONFIGS_DIR"] = os.path.join(tests_dir, "etc")
diff --git a/tests/etc/functional-tests.conf b/tests/etc/functional-tests.conf
index 39bdb1651..8558f7fbc 100644
--- a/tests/etc/functional-tests.conf
+++ b/tests/etc/functional-tests.conf
@@ -7,10 +7,10 @@
 # username = None
 # password = None
 
-[marconi]
+[zaqar]
 # run_server = True
 # url = http://0.0.0.0:8888
-# config = functional-marconi.conf
+# config = functional-zaqar.conf
 
 [headers]
 # useragent = FunctionalTests
diff --git a/tests/etc/functional-marconi.conf b/tests/etc/functional-zaqar.conf
similarity index 96%
rename from tests/etc/functional-marconi.conf
rename to tests/etc/functional-zaqar.conf
index 40077f091..613c37105 100644
--- a/tests/etc/functional-marconi.conf
+++ b/tests/etc/functional-zaqar.conf
@@ -6,7 +6,7 @@ verbose = True
 debug = True
 
 # Log to this file!
-; log_file = /var/log/marconi/server.log
+; log_file = /var/log/zaqar/server.log
 
 ;auth_strategy =
 
diff --git a/tests/etc/wsgi_mongodb.conf b/tests/etc/wsgi_mongodb.conf
index 1cdc042a1..8b5cdf2fc 100644
--- a/tests/etc/wsgi_mongodb.conf
+++ b/tests/etc/wsgi_mongodb.conf
@@ -11,6 +11,6 @@ port = 8888
 
 [drivers:storage:mongodb]
 uri = mongodb://127.0.0.1:27017
-database = marconi_test
+database = zaqar_test
 max_reconnect_attempts = 3
 reconnect_sleep = 0.001
\ No newline at end of file
diff --git a/tests/etc/wsgi_mongodb_pooled.conf b/tests/etc/wsgi_mongodb_pooled.conf
index a97c34897..7d5b64059 100644
--- a/tests/etc/wsgi_mongodb_pooled.conf
+++ b/tests/etc/wsgi_mongodb_pooled.conf
@@ -7,4 +7,4 @@ storage = mongodb
 
 [drivers:storage:mongodb]
 uri = mongodb://127.0.0.1:27017
-database = marconi_test
+database = zaqar_test
diff --git a/tests/functional/README.rst b/tests/functional/README.rst
index a75d66c3e..44279a5c6 100644
--- a/tests/functional/README.rst
+++ b/tests/functional/README.rst
@@ -1,7 +1,7 @@
-Marconi Functional Tests
-====================
+Zaqar Functional Tests
+======================
 
-Marconi's functional tests treat Marconi as a black box. In other
+Zaqar's functional tests treat Zaqar as a black box. In other
 words, the API calls attempt to simulate an actual user. Unlike unit tests,
 the functional tests do not use mockendpoints.
 
@@ -9,10 +9,10 @@ the functional tests do not use mockendpoints.
 Running functional tests (With Tox)
 -----------------------------------
 
-#. Setup a Marconi server. Refer to the Marconi `README`_ on
-   how to run Marconi locally, or simply use an existing server.
+#. Setup a Zaqar server. Refer to the Zaqar `README`_ on
+   how to run Zaqar locally, or simply use an existing server.
 
-#. Change `$MARCONI_TESTS_CONFIGS_DIR/functional-tests.conf` and
+#. Change `$ZAQAR_TESTS_CONFIGS_DIR/functional-tests.conf` and
    set `run_tests` to True.
 
 #. Run tests. ::
@@ -30,8 +30,8 @@ Running functional tests (With Tox)
 Running the Functional Tests (Without Tox)
 ------------------------------------------
 
-#. Setup a Marconi server. Refer to the Marconi `README`_ on
-   how to run Marconi locally, or simply use an existing server.
+#. Setup a Zaqar server. Refer to the Zaqar `README`_ on
+   how to run Zaqar locally, or simply use an existing server.
 
 #. Install functional tests dependencies. ::
 
@@ -58,5 +58,5 @@ Adding New Tests
     messages/test_messages.py
     claim/test_claims.py
 
-.. _README : https://github.com/openstack/marconi/blob/master/README.rst
+.. _README : https://github.com/openstack/zaqar/blob/master/README.rst
 .. _requests : https://pypi.python.org/pypi/requests
diff --git a/tests/functional/wsgi/v1/test_claims.py b/tests/functional/wsgi/v1/test_claims.py
index c2e117404..447b23cd0 100644
--- a/tests/functional/wsgi/v1/test_claims.py
+++ b/tests/functional/wsgi/v1/test_claims.py
@@ -17,22 +17,22 @@ import uuid
 
 import ddt
 
-from marconi.tests.functional import base
-from marconi.tests.functional import helpers
+from zaqar.tests.functional import base
+from zaqar.tests.functional import helpers
 
 
 @ddt.ddt
 class TestClaims(base.V1FunctionalTestBase):
     """Tests for Claims."""
 
-    server_class = base.MarconiServer
+    server_class = base.ZaqarServer
 
     def setUp(self):
         super(TestClaims, self).setUp()
 
         self.queue = uuid.uuid1()
         self.queue_url = ("{url}/{version}/queues/{queue}".format(
-                          url=self.cfg.marconi.url,
+                          url=self.cfg.zaqar.url,
                           version="v1",
                           queue=self.queue))
 
@@ -81,7 +81,7 @@ class TestClaims(base.V1FunctionalTestBase):
 
         location = result.headers['Location']
 
-        url = self.cfg.marconi.url + location
+        url = self.cfg.zaqar.url + location
 
         result = self.client.get(url)
         self.assertEqual(result.status_code, 200)
@@ -93,7 +93,7 @@ class TestClaims(base.V1FunctionalTestBase):
     def test_claim_more_than_allowed(self):
         """Claim more than max allowed per request.
 
-        Marconi allows a maximum of 20 messages per claim by default.
+        Zaqar allows a maximum of 20 messages per claim by default.
         """
         params = {"limit": self.limits.max_messages_per_claim_or_pop + 1}
         doc = {"ttl": 300, "grace": 100}
@@ -113,7 +113,7 @@ class TestClaims(base.V1FunctionalTestBase):
 
         # Patch Claim
         claim_location = result.headers['Location']
-        url = self.cfg.marconi.url + claim_location
+        url = self.cfg.zaqar.url + claim_location
         doc_updated = {"ttl": 300}
 
         result = self.client.patch(url, data=doc_updated)
@@ -137,7 +137,7 @@ class TestClaims(base.V1FunctionalTestBase):
         # Delete Claimed Messages
         for rst in result.json():
             href = rst['href']
-            url = self.cfg.marconi.url + href
+            url = self.cfg.zaqar.url + href
             result = self.client.delete(url)
             self.assertEqual(result.status_code, 204)
 
@@ -152,7 +152,7 @@ class TestClaims(base.V1FunctionalTestBase):
 
         # Extract claim location and construct the claim URL.
         location = result.headers['Location']
-        url = self.cfg.marconi.url + location
+        url = self.cfg.zaqar.url + location
 
         # Release Claim.
         result = self.client.delete(url)
@@ -219,7 +219,7 @@ class TestClaims(base.V1FunctionalTestBase):
 
         # Extract claim location and construct the claim URL.
         location = result.headers['Location']
-        url = self.cfg.marconi.url + location
+        url = self.cfg.zaqar.url + location
 
         # Patch Claim.
         doc = {"ttl": ttl}
diff --git a/tests/functional/wsgi/v1/test_messages.py b/tests/functional/wsgi/v1/test_messages.py
index 3cf3b752d..4c4c89ebd 100644
--- a/tests/functional/wsgi/v1/test_messages.py
+++ b/tests/functional/wsgi/v1/test_messages.py
@@ -19,8 +19,8 @@ import uuid
 
 import ddt
 
-from marconi.tests.functional import base
-from marconi.tests.functional import helpers
+from zaqar.tests.functional import base
+from zaqar.tests.functional import helpers
 
 
 @ddt.ddt
@@ -28,14 +28,14 @@ class TestMessages(base.V1FunctionalTestBase):
 
     """Tests for Messages."""
 
-    server_class = base.MarconiServer
+    server_class = base.ZaqarServer
 
     def setUp(self):
         super(TestMessages, self).setUp()
 
         self.queue = uuid.uuid1()
         self.queue_url = ("{url}/{version}/queues/{queue}".format(
-                          url=self.cfg.marconi.url,
+                          url=self.cfg.zaqar.url,
                           version="v1",
                           queue=self.queue))
 
@@ -76,7 +76,7 @@ class TestMessages(base.V1FunctionalTestBase):
 
         # GET on posted message
         href = result.json()['resources'][0]
-        url = self.cfg.marconi.url + href
+        url = self.cfg.zaqar.url + href
 
         result = self.client.get(url)
         self.assertEqual(result.status_code, 200)
@@ -116,7 +116,7 @@ class TestMessages(base.V1FunctionalTestBase):
 
         # GET on posted messages
         location = result.headers['location']
-        url = self.cfg.marconi.url + location
+        url = self.cfg.zaqar.url + location
         result = self.client.get(url)
         self.assertEqual(result.status_code, 200)
 
@@ -168,7 +168,7 @@ class TestMessages(base.V1FunctionalTestBase):
                 self.assertSchema(result.json(), 'message_list')
 
                 href = result.json()['links'][0]['href']
-                url = self.cfg.marconi.url + href
+                url = self.cfg.zaqar.url + href
 
         self.assertEqual(result.status_code, 204)
 
@@ -183,7 +183,7 @@ class TestMessages(base.V1FunctionalTestBase):
 
         # Delete posted message
         href = result.json()['resources'][0]
-        url = self.cfg.marconi.url + href
+        url = self.cfg.zaqar.url + href
 
         result = self.client.delete(url)
         self.assertEqual(result.status_code, 204)
@@ -202,7 +202,7 @@ class TestMessages(base.V1FunctionalTestBase):
 
         # Delete posted messages
         location = result.headers['Location']
-        url = self.cfg.marconi.url + location
+        url = self.cfg.zaqar.url + location
 
         result = self.client.delete(url)
         self.assertEqual(result.status_code, 204)
@@ -229,7 +229,7 @@ class TestMessages(base.V1FunctionalTestBase):
 
         # Delete posted message
         location = result.headers['Location']
-        url = self.cfg.marconi.url + location
+        url = self.cfg.zaqar.url + location
         url += ',nonexisting'
         result = self.client.delete(url)
         self.assertEqual(result.status_code, 204)
@@ -245,7 +245,7 @@ class TestMessages(base.V1FunctionalTestBase):
 
         # Get posted message and a nonexisting message
         location = result.headers['Location']
-        url = self.cfg.marconi.url + location
+        url = self.cfg.zaqar.url + location
         url += ',nonexisting'
         result = self.client.get(url)
         self.assertEqual(result.status_code, 200)
@@ -343,7 +343,7 @@ class TestMessages(base.V1FunctionalTestBase):
         """Get messages with invalid client id."""
         url = self.message_url
 
-        header = helpers.create_marconi_headers(self.cfg)
+        header = helpers.create_zaqar_headers(self.cfg)
         header['Client-ID'] = client_id
 
         result = self.client.get(url, headers=header)
diff --git a/tests/functional/wsgi/v1/test_queues.py b/tests/functional/wsgi/v1/test_queues.py
index d04795c8a..e362028f5 100644
--- a/tests/functional/wsgi/v1/test_queues.py
+++ b/tests/functional/wsgi/v1/test_queues.py
@@ -19,8 +19,8 @@ import uuid
 import ddt
 import six
 
-from marconi.tests.functional import base  # noqa
-from marconi.tests.functional import helpers
+from zaqar.tests.functional import base  # noqa
+from zaqar.tests.functional import helpers
 
 
 class NamedBinaryStr(six.binary_type):
@@ -72,17 +72,17 @@ class TestInsertQueue(base.V1FunctionalTestBase):
 
     """Tests for Insert queue."""
 
-    server_class = base.MarconiServer
+    server_class = base.ZaqarServer
 
     def setUp(self):
         super(TestInsertQueue, self).setUp()
-        self.base_url = '{0}/{1}'.format(self.cfg.marconi.url,
+        self.base_url = '{0}/{1}'.format(self.cfg.zaqar.url,
                                          "v1")
 
-        self.header = helpers.create_marconi_headers(self.cfg)
+        self.header = helpers.create_zaqar_headers(self.cfg)
         self.headers_response_empty = set(['location'])
         self.client.set_base_url(self.base_url)
-        self.header = helpers.create_marconi_headers(self.cfg)
+        self.header = helpers.create_zaqar_headers(self.cfg)
 
     @ddt.data('qtestqueue', 'TESTqueue', 'hyphen-name', '_undersore',
               annotated('test_insert_queue_long_name', 'i' * 64))
@@ -193,12 +193,12 @@ class TestQueueMetaData(base.V1FunctionalTestBase):
 
     """Tests for queue metadata."""
 
-    server_class = base.MarconiServer
+    server_class = base.ZaqarServer
 
     def setUp(self):
         super(TestQueueMetaData, self).setUp()
 
-        self.base_url = '{0}/{1}'.format(self.cfg.marconi.url,
+        self.base_url = '{0}/{1}'.format(self.cfg.zaqar.url,
                                          "v1")
 
         self.queue_url = self.base_url + '/queues/{0}'.format(uuid.uuid1())
@@ -256,12 +256,12 @@ class TestQueueMetaData(base.V1FunctionalTestBase):
 @ddt.ddt
 class TestQueueMisc(base.V1FunctionalTestBase):
 
-    server_class = base.MarconiServer
+    server_class = base.ZaqarServer
 
     def setUp(self):
         super(TestQueueMisc, self).setUp()
 
-        self.base_url = self.cfg.marconi.url
+        self.base_url = self.cfg.zaqar.url
         self.client.set_base_url(self.base_url)
 
         self.queue_url = (self.base_url + '/{0}/queues/{1}'
@@ -409,19 +409,19 @@ class TestQueueNonExisting(base.V1FunctionalTestBase):
 
     """Test Actions on non existing queue."""
 
-    server_class = base.MarconiServer
+    server_class = base.ZaqarServer
 
     def setUp(self):
         super(TestQueueNonExisting, self).setUp()
-        self.base_url = '{0}/{1}'.format(self.cfg.marconi.url, "v1")
+        self.base_url = '{0}/{1}'.format(self.cfg.zaqar.url, "v1")
         self.queue_url = (self.base_url +
                           '/queues/0a5b1b85-4263-11e3-b034-28cfe91478b9')
 
         self.client.set_base_url(self.queue_url)
 
-        self.header = helpers.create_marconi_headers(self.cfg)
+        self.header = helpers.create_zaqar_headers(self.cfg)
         self.headers_response_empty = set(['location'])
-        self.header = helpers.create_marconi_headers(self.cfg)
+        self.header = helpers.create_zaqar_headers(self.cfg)
 
     def test_get_queue(self):
         """Get non existing Queue."""
diff --git a/tests/functional/wsgi/v1_1/test_claims.py b/tests/functional/wsgi/v1_1/test_claims.py
index 1f46f1d82..7d6541608 100644
--- a/tests/functional/wsgi/v1_1/test_claims.py
+++ b/tests/functional/wsgi/v1_1/test_claims.py
@@ -17,25 +17,25 @@ import uuid
 
 import ddt
 
-from marconi.tests.functional import base
-from marconi.tests.functional import helpers
+from zaqar.tests.functional import base
+from zaqar.tests.functional import helpers
 
 
 @ddt.ddt
 class TestClaims(base.V1_1FunctionalTestBase):
     """Tests for Claims."""
 
-    server_class = base.MarconiServer
+    server_class = base.ZaqarServer
 
     def setUp(self):
         super(TestClaims, self).setUp()
 
-        self.headers = helpers.create_marconi_headers(self.cfg)
+        self.headers = helpers.create_zaqar_headers(self.cfg)
         self.client.headers = self.headers
 
         self.queue = uuid.uuid1()
         self.queue_url = ("{url}/{version}/queues/{queue}".format(
-                          url=self.cfg.marconi.url,
+                          url=self.cfg.zaqar.url,
                           version="v1.1",
                           queue=self.queue))
 
@@ -79,7 +79,7 @@ class TestClaims(base.V1_1FunctionalTestBase):
         result = self.client.post(params=params, data=doc)
         location = result.headers['Location']
 
-        url = self.cfg.marconi.url + location
+        url = self.cfg.zaqar.url + location
 
         result = self.client.get(url)
         self.assertEqual(result.status_code, 200)
@@ -96,7 +96,7 @@ class TestClaims(base.V1_1FunctionalTestBase):
 
         location = result.headers['Location']
 
-        url = self.cfg.marconi.url + location
+        url = self.cfg.zaqar.url + location
 
         result = self.client.get(url)
         self.assertEqual(result.status_code, 200)
@@ -109,7 +109,7 @@ class TestClaims(base.V1_1FunctionalTestBase):
     def test_claim_more_than_allowed(self):
         """Claim more than max allowed per request.
 
-        Marconi allows a maximum of 20 messages per claim by default.
+        Zaqar allows a maximum of 20 messages per claim by default.
         """
         params = {"limit": self.limits.max_messages_per_claim_or_pop + 1}
         doc = {"ttl": 300, "grace": 100}
@@ -129,7 +129,7 @@ class TestClaims(base.V1_1FunctionalTestBase):
 
         # Patch Claim
         claim_location = result.headers['Location']
-        url = self.cfg.marconi.url + claim_location
+        url = self.cfg.zaqar.url + claim_location
         doc_updated = {"ttl": 300}
 
         result = self.client.patch(url, data=doc_updated)
@@ -153,7 +153,7 @@ class TestClaims(base.V1_1FunctionalTestBase):
         # Delete Claimed Messages
         for rst in result.json():
             href = rst['href']
-            url = self.cfg.marconi.url + href
+            url = self.cfg.zaqar.url + href
             result = self.client.delete(url)
             self.assertEqual(result.status_code, 204)
 
@@ -168,7 +168,7 @@ class TestClaims(base.V1_1FunctionalTestBase):
 
         # Extract claim location and construct the claim URL.
         location = result.headers['Location']
-        url = self.cfg.marconi.url + location
+        url = self.cfg.zaqar.url + location
 
         # Release Claim.
         result = self.client.delete(url)
@@ -235,7 +235,7 @@ class TestClaims(base.V1_1FunctionalTestBase):
 
         # Extract claim location and construct the claim URL.
         location = result.headers['Location']
-        url = self.cfg.marconi.url + location
+        url = self.cfg.zaqar.url + location
 
         # Patch Claim.
         doc = {"ttl": ttl}
diff --git a/tests/functional/wsgi/v1_1/test_messages.py b/tests/functional/wsgi/v1_1/test_messages.py
index 7add601bb..a7e2a5d68 100644
--- a/tests/functional/wsgi/v1_1/test_messages.py
+++ b/tests/functional/wsgi/v1_1/test_messages.py
@@ -19,26 +19,26 @@ import uuid
 
 import ddt
 
-from marconi.tests.functional import base
-from marconi.tests.functional import helpers
+from zaqar.tests.functional import base
+from zaqar.tests.functional import helpers
 
 
 @ddt.ddt
 class TestMessages(base.V1_1FunctionalTestBase):
     """Message Tests Specific to V1.1."""
 
-    server_class = base.MarconiServer
+    server_class = base.ZaqarServer
 
     def setUp(self):
         super(TestMessages, self).setUp()
 
         self.queue = uuid.uuid1()  # Generate a random queue ID
         self.queue_url = ("{url}/{version}/queues/{queue}".format(
-            url=self.cfg.marconi.url,
+            url=self.cfg.zaqar.url,
             version="v1.1",
             queue=self.queue))
 
-        self.headers = helpers.create_marconi_headers(self.cfg)
+        self.headers = helpers.create_zaqar_headers(self.cfg)
         self.client.headers = self.headers
 
         self.client.put(self.queue_url)  # Create the queue
@@ -78,7 +78,7 @@ class TestMessages(base.V1_1FunctionalTestBase):
 
         # GET on posted message
         href = result.json()['resources'][0]
-        url = self.cfg.marconi.url + href
+        url = self.cfg.zaqar.url + href
 
         result = self.client.get(url)
         self.assertEqual(result.status_code, 200)
@@ -118,7 +118,7 @@ class TestMessages(base.V1_1FunctionalTestBase):
 
         # GET on posted messages
         location = result.headers['location']
-        url = self.cfg.marconi.url + location
+        url = self.cfg.zaqar.url + location
         result = self.client.get(url)
         self.assertEqual(result.status_code, 200)
 
@@ -151,7 +151,7 @@ class TestMessages(base.V1_1FunctionalTestBase):
 
         # GET on posted message
         href = result.json()['resources'][0]
-        url = self.cfg.marconi.url + href
+        url = self.cfg.zaqar.url + href
 
         result = self.client.get(url)
         self.assertEqual(result.status_code, 200)
@@ -193,7 +193,7 @@ class TestMessages(base.V1_1FunctionalTestBase):
                 self.assertMessageCount(actual_msg_count, expected_msg_count)
 
                 href = result.json()['links'][0]['href']
-                url = self.cfg.marconi.url + href
+                url = self.cfg.zaqar.url + href
 
         self.assertEqual(result.status_code, 204)
 
@@ -208,7 +208,7 @@ class TestMessages(base.V1_1FunctionalTestBase):
 
         # Delete posted message
         href = result.json()['resources'][0]
-        url = self.cfg.marconi.url + href
+        url = self.cfg.zaqar.url + href
 
         result = self.client.delete(url)
         self.assertEqual(result.status_code, 204)
@@ -227,7 +227,7 @@ class TestMessages(base.V1_1FunctionalTestBase):
 
         # Delete posted messages
         location = result.headers['Location']
-        url = self.cfg.marconi.url + location
+        url = self.cfg.zaqar.url + location
 
         result = self.client.delete(url)
         self.assertEqual(result.status_code, 204)
@@ -254,7 +254,7 @@ class TestMessages(base.V1_1FunctionalTestBase):
 
         # Delete posted message
         location = result.headers['Location']
-        url = self.cfg.marconi.url + location
+        url = self.cfg.zaqar.url + location
         url += ',nonexisting'
         result = self.client.delete(url)
         self.assertEqual(result.status_code, 204)
@@ -319,7 +319,7 @@ class TestMessages(base.V1_1FunctionalTestBase):
         location = result.headers['Location']
 
         # Pop messages
-        url = self.cfg.marconi.url + location + '&pop=1'
+        url = self.cfg.zaqar.url + location + '&pop=1'
 
         result = self.client.delete(url)
         self.assertEqual(result.status_code, 400)
@@ -381,7 +381,7 @@ class TestMessages(base.V1_1FunctionalTestBase):
 
         # Get posted message and a nonexisting message
         location = result.headers['Location']
-        url = self.cfg.marconi.url + location
+        url = self.cfg.zaqar.url + location
         url += ',nonexisting'
         result = self.client.get(url)
         self.assertEqual(result.status_code, 200)
@@ -480,7 +480,7 @@ class TestMessages(base.V1_1FunctionalTestBase):
         """Get messages with invalid client id."""
         url = self.message_url
 
-        header = helpers.create_marconi_headers(self.cfg)
+        header = helpers.create_zaqar_headers(self.cfg)
         header['Client-ID'] = client_id
 
         result = self.client.get(url, headers=header)
diff --git a/tests/functional/wsgi/v1_1/test_pools.py b/tests/functional/wsgi/v1_1/test_pools.py
index 602a9ce09..0afcad98a 100644
--- a/tests/functional/wsgi/v1_1/test_pools.py
+++ b/tests/functional/wsgi/v1_1/test_pools.py
@@ -14,27 +14,27 @@
 # limitations under the License.
 import ddt
 
-from marconi.tests.functional import base
-from marconi.tests.functional import helpers
+from zaqar.tests.functional import base
+from zaqar.tests.functional import helpers
 
 
 @ddt.ddt
 class TestPools(base.V1_1FunctionalTestBase):
 
-    server_class = base.MarconiServer
+    server_class = base.ZaqarServer
 
     def setUp(self):
         super(TestPools, self).setUp()
 
         self.pool_url = ("{url}/{version}/pools".format(
-            url=self.cfg.marconi.url,
+            url=self.cfg.zaqar.url,
             version="v1.1"
         ))
-        self.cfg.marconi.version = "v1.1"
+        self.cfg.zaqar.version = "v1.1"
 
         self.skipTest("NOT IMPLEMENTED")
 
-        self.headers = helpers.create_marconi_headers(self.cfg)
+        self.headers = helpers.create_zaqar_headers(self.cfg)
         self.client.headers = self.headers
 
         self.client.set_base_url(self.pool_url)
diff --git a/tests/functional/wsgi/v1_1/test_queues.py b/tests/functional/wsgi/v1_1/test_queues.py
index 166bcc5ba..4ec156789 100644
--- a/tests/functional/wsgi/v1_1/test_queues.py
+++ b/tests/functional/wsgi/v1_1/test_queues.py
@@ -19,8 +19,8 @@ import uuid
 import ddt
 import six
 
-from marconi.tests.functional import base  # noqa
-from marconi.tests.functional import helpers
+from zaqar.tests.functional import base  # noqa
+from zaqar.tests.functional import helpers
 
 
 class NamedBinaryStr(six.binary_type):
@@ -72,14 +72,14 @@ class TestInsertQueue(base.V1_1FunctionalTestBase):
 
     """Tests for Insert queue."""
 
-    server_class = base.MarconiServer
+    server_class = base.ZaqarServer
 
     def setUp(self):
         super(TestInsertQueue, self).setUp()
-        self.base_url = '{0}/{1}'.format(self.cfg.marconi.url,
+        self.base_url = '{0}/{1}'.format(self.cfg.zaqar.url,
                                          "v1.1")
 
-        self.header = helpers.create_marconi_headers(self.cfg)
+        self.header = helpers.create_zaqar_headers(self.cfg)
         self.headers_response_empty = set(['location'])
         self.client.set_base_url(self.base_url)
         self.client.headers = self.header
@@ -182,11 +182,11 @@ class TestInsertQueue(base.V1_1FunctionalTestBase):
 @ddt.ddt
 class TestQueueMisc(base.V1_1FunctionalTestBase):
 
-    server_class = base.MarconiServer
+    server_class = base.ZaqarServer
 
     def setUp(self):
         super(TestQueueMisc, self).setUp()
-        self.base_url = self.cfg.marconi.url
+        self.base_url = self.cfg.zaqar.url
         self.client.set_base_url(self.base_url)
 
         self.queue_url = self.base_url + ('/{0}/queues/{1}'
@@ -324,22 +324,22 @@ class TestQueueNonExisting(base.V1_1FunctionalTestBase):
 
     """Test Actions on non existing queue."""
 
-    server_class = base.MarconiServer
+    server_class = base.ZaqarServer
 
     def setUp(self):
         super(TestQueueNonExisting, self).setUp()
         if self.cfg.version != "v1":
             self.skipTest("Not Supported")
 
-        self.base_url = '{0}/{1}'.format(self.cfg.marconi.url,
+        self.base_url = '{0}/{1}'.format(self.cfg.zaqar.url,
                                          "v1.1")
         self.queue_url = (self.base_url +
                           '/queues/0a5b1b85-4263-11e3-b034-28cfe91478b9')
         self.client.set_base_url(self.queue_url)
 
-        self.header = helpers.create_marconi_headers(self.cfg)
+        self.header = helpers.create_zaqar_headers(self.cfg)
         self.headers_response_empty = set(['location'])
-        self.header = helpers.create_marconi_headers(self.cfg)
+        self.header = helpers.create_zaqar_headers(self.cfg)
 
     def test_get_stats(self):
         """Get stats on non existing Queue."""
diff --git a/tests/unit/common/storage/test_select.py b/tests/unit/common/storage/test_select.py
index 3f4c82e73..b988ba022 100644
--- a/tests/unit/common/storage/test_select.py
+++ b/tests/unit/common/storage/test_select.py
@@ -15,7 +15,7 @@
 
 import testtools
 
-from marconi.common.storage import select
+from zaqar.common.storage import select
 
 
 class TestSelect(testtools.TestCase):
diff --git a/tests/unit/common/storage/test_utils.py b/tests/unit/common/storage/test_utils.py
index dcc7cb8e2..594ba5b5e 100644
--- a/tests/unit/common/storage/test_utils.py
+++ b/tests/unit/common/storage/test_utils.py
@@ -15,8 +15,8 @@
 
 import ddt
 
-from marconi.queues.storage import utils
-from marconi import tests as testing
+from zaqar.queues.storage import utils
+from zaqar import tests as testing
 
 
 @ddt.ddt
diff --git a/tests/unit/common/test_api.py b/tests/unit/common/test_api.py
index e3d57078a..5604b6bf9 100644
--- a/tests/unit/common/test_api.py
+++ b/tests/unit/common/test_api.py
@@ -13,9 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from marconi.common import api
-from marconi.common import errors
-from marconi.tests import base
+from zaqar.common import api
+from zaqar.common import errors
+from zaqar.tests import base
 
 
 class FakeApi(api.Api):
diff --git a/tests/unit/common/test_decorators.py b/tests/unit/common/test_decorators.py
index 92bcb816a..6b5aeb0d6 100644
--- a/tests/unit/common/test_decorators.py
+++ b/tests/unit/common/test_decorators.py
@@ -16,9 +16,9 @@
 import msgpack
 from oslo.config import cfg
 
-from marconi.common import decorators
-from marconi.openstack.common.cache import cache as oslo_cache
-from marconi.tests import base
+from zaqar.common import decorators
+from zaqar.openstack.common.cache import cache as oslo_cache
+from zaqar.tests import base
 
 
 class TestDecorators(base.TestBase):
diff --git a/tests/unit/common/test_pipeline.py b/tests/unit/common/test_pipeline.py
index 29d6c733f..4d0b2f432 100644
--- a/tests/unit/common/test_pipeline.py
+++ b/tests/unit/common/test_pipeline.py
@@ -13,8 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from marconi.common import pipeline
-from marconi.tests import base
+from zaqar.common import pipeline
+from zaqar.tests import base
 
 
 class FirstClass(object):
diff --git a/tests/unit/common/test_request.py b/tests/unit/common/test_request.py
index 2f9e1d7bc..f3c6a520c 100644
--- a/tests/unit/common/test_request.py
+++ b/tests/unit/common/test_request.py
@@ -15,8 +15,8 @@
 # limitations under the License.
 
 
-from marconi.common import request
-from marconi.tests import base
+from zaqar.common import request
+from zaqar.tests import base
 
 
 class TestRequest(base.TestBase):
diff --git a/tests/unit/queues/storage/test_impl_mongodb.py b/tests/unit/queues/storage/test_impl_mongodb.py
index cdc4970d6..6c1242b7a 100644
--- a/tests/unit/queues/storage/test_impl_mongodb.py
+++ b/tests/unit/queues/storage/test_impl_mongodb.py
@@ -24,17 +24,17 @@ import pymongo.errors
 import six
 from testtools import matchers
 
-from marconi.openstack.common.cache import cache as oslo_cache
-from marconi.openstack.common import timeutils
-from marconi.queues import storage
-from marconi.queues.storage import errors
-from marconi.queues.storage import mongodb
-from marconi.queues.storage.mongodb import controllers
-from marconi.queues.storage.mongodb import options
-from marconi.queues.storage.mongodb import utils
-from marconi.queues.storage import pooling
-from marconi import tests as testing
-from marconi.tests.queues.storage import base
+from zaqar.openstack.common.cache import cache as oslo_cache
+from zaqar.openstack.common import timeutils
+from zaqar.queues import storage
+from zaqar.queues.storage import errors
+from zaqar.queues.storage import mongodb
+from zaqar.queues.storage.mongodb import controllers
+from zaqar.queues.storage.mongodb import options
+from zaqar.queues.storage.mongodb import utils
+from zaqar.queues.storage import pooling
+from zaqar import tests as testing
+from zaqar.tests.queues.storage import base
 
 
 class MongodbSetupMixin(object):
@@ -258,7 +258,7 @@ class MongodbMessageTests(MongodbSetupMixin, base.MessageControllerTest):
         self.assertIsNone(unchanged)
 
         now = timeutils.utcnow() + datetime.timedelta(seconds=10)
-        timeutils_utcnow = 'marconi.openstack.common.timeutils.utcnow'
+        timeutils_utcnow = 'zaqar.openstack.common.timeutils.utcnow'
         with mock.patch(timeutils_utcnow) as mock_utcnow:
             mock_utcnow.return_value = now
             changed = self.queue_controller._inc_counter(queue_name,
diff --git a/tests/unit/queues/storage/test_impl_sqlalchemy.py b/tests/unit/queues/storage/test_impl_sqlalchemy.py
index fd1996a61..412e93d60 100644
--- a/tests/unit/queues/storage/test_impl_sqlalchemy.py
+++ b/tests/unit/queues/storage/test_impl_sqlalchemy.py
@@ -16,13 +16,13 @@ import datetime
 
 import sqlalchemy as sa
 
-from marconi.queues.storage import pooling
-from marconi.queues.storage import sqlalchemy
-from marconi.queues.storage.sqlalchemy import controllers
-from marconi.queues.storage.sqlalchemy import tables
-from marconi.queues.storage.sqlalchemy import utils
-from marconi import tests as testing
-from marconi.tests.queues.storage import base
+from zaqar.queues.storage import pooling
+from zaqar.queues.storage import sqlalchemy
+from zaqar.queues.storage.sqlalchemy import controllers
+from zaqar.queues.storage.sqlalchemy import tables
+from zaqar.queues.storage.sqlalchemy import utils
+from zaqar import tests as testing
+from zaqar.tests.queues.storage import base
 
 
 class SqlalchemyTableTests(testing.TestBase):
@@ -34,7 +34,7 @@ class SqlalchemyTableTests(testing.TestBase):
 
     def test_table_queries(self):
         self.engine.execute(tables.Queues.insert(), id=1, project='test',
-                            name='marconi', metadata=utils.json_encode('aaaa'))
+                            name='zaqar', metadata=utils.json_encode('aaaa'))
         self.engine.execute(tables.Messages.insert(), id=1, qid=1, ttl=10,
                             body=utils.json_encode('bbbb'), client='a',
                             created=datetime.datetime.now())
diff --git a/tests/unit/queues/storage/test_pool_catalog.py b/tests/unit/queues/storage/test_pool_catalog.py
index c6b76f53a..4366bc613 100644
--- a/tests/unit/queues/storage/test_pool_catalog.py
+++ b/tests/unit/queues/storage/test_pool_catalog.py
@@ -16,11 +16,11 @@ import uuid
 
 from oslo.config import cfg
 
-from marconi.openstack.common.cache import cache as oslo_cache
-from marconi.queues.storage import pooling
-from marconi.queues.storage import sqlalchemy
-from marconi.queues.storage import utils
-from marconi import tests as testing
+from zaqar.openstack.common.cache import cache as oslo_cache
+from zaqar.queues.storage import pooling
+from zaqar.queues.storage import sqlalchemy
+from zaqar.queues.storage import utils
+from zaqar import tests as testing
 
 
 # TODO(cpp-cabrera): it would be wonderful to refactor this unit test
diff --git a/tests/unit/queues/storage/test_pool_queues.py b/tests/unit/queues/storage/test_pool_queues.py
index b322e9d94..5b2b0414c 100644
--- a/tests/unit/queues/storage/test_pool_queues.py
+++ b/tests/unit/queues/storage/test_pool_queues.py
@@ -18,10 +18,10 @@ import uuid
 from oslo.config import cfg
 import six
 
-from marconi.openstack.common.cache import cache as oslo_cache
-from marconi.queues.storage import pooling
-from marconi.queues.storage import utils
-from marconi import tests as testing
+from zaqar.openstack.common.cache import cache as oslo_cache
+from zaqar.queues.storage import pooling
+from zaqar.queues.storage import utils
+from zaqar import tests as testing
 
 
 @testing.requires_mongodb
diff --git a/tests/unit/queues/transport/test_auth.py b/tests/unit/queues/transport/test_auth.py
index 7b560e39e..9715aeaad 100644
--- a/tests/unit/queues/transport/test_auth.py
+++ b/tests/unit/queues/transport/test_auth.py
@@ -17,8 +17,8 @@
 
 from oslo.config import cfg
 
-from marconi.queues.transport import auth
-from marconi import tests as testing
+from zaqar.queues.transport import auth
+from zaqar import tests as testing
 
 
 class TestTransportAuth(testing.TestBase):
diff --git a/tests/unit/queues/transport/wsgi/test_utils.py b/tests/unit/queues/transport/wsgi/test_utils.py
index d03ced41f..894b25cf1 100644
--- a/tests/unit/queues/transport/wsgi/test_utils.py
+++ b/tests/unit/queues/transport/wsgi/test_utils.py
@@ -19,7 +19,7 @@ import falcon
 import six
 import testtools
 
-from marconi.queues.transport.wsgi import utils
+from zaqar.queues.transport.wsgi import utils
 
 
 class TestUtils(testtools.TestCase):
diff --git a/tests/unit/queues/transport/wsgi/test_v1_0.py b/tests/unit/queues/transport/wsgi/test_v1_0.py
index 568d7f1b9..b31bdcb4e 100644
--- a/tests/unit/queues/transport/wsgi/test_v1_0.py
+++ b/tests/unit/queues/transport/wsgi/test_v1_0.py
@@ -14,8 +14,8 @@
 
 import falcon
 
-from marconi.tests.queues.transport.wsgi import base
-from marconi.tests.queues.transport.wsgi import v1
+from zaqar.tests.queues.transport.wsgi import base
+from zaqar.tests.queues.transport.wsgi import v1
 
 
 # --------------------------------------------------------------------------
diff --git a/tests/unit/queues/transport/wsgi/test_v1_1.py b/tests/unit/queues/transport/wsgi/test_v1_1.py
index b6a19f6e2..d016f8cf1 100644
--- a/tests/unit/queues/transport/wsgi/test_v1_1.py
+++ b/tests/unit/queues/transport/wsgi/test_v1_1.py
@@ -16,9 +16,9 @@ import uuid
 import ddt
 import falcon
 
-from marconi.openstack.common import jsonutils
-from marconi.tests.queues.transport.wsgi import base
-from marconi.tests.queues.transport.wsgi import v1_1
+from zaqar.openstack.common import jsonutils
+from zaqar.tests.queues.transport.wsgi import base
+from zaqar.tests.queues.transport.wsgi import v1_1
 
 # --------------------------------------------------------------------------
 # Identical or just minor variations across versions
diff --git a/tests/unit/test_bootstrap.py b/tests/unit/test_bootstrap.py
index 2b8b51cdf..a0ba8c157 100644
--- a/tests/unit/test_bootstrap.py
+++ b/tests/unit/test_bootstrap.py
@@ -13,13 +13,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from marconi.common import errors
-from marconi.queues import bootstrap
-from marconi.queues.storage import pipeline
-from marconi.queues.storage import pooling
-from marconi.queues.storage import sqlalchemy
-from marconi.queues.transport import wsgi
-from marconi.tests import base
+from zaqar.common import errors
+from zaqar.queues import bootstrap
+from zaqar.queues.storage import pipeline
+from zaqar.queues.storage import pooling
+from zaqar.queues.storage import sqlalchemy
+from zaqar.queues.transport import wsgi
+from zaqar.tests import base
 
 
 class TestBootstrap(base.TestBase):
diff --git a/tests/unit/test_version.py b/tests/unit/test_version.py
index 1b810bac1..8e9befe8a 100644
--- a/tests/unit/test_version.py
+++ b/tests/unit/test_version.py
@@ -14,8 +14,8 @@
 
 import pbr.packaging
 
-import marconi
-from marconi import tests as testing
+import zaqar
+from zaqar import tests as testing
 
 
 class TestVersion(testing.TestBase):
@@ -31,7 +31,7 @@ class TestVersion(testing.TestBase):
             self.skipTest('The git version string does not contain a hash')
 
         sha_abbrev = commit[1:]
-        self.assertTrue(marconi.version.verify_sha(sha_abbrev))
+        self.assertTrue(zaqar.version.verify_sha(sha_abbrev))
 
         sha_abbrev_bad = 'x' + sha_abbrev[1:]
-        self.assertFalse(marconi.version.verify_sha(sha_abbrev_bad))
+        self.assertFalse(zaqar.version.verify_sha(sha_abbrev_bad))
diff --git a/tools/config/check_uptodate.sh b/tools/config/check_uptodate.sh
index 6b4a32807..8a48016a2 100755
--- a/tools/config/check_uptodate.sh
+++ b/tools/config/check_uptodate.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-PROJECT_NAME=${PROJECT_NAME:-marconi}
+PROJECT_NAME=${PROJECT_NAME:-zaqar}
 CFGFILE_NAME=${PROJECT_NAME}.conf.sample
 
 if [ -e etc/${PROJECT_NAME}/${CFGFILE_NAME} ]; then
diff --git a/tools/config/generate_sample.sh b/tools/config/generate_sample.sh
index 47a58e1ce..e7e6abb91 100755
--- a/tools/config/generate_sample.sh
+++ b/tools/config/generate_sample.sh
@@ -107,7 +107,7 @@ export EVENTLET_NO_GREENDNS=yes
 
 OS_VARS=$(set | sed -n '/^OS_/s/=[^=]*$//gp' | xargs)
 [ "$OS_VARS" ] && eval "unset \$OS_VARS"
-DEFAULT_MODULEPATH=marconi.openstack.common.config.generator
+DEFAULT_MODULEPATH=zaqar.openstack.common.config.generator
 MODULEPATH=${MODULEPATH:-$DEFAULT_MODULEPATH}
 OUTPUTFILE=$OUTPUTDIR/$PACKAGENAME.conf.sample
 python -m $MODULEPATH $MODULES $LIBRARIES $FILES > $OUTPUTFILE
diff --git a/tools/config/oslo.config.generator.rc b/tools/config/oslo.config.generator.rc
index e37a71aeb..8f7666346 100644
--- a/tools/config/oslo.config.generator.rc
+++ b/tools/config/oslo.config.generator.rc
@@ -1,11 +1,11 @@
 export OSLO_CONFIG_GENERATOR_EXTRA_MODULES="keystoneclient.middleware.auth_token"
-export OSLO_CONFIG_GENERATOR_EXTRA_LIBRARIES="marconi.bootstrap
-                                              marconi.storage.base
-                                              marconi.storage.pipeline
-                                              marconi.storage.pooling
-                                              marconi.storage.mongodb
-                                              marconi.storage.sqlalchemy
-                                              marconi.transport.wsgi
-                                              marconi.transport.base
-                                              marconi.transport.validation"
+export OSLO_CONFIG_GENERATOR_EXTRA_LIBRARIES="zaqar.bootstrap
+                                              zaqar.storage.base
+                                              zaqar.storage.pipeline
+                                              zaqar.storage.pooling
+                                              zaqar.storage.mongodb
+                                              zaqar.storage.sqlalchemy
+                                              zaqar.transport.wsgi
+                                              zaqar.transport.base
+                                              zaqar.transport.validation"
 
diff --git a/tox.ini b/tox.ini
index 13c151d95..212eb0d57 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,8 +8,8 @@ usedevelop = True
 # Customize pip command, add -U to force updates.
 install_command = pip install -U {opts} {packages}
 setenv = VIRTUAL_ENV={envdir}
-         MARCONI_TESTS_DIR={toxinidir}/tests
-         MARCONI_TESTS_CONFIGS_DIR={toxinidir}/tests/etc/
+         ZAQAR_TESTS_DIR={toxinidir}/tests
+         ZAQAR_TESTS_CONFIGS_DIR={toxinidir}/tests/etc/
 
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
@@ -42,5 +42,5 @@ commands = python setup.py build_sphinx
 exclude = .venv*,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*.egg,.update-venv
 
 [hacking]
-import_exceptions = marconi.openstack.common.gettextutils._,marconi.i18n._
+import_exceptions = zaqar.openstack.common.gettextutils._,zaqar.i18n._
 
diff --git a/marconi/__init__.py b/zaqar/__init__.py
similarity index 77%
rename from marconi/__init__.py
rename to zaqar/__init__.py
index 05a6c52f4..8561dda9b 100644
--- a/marconi/__init__.py
+++ b/zaqar/__init__.py
@@ -13,10 +13,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import marconi.queues.bootstrap
-import marconi.version
+import zaqar.queues.bootstrap
+import zaqar.version
 
-Bootstrap = marconi.queues.bootstrap.Bootstrap
+Bootstrap = zaqar.queues.bootstrap.Bootstrap
 
 
-__version__ = marconi.version.version_info.cached_version_string()
+__version__ = zaqar.version.version_info.cached_version_string()
diff --git a/marconi/bench/README.rst b/zaqar/bench/README.rst
similarity index 63%
rename from marconi/bench/README.rst
rename to zaqar/bench/README.rst
index 5dc7e06e1..b39788878 100644
--- a/marconi/bench/README.rst
+++ b/zaqar/bench/README.rst
@@ -1,4 +1,4 @@
-Marconi Benchmarking
+Zaqar Benchmarking
 ====================
 
 Structure
@@ -12,7 +12,7 @@ claiming and deleting them.
 Need of the Benchmark
 ---------------------
 
-Marconi is a performance oriented API. Any changes made need to performance tested, and this tool
+Zaqar is a performance oriented API. Any changes made need to performance tested, and this tool
 helps by a being quick way to test that.
 
 Setup
@@ -21,16 +21,16 @@ Benchmark dependencies need to be pip installed::
 
  pip install -r bench-requirements.txt
 
-Make sure you have a running instance of Marconi after following `README`_ for
-setting up Marconi running at port 8888::
+Make sure you have a running instance of Zaqar after following `README`_ for
+setting up Zaqar running at port 8888::
 
 Export an environment variable called MESSAGES_PATH and set it to the path of messages.json
-in marconi/bench
+in zaqar/bench
 
 Note: This allows benchmarking with different set of messages rather than those specified in
       messages.json
 
-    $ marconi-bench-pc -p {Number of Processes} -w {Number of Workers} -t {Duration in Seconds}
+    $ zaqar-bench-pc -p {Number of Processes} -w {Number of Workers} -t {Duration in Seconds}
 
 
-.. _`README` : https://github.com/openstack/marconi/blob/master/README.rst
\ No newline at end of file
+.. _`README` : https://github.com/openstack/zaqar/blob/master/README.rst
\ No newline at end of file
diff --git a/marconi/bench/__init__.py b/zaqar/bench/__init__.py
similarity index 100%
rename from marconi/bench/__init__.py
rename to zaqar/bench/__init__.py
diff --git a/marconi/bench/cli_config.py b/zaqar/bench/cli_config.py
similarity index 95%
rename from marconi/bench/cli_config.py
rename to zaqar/bench/cli_config.py
index e6e25c109..c160899c2 100644
--- a/marconi/bench/cli_config.py
+++ b/zaqar/bench/cli_config.py
@@ -30,4 +30,4 @@ _CLI_OPTIONS = (
     cfg.IntOpt('time', short='t', default=3, help="time in seconds"),
 )
 conf.register_cli_opts(_CLI_OPTIONS)
-conf(project='marconi', prog='marconi-queues')
+conf(project='zaqar', prog='zaqar-queues')
diff --git a/marconi/bench/conductor.py b/zaqar/bench/conductor.py
similarity index 92%
rename from marconi/bench/conductor.py
rename to zaqar/bench/conductor.py
index ce8ebf862..77bce0dbf 100644
--- a/marconi/bench/conductor.py
+++ b/zaqar/bench/conductor.py
@@ -16,8 +16,8 @@ from __future__ import print_function
 
 import multiprocessing as mp
 
-from marconi.bench import consumer
-from marconi.bench import producer
+from zaqar.bench import consumer
+from zaqar.bench import producer
 
 
 def main():
diff --git a/marconi/bench/consumer.py b/zaqar/bench/consumer.py
similarity index 96%
rename from marconi/bench/consumer.py
rename to zaqar/bench/consumer.py
index 9ddfe0666..2de6a8c53 100644
--- a/marconi/bench/consumer.py
+++ b/zaqar/bench/consumer.py
@@ -20,11 +20,11 @@ import time
 from gevent import monkey as curious_george
 curious_george.patch_all(thread=False, select=False)
 import gevent
-from marconiclient.queues.v1 import client
-from marconiclient.transport.errors import TransportError
 import marktime
+from zaqarclient.queues.v1 import client
+from zaqarclient.transport.errors import TransportError
 
-from marconi.bench.cli_config import conf
+from zaqar.bench.cli_config import conf
 
 URL = 'http://localhost:8888'
 QUEUE_PREFIX = 'ogre-test-queue-'
diff --git a/marconi/bench/messages.json b/zaqar/bench/messages.json
similarity index 100%
rename from marconi/bench/messages.json
rename to zaqar/bench/messages.json
diff --git a/marconi/bench/producer.py b/zaqar/bench/producer.py
similarity index 96%
rename from marconi/bench/producer.py
rename to zaqar/bench/producer.py
index 3491075bf..890e89492 100644
--- a/marconi/bench/producer.py
+++ b/zaqar/bench/producer.py
@@ -24,11 +24,11 @@ import time
 from gevent import monkey as curious_george
 curious_george.patch_all(thread=False, select=False)
 import gevent
-from marconiclient.queues.v1 import client
-from marconiclient.transport.errors import TransportError
 import marktime
+from zaqarclient.queues.v1 import client
+from zaqarclient.transport.errors import TransportError
 
-from marconi.bench.cli_config import conf
+from zaqar.bench.cli_config import conf
 
 
 # TODO(TheSriram): Make configurable
diff --git a/marconi/cmd/__init__.py b/zaqar/cmd/__init__.py
similarity index 100%
rename from marconi/cmd/__init__.py
rename to zaqar/cmd/__init__.py
diff --git a/marconi/cmd/server.py b/zaqar/cmd/server.py
similarity index 81%
rename from marconi/cmd/server.py
rename to zaqar/cmd/server.py
index 153283cb5..21afd48f0 100644
--- a/marconi/cmd/server.py
+++ b/zaqar/cmd/server.py
@@ -16,8 +16,8 @@ import os
 
 from oslo.config import cfg
 
-from marconi.common import cli
-from marconi.queues import bootstrap
+from zaqar.common import cli
+from zaqar.queues import bootstrap
 
 
 @cli.runnable
@@ -26,17 +26,17 @@ def run():
     # to pick up common options from openstack.common.log, since
     # that module uses the global CONF instance exclusively.
     conf = cfg.CONF
-    conf(project='marconi', prog='marconi-queues')
+    conf(project='zaqar', prog='zaqar-queues')
 
     server = bootstrap.Bootstrap(conf)
 
-    # The following code is to daemonize marconi-server to avoid
+    # The following code is to daemonize zaqar-server to avoid
     # an issue with wsgiref writing to stdout/stderr when we don't
-    # want it to.  This is specifically needed to allow marconi to
+    # want it to.  This is specifically needed to allow zaqar to
     # run under devstack, but it may also be useful for other scenarios.
     # Open /dev/zero and /dev/null for redirection.
-    # Daemonizing marconi-server is needed *just* when running under devstack
-    # and when marconi is invoked with `daemon` command line option.
+    # Daemonizing zaqar-server is needed *just* when running under devstack
+    # and when zaqar is invoked with `daemon` command line option.
     if conf.daemon:
         zerofd = os.open('/dev/zero', os.O_RDONLY)
         nullfd = os.open('/dev/null', os.O_WRONLY)
diff --git a/marconi/common/__init__.py b/zaqar/common/__init__.py
similarity index 89%
rename from marconi/common/__init__.py
rename to zaqar/common/__init__.py
index fb9e0c1a7..f8d8c8127 100644
--- a/marconi/common/__init__.py
+++ b/zaqar/common/__init__.py
@@ -11,8 +11,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""Code common to Marconi"""
+"""Code common to Zaqar"""
 
-from marconi.common import pipeline
+from zaqar.common import pipeline
 
 Pipeline = pipeline.Pipeline
diff --git a/marconi/common/access.py b/zaqar/common/access.py
similarity index 100%
rename from marconi/common/access.py
rename to zaqar/common/access.py
diff --git a/marconi/common/api.py b/zaqar/common/api.py
similarity index 95%
rename from marconi/common/api.py
rename to zaqar/common/api.py
index e8cf8cd4f..6ded39f1e 100644
--- a/marconi/common/api.py
+++ b/zaqar/common/api.py
@@ -16,9 +16,9 @@
 import jsonschema
 from jsonschema import validators
 
-from marconi.common import errors
-from marconi.i18n import _
-from marconi.openstack.common import log
+from zaqar.common import errors
+from zaqar.i18n import _
+from zaqar.openstack.common import log
 
 LOG = log.getLogger(__name__)
 
diff --git a/marconi/common/cli.py b/zaqar/common/cli.py
similarity index 91%
rename from marconi/common/cli.py
rename to zaqar/common/cli.py
index bb4d4037a..f85e0f952 100644
--- a/marconi/common/cli.py
+++ b/zaqar/common/cli.py
@@ -16,8 +16,8 @@ from __future__ import print_function
 import functools
 import sys
 
-from marconi.i18n import _
-from marconi.openstack.common import log as logging
+from zaqar.i18n import _
+from zaqar.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)
@@ -44,7 +44,7 @@ def runnable(func):
     @functools.wraps(func)
     def _wrapper():
         try:
-            logging.setup('marconi')
+            logging.setup('zaqar')
             func()
         except KeyboardInterrupt:
             LOG.info(_(u'Terminating'))
diff --git a/marconi/common/decorators.py b/zaqar/common/decorators.py
similarity index 99%
rename from marconi/common/decorators.py
rename to zaqar/common/decorators.py
index c042223e0..ce8b43749 100644
--- a/marconi/common/decorators.py
+++ b/zaqar/common/decorators.py
@@ -17,7 +17,7 @@ import functools
 
 import msgpack
 
-import marconi.openstack.common.log as logging
+import zaqar.openstack.common.log as logging
 
 LOG = logging.getLogger(__name__)
 
diff --git a/marconi/common/errors.py b/zaqar/common/errors.py
similarity index 100%
rename from marconi/common/errors.py
rename to zaqar/common/errors.py
diff --git a/marconi/common/pipeline.py b/zaqar/common/pipeline.py
similarity index 97%
rename from marconi/common/pipeline.py
rename to zaqar/common/pipeline.py
index 78e530ea5..be7aa73de 100644
--- a/marconi/common/pipeline.py
+++ b/zaqar/common/pipeline.py
@@ -33,9 +33,9 @@ import contextlib
 
 import six
 
-from marconi.common import decorators
-from marconi.i18n import _
-import marconi.openstack.common.log as logging
+from zaqar.common import decorators
+from zaqar.i18n import _
+import zaqar.openstack.common.log as logging
 
 LOG = logging.getLogger(__name__)
 
diff --git a/marconi/common/request.py b/zaqar/common/request.py
similarity index 95%
rename from marconi/common/request.py
rename to zaqar/common/request.py
index 74facadca..8dff09a51 100644
--- a/marconi/common/request.py
+++ b/zaqar/common/request.py
@@ -16,11 +16,11 @@
 
 import json
 
-from marconi.common import decorators
+from zaqar.common import decorators
 
 
 class Request(object):
-    """General data for a Marconi request
+    """General data for a Zaqar request
 
     Transport will generate a request object and send to this the API to be
     processed.
diff --git a/marconi/common/response.py b/zaqar/common/response.py
similarity index 88%
rename from marconi/common/response.py
rename to zaqar/common/response.py
index 34b3b7110..0617de07f 100644
--- a/marconi/common/response.py
+++ b/zaqar/common/response.py
@@ -15,14 +15,14 @@
 
 
 class Response(object):
-    """Common response class for Marconi.
+    """Common response class for Zaqar.
 
-    All `marconi.transport.base.Transport` implementations
+    All `zaqar.transport.base.Transport` implementations
     will return this to the higher level API which will then build
     an object out of it.
 
     :param request: The request sent to the server.
-    :type: `marconi.transport.request.Request`
+    :type: `zaqar.transport.request.Request`
     :param content: Response's content
     :type: `six.string_types`
     :param headers: Optional headers returned in the response.
diff --git a/marconi/common/schemas/__init__.py b/zaqar/common/schemas/__init__.py
similarity index 100%
rename from marconi/common/schemas/__init__.py
rename to zaqar/common/schemas/__init__.py
diff --git a/marconi/common/schemas/pools.py b/zaqar/common/schemas/pools.py
similarity index 96%
rename from marconi/common/schemas/pools.py
rename to zaqar/common/schemas/pools.py
index 41cf71fe6..a22033633 100644
--- a/marconi/common/schemas/pools.py
+++ b/zaqar/common/schemas/pools.py
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""pools: JSON schema for marconi-queues pools resources."""
+"""pools: JSON schema for zaqar-queues pools resources."""
 
 # NOTE(cpp-cabrera): options can be anything. These will be unique to
 # each storage driver, so we don't perform any further validation at
diff --git a/marconi/common/storage/__init__.py b/zaqar/common/storage/__init__.py
similarity index 100%
rename from marconi/common/storage/__init__.py
rename to zaqar/common/storage/__init__.py
diff --git a/marconi/common/storage/select.py b/zaqar/common/storage/select.py
similarity index 100%
rename from marconi/common/storage/select.py
rename to zaqar/common/storage/select.py
diff --git a/marconi/common/transport/__init__.py b/zaqar/common/transport/__init__.py
similarity index 100%
rename from marconi/common/transport/__init__.py
rename to zaqar/common/transport/__init__.py
diff --git a/marconi/common/transport/wsgi/__init__.py b/zaqar/common/transport/wsgi/__init__.py
similarity index 100%
rename from marconi/common/transport/wsgi/__init__.py
rename to zaqar/common/transport/wsgi/__init__.py
diff --git a/marconi/common/transport/wsgi/helpers.py b/zaqar/common/transport/wsgi/helpers.py
similarity index 96%
rename from marconi/common/transport/wsgi/helpers.py
rename to zaqar/common/transport/wsgi/helpers.py
index ce350930e..33f243e9e 100644
--- a/marconi/common/transport/wsgi/helpers.py
+++ b/zaqar/common/transport/wsgi/helpers.py
@@ -18,9 +18,9 @@
 import falcon
 import six
 
-from marconi.i18n import _
-import marconi.openstack.common.log as logging
-from marconi.queues.transport import validation
+from zaqar.i18n import _
+import zaqar.openstack.common.log as logging
+from zaqar.queues.transport import validation
 
 
 LOG = logging.getLogger(__name__)
diff --git a/marconi/common/transport/wsgi/utils.py b/zaqar/common/transport/wsgi/utils.py
similarity index 91%
rename from marconi/common/transport/wsgi/utils.py
rename to zaqar/common/transport/wsgi/utils.py
index 1ca7169a2..c64a4f957 100644
--- a/marconi/common/transport/wsgi/utils.py
+++ b/zaqar/common/transport/wsgi/utils.py
@@ -17,9 +17,9 @@
 
 import jsonschema
 
-from marconi.openstack.common import log
-from marconi.queues.transport import utils as json_utils
-from marconi.queues.transport.wsgi import errors as wsgi_errors
+from zaqar.openstack.common import log
+from zaqar.queues.transport import utils as json_utils
+from zaqar.queues.transport.wsgi import errors as wsgi_errors
 
 LOG = log.getLogger(__name__)
 
diff --git a/marconi/common/utils.py b/zaqar/common/utils.py
similarity index 100%
rename from marconi/common/utils.py
rename to zaqar/common/utils.py
diff --git a/marconi/i18n.py b/zaqar/i18n.py
similarity index 95%
rename from marconi/i18n.py
rename to zaqar/i18n.py
index 80bafda19..60bf2d340 100644
--- a/marconi/i18n.py
+++ b/zaqar/i18n.py
@@ -15,7 +15,7 @@
 
 from oslo.i18n import *  # noqa
 
-_translators = TranslatorFactory(domain='marconi')
+_translators = TranslatorFactory(domain='zaqar')
 
 # The primary translation function using the well-known name "_"
 _ = _translators.primary
diff --git a/marconi/locale/pt_BR/LC_MESSAGES/marconi-log-critical.po b/zaqar/locale/pt_BR/LC_MESSAGES/zaqar-log-critical.po
similarity index 92%
rename from marconi/locale/pt_BR/LC_MESSAGES/marconi-log-critical.po
rename to zaqar/locale/pt_BR/LC_MESSAGES/zaqar-log-critical.po
index fd216d89d..8c9f1794b 100644
--- a/marconi/locale/pt_BR/LC_MESSAGES/marconi-log-critical.po
+++ b/zaqar/locale/pt_BR/LC_MESSAGES/zaqar-log-critical.po
@@ -6,13 +6,13 @@
 # Gabriel Guerreiro <gabriel.eu.br@gmail.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: Marconi\n"
+"Project-Id-Version: Zaqar\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2014-07-17 06:07+0000\n"
 "PO-Revision-Date: 2014-07-05 23:41+0000\n"
 "Last-Translator: Gabriel Guerreiro <gabriel.eu.br@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
-"marconi/language/pt_BR/)\n"
+"zaqar/language/pt_BR/)\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/marconi/locale/pt_BR/LC_MESSAGES/marconi-log-error.po b/zaqar/locale/pt_BR/LC_MESSAGES/zaqar-log-error.po
similarity index 76%
rename from marconi/locale/pt_BR/LC_MESSAGES/marconi-log-error.po
rename to zaqar/locale/pt_BR/LC_MESSAGES/zaqar-log-error.po
index ff5c7250a..179612077 100644
--- a/marconi/locale/pt_BR/LC_MESSAGES/marconi-log-error.po
+++ b/zaqar/locale/pt_BR/LC_MESSAGES/zaqar-log-error.po
@@ -1,18 +1,18 @@
-# Translations template for marconi.
+# Translations template for zaqar.
 # Copyright (C) 2014 ORGANIZATION
-# This file is distributed under the same license as the marconi project.
+# This file is distributed under the same license as the zaqar project.
 #
 # Translators:
 # Gabriel Guerreiro <gabriel.eu.br@gmail.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: Marconi\n"
+"Project-Id-Version: Zaqar\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2014-07-17 06:07+0000\n"
 "PO-Revision-Date: 2014-07-05 23:52+0000\n"
 "Last-Translator: Gabriel Guerreiro <gabriel.eu.br@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
-"marconi/language/pt_BR/)\n"
+"zaqar/language/pt_BR/)\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,17 +20,17 @@ msgstr ""
 "Generated-By: Babel 1.3\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: marconi/openstack/common/excutils.py:76
+#: zaqar/openstack/common/excutils.py:76
 #, python-format
 msgid "Original exception being dropped: %s"
 msgstr "Exceção original sendo cancelada: %s"
 
-#: marconi/openstack/common/excutils.py:105
+#: zaqar/openstack/common/excutils.py:105
 #, python-format
 msgid "Unexpected exception occurred %d time(s)... retrying."
 msgstr "Exceção não esperada ocorreu %d vez(es)... tentando novamente."
 
-#: marconi/openstack/common/lockutils.py:120
+#: zaqar/openstack/common/lockutils.py:120
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr "Não foi possível liberar o bloqueio `%s`"
diff --git a/marconi/locale/pt_BR/LC_MESSAGES/marconi-log-info.po b/zaqar/locale/pt_BR/LC_MESSAGES/zaqar-log-info.po
similarity index 74%
rename from marconi/locale/pt_BR/LC_MESSAGES/marconi-log-info.po
rename to zaqar/locale/pt_BR/LC_MESSAGES/zaqar-log-info.po
index 6a96aa576..f68ecef2e 100644
--- a/marconi/locale/pt_BR/LC_MESSAGES/marconi-log-info.po
+++ b/zaqar/locale/pt_BR/LC_MESSAGES/zaqar-log-info.po
@@ -1,18 +1,18 @@
-# Translations template for marconi.
+# Translations template for zaqar.
 # Copyright (C) 2014 ORGANIZATION
-# This file is distributed under the same license as the marconi project.
+# This file is distributed under the same license as the zaqar project.
 #
 # Translators:
 # Gabriel Guerreiro <gabriel.eu.br@gmail.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: Marconi\n"
+"Project-Id-Version: Zaqar\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2014-07-17 06:07+0000\n"
 "PO-Revision-Date: 2014-07-06 00:00+0000\n"
 "Last-Translator: Gabriel Guerreiro <gabriel.eu.br@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
-"marconi/language/pt_BR/)\n"
+"zaqar/language/pt_BR/)\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,12 +20,12 @@ msgstr ""
 "Generated-By: Babel 1.3\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: marconi/openstack/common/lockutils.py:83
+#: zaqar/openstack/common/lockutils.py:83
 #, python-format
 msgid "Created lock path: %s"
 msgstr "Caminho do bloqueio criado: %s"
 
-#: marconi/openstack/common/lockutils.py:250
+#: zaqar/openstack/common/lockutils.py:250
 #, python-format
 msgid "Failed to remove file %(file)s"
 msgstr "Erro ao remover o arquivo %(file)s"
diff --git a/marconi/locale/pt_BR/LC_MESSAGES/marconi-log-warning.po b/zaqar/locale/pt_BR/LC_MESSAGES/zaqar-log-warning.po
similarity index 92%
rename from marconi/locale/pt_BR/LC_MESSAGES/marconi-log-warning.po
rename to zaqar/locale/pt_BR/LC_MESSAGES/zaqar-log-warning.po
index a4817fe88..b9b016f88 100644
--- a/marconi/locale/pt_BR/LC_MESSAGES/marconi-log-warning.po
+++ b/zaqar/locale/pt_BR/LC_MESSAGES/zaqar-log-warning.po
@@ -6,13 +6,13 @@
 # Gabriel Guerreiro <gabriel.eu.br@gmail.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: Marconi\n"
+"Project-Id-Version: Zaqar\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2014-07-17 06:07+0000\n"
 "PO-Revision-Date: 2014-07-06 00:00+0000\n"
 "Last-Translator: Gabriel Guerreiro <gabriel.eu.br@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
-"marconi/language/pt_BR/)\n"
+"zaqar/language/pt_BR/)\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/marconi/locale/pt_BR/LC_MESSAGES/marconi.po b/zaqar/locale/pt_BR/LC_MESSAGES/zaqar.po
similarity index 67%
rename from marconi/locale/pt_BR/LC_MESSAGES/marconi.po
rename to zaqar/locale/pt_BR/LC_MESSAGES/zaqar.po
index d065f590a..97a7e1b40 100644
--- a/marconi/locale/pt_BR/LC_MESSAGES/marconi.po
+++ b/zaqar/locale/pt_BR/LC_MESSAGES/zaqar.po
@@ -1,43 +1,43 @@
-# Portuguese (Brazil) translations for marconi.
+# Portuguese (Brazil) translations for zaqar.
 # Copyright (C) 2014 ORGANIZATION
-# This file is distributed under the same license as the marconi project.
+# This file is distributed under the same license as the zaqar project.
 #
 # Translators:
 # Gabriel Guerreiro <gabriel.eu.br@gmail.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version:  Marconi\n"
+"Project-Id-Version:  Zaqar\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2014-07-24 06:07+0000\n"
 "PO-Revision-Date: 2014-07-24 02:21+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Portuguese (Brazil) "
-"(http://www.transifex.com/projects/p/marconi/language/pt_BR/)\n"
+"(http://www.transifex.com/projects/p/zaqar/language/pt_BR/)\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 1.3\n"
 
-#: marconi/common/api.py:48
+#: zaqar/common/api.py:48
 msgid "{0} is not a valid operation"
 msgstr "{0} não é uma operação válida"
 
-#: marconi/common/cli.py:50
+#: zaqar/common/cli.py:50
 msgid "Terminating"
 msgstr "Finalizando"
 
-#: marconi/common/pipeline.py:94
+#: zaqar/common/pipeline.py:94
 #, python-format
 msgid "Stage %(stage)s does not implement %(method)s"
 msgstr "O estágio %(stage)s não implementa o método %(method)s"
 
-#: marconi/common/pipeline.py:108
+#: zaqar/common/pipeline.py:108
 #, python-format
 msgid "Method %s not found in any of the registered stages"
 msgstr "O método %s não foi encontrado em nenhum dos estágios registrados"
 
-#: marconi/common/transport/wsgi/helpers.py:45
+#: zaqar/common/transport/wsgi/helpers.py:45
 msgid ""
 "\n"
 "X-PROJECT-ID cannot be an empty string. Specify the right header X"
@@ -49,21 +49,21 @@ msgstr ""
 "-PROJECT-ID\n"
 "e tente novemente."
 
-#: marconi/common/transport/wsgi/helpers.py:86
+#: zaqar/common/transport/wsgi/helpers.py:86
 msgid "Invalid queue identification"
 msgstr "Identificação de fila inválida"
 
-#: marconi/common/transport/wsgi/helpers.py:87
+#: zaqar/common/transport/wsgi/helpers.py:87
 msgid "The format of the submitted queue name or project id is not valid."
 msgstr ""
 "O formato do nome da fila submetida ou o identificador do projeto não é "
 "válido."
 
-#: marconi/openstack/common/gettextutils.py:320
+#: zaqar/openstack/common/gettextutils.py:320
 msgid "Message objects do not support addition."
 msgstr "Objetos mensagem não suportam adição."
 
-#: marconi/openstack/common/gettextutils.py:330
+#: zaqar/openstack/common/gettextutils.py:330
 msgid ""
 "Message objects do not support str() because they may contain non-ascii "
 "characters. Please use unicode() or translate() instead."
@@ -71,47 +71,47 @@ msgstr ""
 "Objetos mensagem não suportam str() pois podem conter carácteres "
 "não-ascii. Use unicode() ou translate()."
 
-#: marconi/openstack/common/lockutils.py:102
+#: zaqar/openstack/common/lockutils.py:102
 #, python-format
 msgid "Unable to acquire lock on `%(filename)s` due to %(exception)s"
 msgstr "Não foi possível bloquear o arquivo ` %(filename)s` devido a %(exception)s"
 
-#: marconi/openstack/common/log.py:327
+#: zaqar/openstack/common/log.py:327
 #, python-format
 msgid "Deprecated: %s"
 msgstr "Obsoleto: %s"
 
-#: marconi/openstack/common/log.py:436
+#: zaqar/openstack/common/log.py:436
 #, python-format
 msgid "Error loading logging config %(log_config)s: %(err_msg)s"
 msgstr "Erro ao carregar configuração %(log_config)s: %(err_msg)s"
 
-#: marconi/openstack/common/log.py:487
+#: zaqar/openstack/common/log.py:487
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr "O recurso de syslog deve ser um dos seguintes: %s"
 
-#: marconi/openstack/common/log.py:725
+#: zaqar/openstack/common/log.py:725
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr "Chamada fatal de configuração obsoleta: %(msg)s"
 
-#: marconi/openstack/common/strutils.py:92
+#: zaqar/openstack/common/strutils.py:92
 #, python-format
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr "Valor não reconhecido '%(val)s', os valores aceitáveis são: %(acceptable)s"
 
-#: marconi/openstack/common/strutils.py:197
+#: zaqar/openstack/common/strutils.py:197
 #, python-format
 msgid "Invalid unit system: \"%s\""
 msgstr "Unidade inválida do sistema: \"%s\""
 
-#: marconi/openstack/common/strutils.py:206
+#: zaqar/openstack/common/strutils.py:206
 #, python-format
 msgid "Invalid string format: %s"
 msgstr "Formato de string inválido: %s"
 
-#: marconi/queues/storage/pipeline.py:30
+#: zaqar/queues/storage/pipeline.py:30
 msgid ""
 "Pipeline to use for processing {0} operations. This pipeline will be "
 "consumed before calling the storage driver's controller methods, which "
@@ -121,12 +121,12 @@ msgstr ""
 " antes de chamar os métodos de controle do driver de armazenamento, que "
 "sempre será adicionado a essa pipeline."
 
-#: marconi/queues/storage/pipeline.py:78
+#: zaqar/queues/storage/pipeline.py:78
 #, python-format
 msgid "Stage %(stage)d could not be imported: %(ex)s"
 msgstr "O estágio %(stage)d não pode ser importado: %(ex)s"
 
-#: marconi/queues/storage/mongodb/messages.py:546
+#: zaqar/queues/storage/mongodb/messages.py:546
 #, python-format
 msgid ""
 "%(attempts)d attempt(s) required to post %(num_messages)d messages to "
@@ -135,7 +135,7 @@ msgstr ""
 "%(attempts)d tentativa(s) necessária(s) para enviar %(num_messages)d "
 "mensagens para a fila \"%(queue)s\" do projeto %(project)s"
 
-#: marconi/queues/storage/mongodb/messages.py:590
+#: zaqar/queues/storage/mongodb/messages.py:590
 #, python-format
 msgid ""
 "First attempt failed while adding messages to queue \"%(queue)s\" under "
@@ -144,7 +144,7 @@ msgstr ""
 "Primeira tentativa falhou durante a adição de mensagens à fila "
 "\"%(queue)s\" do projeto %(project)s"
 
-#: marconi/queues/storage/mongodb/messages.py:604
+#: zaqar/queues/storage/mongodb/messages.py:604
 #, python-format
 msgid ""
 "Exceeded maximum retry duration for queue \"%(queue)s\" under project "
@@ -153,7 +153,7 @@ msgstr ""
 "Excedido o tempo máximo de tentativas para a fila \"%(queue)s\" do "
 "projeto %(project)s"
 
-#: marconi/queues/storage/mongodb/messages.py:664
+#: zaqar/queues/storage/mongodb/messages.py:664
 #, python-format
 msgid ""
 "Hit maximum number of attempts (%(max)s) for queue \"%(queue)s\" under "
@@ -162,7 +162,7 @@ msgstr ""
 "Excedido o número máximo de tentativas (%(max)s) para a fila "
 "\"%(queue)s\" do projeto %(project)s"
 
-#: marconi/queues/storage/mongodb/queues.py:177
+#: zaqar/queues/storage/mongodb/queues.py:177
 #, python-format
 msgid ""
 "Failed to increment the message counter for queue %(name)s and project "
@@ -171,25 +171,25 @@ msgstr ""
 "Falha ao incrementar o contador de mensagens para a fila %(name)s e "
 "projeto %(project)s"
 
-#: marconi/queues/storage/mongodb/utils.py:290
+#: zaqar/queues/storage/mongodb/utils.py:290
 msgid "Caught AutoReconnect, retrying the call to {0}"
 msgstr "Exceção AutoReconnect capturada, tentando chamar {0} novamente"
 
-#: marconi/queues/storage/mongodb/utils.py:296
+#: zaqar/queues/storage/mongodb/utils.py:296
 msgid "Caught AutoReconnect, maximum attempts to {0} exceeded."
 msgstr ""
 "Exceção AutoReconnect capturada, número máximo de tentativas para {0} "
 "excedido."
 
-#: marconi/queues/transport/validation.py:97
+#: zaqar/queues/transport/validation.py:97
 msgid "Project ids may not be more than {0} characters long."
 msgstr "Identificadores de projeto não devem ter mais de {0} carácteres."
 
-#: marconi/queues/transport/validation.py:101
+#: zaqar/queues/transport/validation.py:101
 msgid "Queue names may not be more than {0} characters long."
 msgstr "Nomes de filas não devem ter mais de {0} carácteres."
 
-#: marconi/queues/transport/validation.py:106
+#: zaqar/queues/transport/validation.py:106
 msgid ""
 "Queue names may only contain ASCII letters, digits, underscores, and "
 "dashes."
@@ -197,23 +197,23 @@ msgstr ""
 "O nome de uma fila deve conter apenas letras ASCII, números, subtraços e "
 "traços."
 
-#: marconi/queues/transport/validation.py:119
+#: zaqar/queues/transport/validation.py:119
 msgid "Limit must be at least 1 and no greater than {0}."
 msgstr "O limite deve ser no mínimo 1 e não deve ser superior a {0}."
 
-#: marconi/queues/transport/validation.py:131
+#: zaqar/queues/transport/validation.py:131
 msgid "Queue metadata is too large. Max size: {0}"
 msgstr "Os métadados da fila são muito grandes. Tamanho máximo: {0}"
 
-#: marconi/queues/transport/validation.py:143
+#: zaqar/queues/transport/validation.py:143
 msgid "No messages to enqueu."
 msgstr "Não foi possível adicionar mensagens à fila."
 
-#: marconi/queues/transport/validation.py:158
+#: zaqar/queues/transport/validation.py:158
 msgid "Message collection size is too large. Max size {0}"
 msgstr "O tamanho da coleção de mensagens é muito grande. O tamnho máximo é {0}"
 
-#: marconi/queues/transport/validation.py:167
+#: zaqar/queues/transport/validation.py:167
 msgid ""
 "The TTL for a message may not exceed {0} seconds, and must be at least "
 "{1} seconds long."
@@ -221,30 +221,30 @@ msgstr ""
 "O tempo de vida de uma mensagem não pode exceder {0} segundos e não deve "
 "ser menor que {1} segundos."
 
-#: marconi/queues/transport/validation.py:183
-#: marconi/queues/transport/validation.py:239
+#: zaqar/queues/transport/validation.py:183
+#: zaqar/queues/transport/validation.py:239
 msgid "Limit must be at least 1 and may not be greater than {0}."
 msgstr "O limite deve ser de no mínimo 1 e não deve exceder {0}."
 
-#: marconi/queues/transport/validation.py:201
+#: zaqar/queues/transport/validation.py:201
 msgid "pop and id params cannot be present together in the delete request."
 msgstr ""
 
-#: marconi/queues/transport/validation.py:207
+#: zaqar/queues/transport/validation.py:207
 msgid ""
 "The request should have either \"ids\" or \"pop\" parameter in the "
 "request, to be able to delete."
 msgstr ""
 
-#: marconi/queues/transport/validation.py:214
+#: zaqar/queues/transport/validation.py:214
 msgid "Pop value must be at least 1 and may not be greater than {0}."
 msgstr ""
 
-#: marconi/queues/transport/validation.py:221
+#: zaqar/queues/transport/validation.py:221
 msgid "ids parameter should have at least 1 and not greater than {0} values."
 msgstr ""
 
-#: marconi/queues/transport/validation.py:248
+#: zaqar/queues/transport/validation.py:248
 msgid ""
 "The grace for a claim may not exceed {0} seconds, and must be at least "
 "{1} seconds long."
@@ -252,7 +252,7 @@ msgstr ""
 "O prazo de carência para um pedido não deve exceder {0} segundos e não "
 "deve ser menor que {1} segundo."
 
-#: marconi/queues/transport/validation.py:264
+#: zaqar/queues/transport/validation.py:264
 msgid ""
 "The TTL for a claim may not exceed {0} seconds, and must be at least {1} "
 "seconds long."
@@ -260,158 +260,158 @@ msgstr ""
 "O tempo de vida de um pedido não pode exceder {0} segundos e não deve ser"
 " menor que {1} segundos."
 
-#: marconi/queues/transport/wsgi/driver.py:105
+#: zaqar/queues/transport/wsgi/driver.py:105
 #, python-format
 msgid "Serving on host %(bind)s:%(port)s"
 msgstr "Servindo em %(bind)s:%(port)s"
 
-#: marconi/queues/transport/wsgi/errors.py:24
+#: zaqar/queues/transport/wsgi/errors.py:24
 msgid "Service temporarily unavailable"
 msgstr "Serviço temporariamente indisponível"
 
-#: marconi/queues/transport/wsgi/errors.py:25
+#: zaqar/queues/transport/wsgi/errors.py:25
 msgid "Please try again in a few seconds."
 msgstr "Tente novamente em alguns segundos."
 
-#: marconi/queues/transport/wsgi/errors.py:36
+#: zaqar/queues/transport/wsgi/errors.py:36
 msgid "Invalid API call"
 msgstr "Chamada de API inválida"
 
-#: marconi/queues/transport/wsgi/errors.py:45
+#: zaqar/queues/transport/wsgi/errors.py:45
 msgid "Invalid request body"
 msgstr "Corpo da requisição inválido"
 
-#: marconi/queues/transport/wsgi/errors.py:54
+#: zaqar/queues/transport/wsgi/errors.py:54
 msgid "Document type not supported."
 msgstr "Tipo de documento não suportado."
 
-#: marconi/queues/transport/wsgi/utils.py:50
+#: zaqar/queues/transport/wsgi/utils.py:50
 msgid "Request body can not be empty"
 msgstr "O corpo da requisição não pode ser vazio"
 
-#: marconi/queues/transport/wsgi/utils.py:61
+#: zaqar/queues/transport/wsgi/utils.py:61
 msgid "Request body could not be parsed."
 msgstr "Não foi possível analisar o corpo da requisição."
 
-#: marconi/queues/transport/wsgi/utils.py:66
+#: zaqar/queues/transport/wsgi/utils.py:66
 msgid "JSON contains integer that is too large."
 msgstr "JSON possui um numero inteiro muito grande."
 
-#: marconi/queues/transport/wsgi/utils.py:72
+#: zaqar/queues/transport/wsgi/utils.py:72
 msgid "Request body could not be read."
 msgstr "O corpo da requisição não pode ser lido."
 
-#: marconi/queues/transport/wsgi/utils.py:168
+#: zaqar/queues/transport/wsgi/utils.py:168
 msgid "Missing \"{name}\" field."
 msgstr "Faltando o campo \"{name}\"."
 
-#: marconi/queues/transport/wsgi/utils.py:176
+#: zaqar/queues/transport/wsgi/utils.py:176
 msgid "The value of the \"{name}\" field must be a {vtype}."
 msgstr "O valor do campo \"{name}\" deve ser do tipo {vtype}."
 
-#: marconi/queues/transport/wsgi/utils.py:194
+#: zaqar/queues/transport/wsgi/utils.py:194
 msgid "Malformed hexadecimal UUID."
 msgstr "UUID hexadecimal inválido."
 
-#: marconi/queues/transport/wsgi/v1_0/claims.py:77
-#: marconi/queues/transport/wsgi/v1_1/claims.py:100
+#: zaqar/queues/transport/wsgi/v1_0/claims.py:77
+#: zaqar/queues/transport/wsgi/v1_1/claims.py:100
 msgid "Claim could not be created."
 msgstr "Não foi possível criar o pedido."
 
-#: marconi/queues/transport/wsgi/v1_0/claims.py:125
-#: marconi/queues/transport/wsgi/v1_1/claims.py:148
+#: zaqar/queues/transport/wsgi/v1_0/claims.py:125
+#: zaqar/queues/transport/wsgi/v1_1/claims.py:148
 msgid "Claim could not be queried."
 msgstr "Não foi possível consultar o pedido."
 
-#: marconi/queues/transport/wsgi/v1_0/claims.py:173
-#: marconi/queues/transport/wsgi/v1_1/claims.py:196
+#: zaqar/queues/transport/wsgi/v1_0/claims.py:173
+#: zaqar/queues/transport/wsgi/v1_1/claims.py:196
 msgid "Claim could not be updated."
 msgstr "Não foi possível atualizar o pedido."
 
-#: marconi/queues/transport/wsgi/v1_0/claims.py:191
-#: marconi/queues/transport/wsgi/v1_1/claims.py:214
+#: zaqar/queues/transport/wsgi/v1_0/claims.py:191
+#: zaqar/queues/transport/wsgi/v1_1/claims.py:214
 msgid "Claim could not be deleted."
 msgstr "Não foi possível excluir o pedido."
 
-#: marconi/queues/transport/wsgi/v1_0/messages.py:60
-#: marconi/queues/transport/wsgi/v1_0/messages.py:267
-#: marconi/queues/transport/wsgi/v1_1/messages.py:73
-#: marconi/queues/transport/wsgi/v1_1/messages.py:333
+#: zaqar/queues/transport/wsgi/v1_0/messages.py:60
+#: zaqar/queues/transport/wsgi/v1_0/messages.py:267
+#: zaqar/queues/transport/wsgi/v1_1/messages.py:73
+#: zaqar/queues/transport/wsgi/v1_1/messages.py:333
 msgid "Message could not be retrieved."
 msgstr "Não foi possível recuperar a mensagem."
 
-#: marconi/queues/transport/wsgi/v1_0/messages.py:108
-#: marconi/queues/transport/wsgi/v1_1/messages.py:121
+#: zaqar/queues/transport/wsgi/v1_0/messages.py:108
+#: zaqar/queues/transport/wsgi/v1_1/messages.py:121
 msgid "Messages could not be listed."
 msgstr "Não foi possível listar a mensagem."
 
-#: marconi/queues/transport/wsgi/v1_0/messages.py:181
-#: marconi/queues/transport/wsgi/v1_1/messages.py:204
+#: zaqar/queues/transport/wsgi/v1_0/messages.py:181
+#: zaqar/queues/transport/wsgi/v1_1/messages.py:204
 msgid "No messages could be enqueued."
 msgstr "Nenhuma mensagem pode ser adicionada à fila."
 
-#: marconi/queues/transport/wsgi/v1_0/messages.py:186
-#: marconi/queues/transport/wsgi/v1_1/messages.py:209
+#: zaqar/queues/transport/wsgi/v1_0/messages.py:186
+#: zaqar/queues/transport/wsgi/v1_1/messages.py:209
 msgid "Messages could not be enqueued."
 msgstr "Não foi possível adicionar mensagens à fila."
 
-#: marconi/queues/transport/wsgi/v1_0/messages.py:236
-#: marconi/queues/transport/wsgi/v1_1/messages.py:278
+#: zaqar/queues/transport/wsgi/v1_0/messages.py:236
+#: zaqar/queues/transport/wsgi/v1_1/messages.py:278
 msgid "Messages could not be deleted."
 msgstr "Não foi possível excluir as mensagens."
 
-#: marconi/queues/transport/wsgi/v1_0/messages.py:293
-#: marconi/queues/transport/wsgi/v1_1/messages.py:360
+#: zaqar/queues/transport/wsgi/v1_0/messages.py:293
+#: zaqar/queues/transport/wsgi/v1_1/messages.py:360
 msgid "Unable to delete"
 msgstr "Impossível excluir"
 
-#: marconi/queues/transport/wsgi/v1_0/messages.py:294
-#: marconi/queues/transport/wsgi/v1_1/messages.py:361
+#: zaqar/queues/transport/wsgi/v1_0/messages.py:294
+#: zaqar/queues/transport/wsgi/v1_1/messages.py:361
 msgid "This message is claimed; it cannot be deleted without a valid claim_id."
 msgstr ""
 "Esta mensagem está sendo usada; não pode ser excluída sem um claim_id "
 "válido."
 
-#: marconi/queues/transport/wsgi/v1_0/messages.py:300
-#: marconi/queues/transport/wsgi/v1_1/messages.py:367
+#: zaqar/queues/transport/wsgi/v1_0/messages.py:300
+#: zaqar/queues/transport/wsgi/v1_1/messages.py:367
 msgid "Message could not be deleted."
 msgstr "A mensagem não pode ser excluída."
 
-#: marconi/queues/transport/wsgi/v1_0/metadata.py:54
-#: marconi/queues/transport/wsgi/v1_1/metadata.py:54
+#: zaqar/queues/transport/wsgi/v1_0/metadata.py:54
+#: zaqar/queues/transport/wsgi/v1_1/metadata.py:54
 msgid "Queue metadata could not be retrieved."
 msgstr "Não foi possível obter os metadados da fila."
 
-#: marconi/queues/transport/wsgi/v1_0/metadata.py:91
-#: marconi/queues/transport/wsgi/v1_1/metadata.py:91
+#: zaqar/queues/transport/wsgi/v1_0/metadata.py:91
+#: zaqar/queues/transport/wsgi/v1_1/metadata.py:91
 msgid "Metadata could not be updated."
 msgstr "Não foi possível atualizar os metadados."
 
-#: marconi/queues/transport/wsgi/v1_0/queues.py:48
-#: marconi/queues/transport/wsgi/v1_1/queues.py:48
+#: zaqar/queues/transport/wsgi/v1_0/queues.py:48
+#: zaqar/queues/transport/wsgi/v1_1/queues.py:48
 msgid "Queue could not be created."
 msgstr "Não foi possível criar a fila."
 
-#: marconi/queues/transport/wsgi/v1_0/queues.py:77
-#: marconi/queues/transport/wsgi/v1_1/queues.py:63
+#: zaqar/queues/transport/wsgi/v1_0/queues.py:77
+#: zaqar/queues/transport/wsgi/v1_1/queues.py:63
 msgid "Queue could not be deleted."
 msgstr "Não foi possível excluir a fila."
 
-#: marconi/queues/transport/wsgi/v1_0/queues.py:113
-#: marconi/queues/transport/wsgi/v1_1/queues.py:99
+#: zaqar/queues/transport/wsgi/v1_0/queues.py:113
+#: zaqar/queues/transport/wsgi/v1_1/queues.py:99
 msgid "Queues could not be listed."
 msgstr "Não foi possível listar as filas."
 
-#: marconi/queues/transport/wsgi/v1_0/stats.py:63
-#: marconi/queues/transport/wsgi/v1_1/stats.py:74
+#: zaqar/queues/transport/wsgi/v1_0/stats.py:63
+#: zaqar/queues/transport/wsgi/v1_1/stats.py:74
 msgid "Queue stats could not be read."
 msgstr "Não foi possível ler as estatísticas da fila."
 
-#: marconi/queues/transport/wsgi/v1_1/messages.py:166
+#: zaqar/queues/transport/wsgi/v1_1/messages.py:166
 msgid "No messages were found in the request body."
 msgstr ""
 
-#: marconi/queues/transport/wsgi/v1_1/messages.py:296
+#: zaqar/queues/transport/wsgi/v1_1/messages.py:296
 msgid "Messages could not be popped."
 msgstr ""
 
diff --git a/marconi/locale/marconi-log-warning.pot b/zaqar/locale/zaqar-log-critical.pot
similarity index 73%
rename from marconi/locale/marconi-log-warning.pot
rename to zaqar/locale/zaqar-log-critical.pot
index aabd5cf10..cbc7bd738 100644
--- a/marconi/locale/marconi-log-warning.pot
+++ b/zaqar/locale/zaqar-log-critical.pot
@@ -1,12 +1,12 @@
-# Translations template for marconi.
+# Translations template for zaqar.
 # Copyright (C) 2014 ORGANIZATION
-# This file is distributed under the same license as the marconi project.
+# This file is distributed under the same license as the zaqar project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: marconi 2014.2.dev65.g57842ef\n"
+"Project-Id-Version: zaqar 2014.2.dev65.g57842ef\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2014-07-17 06:07+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
diff --git a/marconi/locale/marconi-log-error.pot b/zaqar/locale/zaqar-log-error.pot
similarity index 69%
rename from marconi/locale/marconi-log-error.pot
rename to zaqar/locale/zaqar-log-error.pot
index 68bdf35f2..4f21906d6 100644
--- a/marconi/locale/marconi-log-error.pot
+++ b/zaqar/locale/zaqar-log-error.pot
@@ -1,12 +1,12 @@
-# Translations template for marconi.
+# Translations template for zaqar.
 # Copyright (C) 2014 ORGANIZATION
-# This file is distributed under the same license as the marconi project.
+# This file is distributed under the same license as the zaqar project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: marconi 2014.2.dev65.g57842ef\n"
+"Project-Id-Version: zaqar 2014.2.dev65.g57842ef\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2014-07-17 06:07+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
@@ -17,17 +17,17 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 1.3\n"
 
-#: marconi/openstack/common/excutils.py:76
+#: zaqar/openstack/common/excutils.py:76
 #, python-format
 msgid "Original exception being dropped: %s"
 msgstr ""
 
-#: marconi/openstack/common/excutils.py:105
+#: zaqar/openstack/common/excutils.py:105
 #, python-format
 msgid "Unexpected exception occurred %d time(s)... retrying."
 msgstr ""
 
-#: marconi/openstack/common/lockutils.py:120
+#: zaqar/openstack/common/lockutils.py:120
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
diff --git a/marconi/locale/marconi-log-info.pot b/zaqar/locale/zaqar-log-info.pot
similarity index 69%
rename from marconi/locale/marconi-log-info.pot
rename to zaqar/locale/zaqar-log-info.pot
index 19bb132a4..ca1adc378 100644
--- a/marconi/locale/marconi-log-info.pot
+++ b/zaqar/locale/zaqar-log-info.pot
@@ -1,12 +1,12 @@
-# Translations template for marconi.
+# Translations template for zaqar.
 # Copyright (C) 2014 ORGANIZATION
-# This file is distributed under the same license as the marconi project.
+# This file is distributed under the same license as the zaqar project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: marconi 2014.2.dev65.g57842ef\n"
+"Project-Id-Version: zaqar 2014.2.dev65.g57842ef\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2014-07-17 06:07+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
@@ -17,12 +17,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 1.3\n"
 
-#: marconi/openstack/common/lockutils.py:83
+#: zaqar/openstack/common/lockutils.py:83
 #, python-format
 msgid "Created lock path: %s"
 msgstr ""
 
-#: marconi/openstack/common/lockutils.py:250
+#: zaqar/openstack/common/lockutils.py:250
 #, python-format
 msgid "Failed to remove file %(file)s"
 msgstr ""
diff --git a/marconi/locale/marconi-log-critical.pot b/zaqar/locale/zaqar-log-warning.pot
similarity index 73%
rename from marconi/locale/marconi-log-critical.pot
rename to zaqar/locale/zaqar-log-warning.pot
index aabd5cf10..cbc7bd738 100644
--- a/marconi/locale/marconi-log-critical.pot
+++ b/zaqar/locale/zaqar-log-warning.pot
@@ -1,12 +1,12 @@
-# Translations template for marconi.
+# Translations template for zaqar.
 # Copyright (C) 2014 ORGANIZATION
-# This file is distributed under the same license as the marconi project.
+# This file is distributed under the same license as the zaqar project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: marconi 2014.2.dev65.g57842ef\n"
+"Project-Id-Version: zaqar 2014.2.dev65.g57842ef\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2014-07-17 06:07+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
diff --git a/marconi/locale/marconi.pot b/zaqar/locale/zaqar.pot
similarity index 55%
rename from marconi/locale/marconi.pot
rename to zaqar/locale/zaqar.pot
index aef32d261..efb69dc69 100644
--- a/marconi/locale/marconi.pot
+++ b/zaqar/locale/zaqar.pot
@@ -1,12 +1,12 @@
-# Translations template for marconi.
+# Translations template for zaqar.
 # Copyright (C) 2014 ORGANIZATION
-# This file is distributed under the same license as the marconi project.
+# This file is distributed under the same license as the zaqar project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: marconi 2014.2.dev75.gb3f1b48\n"
+"Project-Id-Version: zaqar 2014.2.dev75.gb3f1b48\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2014-07-24 06:07+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
@@ -17,25 +17,25 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 1.3\n"
 
-#: marconi/common/api.py:48
+#: zaqar/common/api.py:48
 msgid "{0} is not a valid operation"
 msgstr ""
 
-#: marconi/common/cli.py:50
+#: zaqar/common/cli.py:50
 msgid "Terminating"
 msgstr ""
 
-#: marconi/common/pipeline.py:94
+#: zaqar/common/pipeline.py:94
 #, python-format
 msgid "Stage %(stage)s does not implement %(method)s"
 msgstr ""
 
-#: marconi/common/pipeline.py:108
+#: zaqar/common/pipeline.py:108
 #, python-format
 msgid "Method %s not found in any of the registered stages"
 msgstr ""
 
-#: marconi/common/transport/wsgi/helpers.py:45
+#: zaqar/common/transport/wsgi/helpers.py:45
 msgid ""
 "\n"
 "X-PROJECT-ID cannot be an empty string. Specify the right header X"
@@ -43,340 +43,340 @@ msgid ""
 "and retry."
 msgstr ""
 
-#: marconi/common/transport/wsgi/helpers.py:86
+#: zaqar/common/transport/wsgi/helpers.py:86
 msgid "Invalid queue identification"
 msgstr ""
 
-#: marconi/common/transport/wsgi/helpers.py:87
+#: zaqar/common/transport/wsgi/helpers.py:87
 msgid "The format of the submitted queue name or project id is not valid."
 msgstr ""
 
-#: marconi/openstack/common/gettextutils.py:320
+#: zaqar/openstack/common/gettextutils.py:320
 msgid "Message objects do not support addition."
 msgstr ""
 
-#: marconi/openstack/common/gettextutils.py:330
+#: zaqar/openstack/common/gettextutils.py:330
 msgid ""
 "Message objects do not support str() because they may contain non-ascii "
 "characters. Please use unicode() or translate() instead."
 msgstr ""
 
-#: marconi/openstack/common/lockutils.py:102
+#: zaqar/openstack/common/lockutils.py:102
 #, python-format
 msgid "Unable to acquire lock on `%(filename)s` due to %(exception)s"
 msgstr ""
 
-#: marconi/openstack/common/log.py:327
+#: zaqar/openstack/common/log.py:327
 #, python-format
 msgid "Deprecated: %s"
 msgstr ""
 
-#: marconi/openstack/common/log.py:436
+#: zaqar/openstack/common/log.py:436
 #, python-format
 msgid "Error loading logging config %(log_config)s: %(err_msg)s"
 msgstr ""
 
-#: marconi/openstack/common/log.py:487
+#: zaqar/openstack/common/log.py:487
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: marconi/openstack/common/log.py:725
+#: zaqar/openstack/common/log.py:725
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
 
-#: marconi/openstack/common/strutils.py:92
+#: zaqar/openstack/common/strutils.py:92
 #, python-format
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
 
-#: marconi/openstack/common/strutils.py:197
+#: zaqar/openstack/common/strutils.py:197
 #, python-format
 msgid "Invalid unit system: \"%s\""
 msgstr ""
 
-#: marconi/openstack/common/strutils.py:206
+#: zaqar/openstack/common/strutils.py:206
 #, python-format
 msgid "Invalid string format: %s"
 msgstr ""
 
-#: marconi/queues/storage/pipeline.py:30
+#: zaqar/queues/storage/pipeline.py:30
 msgid ""
 "Pipeline to use for processing {0} operations. This pipeline will be "
 "consumed before calling the storage driver's controller methods, which "
 "will always be appended to this pipeline."
 msgstr ""
 
-#: marconi/queues/storage/pipeline.py:78
+#: zaqar/queues/storage/pipeline.py:78
 #, python-format
 msgid "Stage %(stage)d could not be imported: %(ex)s"
 msgstr ""
 
-#: marconi/queues/storage/mongodb/messages.py:546
+#: zaqar/queues/storage/mongodb/messages.py:546
 #, python-format
 msgid ""
 "%(attempts)d attempt(s) required to post %(num_messages)d messages to "
 "queue \"%(queue)s\" under project %(project)s"
 msgstr ""
 
-#: marconi/queues/storage/mongodb/messages.py:590
+#: zaqar/queues/storage/mongodb/messages.py:590
 #, python-format
 msgid ""
 "First attempt failed while adding messages to queue \"%(queue)s\" under "
 "project %(project)s"
 msgstr ""
 
-#: marconi/queues/storage/mongodb/messages.py:604
+#: zaqar/queues/storage/mongodb/messages.py:604
 #, python-format
 msgid ""
 "Exceeded maximum retry duration for queue \"%(queue)s\" under project "
 "%(project)s"
 msgstr ""
 
-#: marconi/queues/storage/mongodb/messages.py:664
+#: zaqar/queues/storage/mongodb/messages.py:664
 #, python-format
 msgid ""
 "Hit maximum number of attempts (%(max)s) for queue \"%(queue)s\" under "
 "project %(project)s"
 msgstr ""
 
-#: marconi/queues/storage/mongodb/queues.py:177
+#: zaqar/queues/storage/mongodb/queues.py:177
 #, python-format
 msgid ""
 "Failed to increment the message counter for queue %(name)s and project "
 "%(project)s"
 msgstr ""
 
-#: marconi/queues/storage/mongodb/utils.py:290
+#: zaqar/queues/storage/mongodb/utils.py:290
 msgid "Caught AutoReconnect, retrying the call to {0}"
 msgstr ""
 
-#: marconi/queues/storage/mongodb/utils.py:296
+#: zaqar/queues/storage/mongodb/utils.py:296
 msgid "Caught AutoReconnect, maximum attempts to {0} exceeded."
 msgstr ""
 
-#: marconi/queues/transport/validation.py:97
+#: zaqar/queues/transport/validation.py:97
 msgid "Project ids may not be more than {0} characters long."
 msgstr ""
 
-#: marconi/queues/transport/validation.py:101
+#: zaqar/queues/transport/validation.py:101
 msgid "Queue names may not be more than {0} characters long."
 msgstr ""
 
-#: marconi/queues/transport/validation.py:106
+#: zaqar/queues/transport/validation.py:106
 msgid ""
 "Queue names may only contain ASCII letters, digits, underscores, and "
 "dashes."
 msgstr ""
 
-#: marconi/queues/transport/validation.py:119
+#: zaqar/queues/transport/validation.py:119
 msgid "Limit must be at least 1 and no greater than {0}."
 msgstr ""
 
-#: marconi/queues/transport/validation.py:131
+#: zaqar/queues/transport/validation.py:131
 msgid "Queue metadata is too large. Max size: {0}"
 msgstr ""
 
-#: marconi/queues/transport/validation.py:143
+#: zaqar/queues/transport/validation.py:143
 msgid "No messages to enqueu."
 msgstr ""
 
-#: marconi/queues/transport/validation.py:158
+#: zaqar/queues/transport/validation.py:158
 msgid "Message collection size is too large. Max size {0}"
 msgstr ""
 
-#: marconi/queues/transport/validation.py:167
+#: zaqar/queues/transport/validation.py:167
 msgid ""
 "The TTL for a message may not exceed {0} seconds, and must be at least "
 "{1} seconds long."
 msgstr ""
 
-#: marconi/queues/transport/validation.py:183
-#: marconi/queues/transport/validation.py:239
+#: zaqar/queues/transport/validation.py:183
+#: zaqar/queues/transport/validation.py:239
 msgid "Limit must be at least 1 and may not be greater than {0}."
 msgstr ""
 
-#: marconi/queues/transport/validation.py:201
+#: zaqar/queues/transport/validation.py:201
 msgid "pop and id params cannot be present together in the delete request."
 msgstr ""
 
-#: marconi/queues/transport/validation.py:207
+#: zaqar/queues/transport/validation.py:207
 msgid ""
 "The request should have either \"ids\" or \"pop\" parameter in the "
 "request, to be able to delete."
 msgstr ""
 
-#: marconi/queues/transport/validation.py:214
+#: zaqar/queues/transport/validation.py:214
 msgid "Pop value must be at least 1 and may not be greater than {0}."
 msgstr ""
 
-#: marconi/queues/transport/validation.py:221
+#: zaqar/queues/transport/validation.py:221
 msgid "ids parameter should have at least 1 and not greater than {0} values."
 msgstr ""
 
-#: marconi/queues/transport/validation.py:248
+#: zaqar/queues/transport/validation.py:248
 msgid ""
 "The grace for a claim may not exceed {0} seconds, and must be at least "
 "{1} seconds long."
 msgstr ""
 
-#: marconi/queues/transport/validation.py:264
+#: zaqar/queues/transport/validation.py:264
 msgid ""
 "The TTL for a claim may not exceed {0} seconds, and must be at least {1} "
 "seconds long."
 msgstr ""
 
-#: marconi/queues/transport/wsgi/driver.py:105
+#: zaqar/queues/transport/wsgi/driver.py:105
 #, python-format
 msgid "Serving on host %(bind)s:%(port)s"
 msgstr ""
 
-#: marconi/queues/transport/wsgi/errors.py:24
+#: zaqar/queues/transport/wsgi/errors.py:24
 msgid "Service temporarily unavailable"
 msgstr ""
 
-#: marconi/queues/transport/wsgi/errors.py:25
+#: zaqar/queues/transport/wsgi/errors.py:25
 msgid "Please try again in a few seconds."
 msgstr ""
 
-#: marconi/queues/transport/wsgi/errors.py:36
+#: zaqar/queues/transport/wsgi/errors.py:36
 msgid "Invalid API call"
 msgstr ""
 
-#: marconi/queues/transport/wsgi/errors.py:45
+#: zaqar/queues/transport/wsgi/errors.py:45
 msgid "Invalid request body"
 msgstr ""
 
-#: marconi/queues/transport/wsgi/errors.py:54
+#: zaqar/queues/transport/wsgi/errors.py:54
 msgid "Document type not supported."
 msgstr ""
 
-#: marconi/queues/transport/wsgi/utils.py:50
+#: zaqar/queues/transport/wsgi/utils.py:50
 msgid "Request body can not be empty"
 msgstr ""
 
-#: marconi/queues/transport/wsgi/utils.py:61
+#: zaqar/queues/transport/wsgi/utils.py:61
 msgid "Request body could not be parsed."
 msgstr ""
 
-#: marconi/queues/transport/wsgi/utils.py:66
+#: zaqar/queues/transport/wsgi/utils.py:66
 msgid "JSON contains integer that is too large."
 msgstr ""
 
-#: marconi/queues/transport/wsgi/utils.py:72
+#: zaqar/queues/transport/wsgi/utils.py:72
 msgid "Request body could not be read."
 msgstr ""
 
-#: marconi/queues/transport/wsgi/utils.py:168
+#: zaqar/queues/transport/wsgi/utils.py:168
 msgid "Missing \"{name}\" field."
 msgstr ""
 
-#: marconi/queues/transport/wsgi/utils.py:176
+#: zaqar/queues/transport/wsgi/utils.py:176
 msgid "The value of the \"{name}\" field must be a {vtype}."
 msgstr ""
 
-#: marconi/queues/transport/wsgi/utils.py:194
+#: zaqar/queues/transport/wsgi/utils.py:194
 msgid "Malformed hexadecimal UUID."
 msgstr ""
 
-#: marconi/queues/transport/wsgi/v1_0/claims.py:77
-#: marconi/queues/transport/wsgi/v1_1/claims.py:100
+#: zaqar/queues/transport/wsgi/v1_0/claims.py:77
+#: zaqar/queues/transport/wsgi/v1_1/claims.py:100
 msgid "Claim could not be created."
 msgstr ""
 
-#: marconi/queues/transport/wsgi/v1_0/claims.py:125
-#: marconi/queues/transport/wsgi/v1_1/claims.py:148
+#: zaqar/queues/transport/wsgi/v1_0/claims.py:125
+#: zaqar/queues/transport/wsgi/v1_1/claims.py:148
 msgid "Claim could not be queried."
 msgstr ""
 
-#: marconi/queues/transport/wsgi/v1_0/claims.py:173
-#: marconi/queues/transport/wsgi/v1_1/claims.py:196
+#: zaqar/queues/transport/wsgi/v1_0/claims.py:173
+#: zaqar/queues/transport/wsgi/v1_1/claims.py:196
 msgid "Claim could not be updated."
 msgstr ""
 
-#: marconi/queues/transport/wsgi/v1_0/claims.py:191
-#: marconi/queues/transport/wsgi/v1_1/claims.py:214
+#: zaqar/queues/transport/wsgi/v1_0/claims.py:191
+#: zaqar/queues/transport/wsgi/v1_1/claims.py:214
 msgid "Claim could not be deleted."
 msgstr ""
 
-#: marconi/queues/transport/wsgi/v1_0/messages.py:60
-#: marconi/queues/transport/wsgi/v1_0/messages.py:267
-#: marconi/queues/transport/wsgi/v1_1/messages.py:73
-#: marconi/queues/transport/wsgi/v1_1/messages.py:333
+#: zaqar/queues/transport/wsgi/v1_0/messages.py:60
+#: zaqar/queues/transport/wsgi/v1_0/messages.py:267
+#: zaqar/queues/transport/wsgi/v1_1/messages.py:73
+#: zaqar/queues/transport/wsgi/v1_1/messages.py:333
 msgid "Message could not be retrieved."
 msgstr ""
 
-#: marconi/queues/transport/wsgi/v1_0/messages.py:108
-#: marconi/queues/transport/wsgi/v1_1/messages.py:121
+#: zaqar/queues/transport/wsgi/v1_0/messages.py:108
+#: zaqar/queues/transport/wsgi/v1_1/messages.py:121
 msgid "Messages could not be listed."
 msgstr ""
 
-#: marconi/queues/transport/wsgi/v1_0/messages.py:181
-#: marconi/queues/transport/wsgi/v1_1/messages.py:204
+#: zaqar/queues/transport/wsgi/v1_0/messages.py:181
+#: zaqar/queues/transport/wsgi/v1_1/messages.py:204
 msgid "No messages could be enqueued."
 msgstr ""
 
-#: marconi/queues/transport/wsgi/v1_0/messages.py:186
-#: marconi/queues/transport/wsgi/v1_1/messages.py:209
+#: zaqar/queues/transport/wsgi/v1_0/messages.py:186
+#: zaqar/queues/transport/wsgi/v1_1/messages.py:209
 msgid "Messages could not be enqueued."
 msgstr ""
 
-#: marconi/queues/transport/wsgi/v1_0/messages.py:236
-#: marconi/queues/transport/wsgi/v1_1/messages.py:278
+#: zaqar/queues/transport/wsgi/v1_0/messages.py:236
+#: zaqar/queues/transport/wsgi/v1_1/messages.py:278
 msgid "Messages could not be deleted."
 msgstr ""
 
-#: marconi/queues/transport/wsgi/v1_0/messages.py:293
-#: marconi/queues/transport/wsgi/v1_1/messages.py:360
+#: zaqar/queues/transport/wsgi/v1_0/messages.py:293
+#: zaqar/queues/transport/wsgi/v1_1/messages.py:360
 msgid "Unable to delete"
 msgstr ""
 
-#: marconi/queues/transport/wsgi/v1_0/messages.py:294
-#: marconi/queues/transport/wsgi/v1_1/messages.py:361
+#: zaqar/queues/transport/wsgi/v1_0/messages.py:294
+#: zaqar/queues/transport/wsgi/v1_1/messages.py:361
 msgid "This message is claimed; it cannot be deleted without a valid claim_id."
 msgstr ""
 
-#: marconi/queues/transport/wsgi/v1_0/messages.py:300
-#: marconi/queues/transport/wsgi/v1_1/messages.py:367
+#: zaqar/queues/transport/wsgi/v1_0/messages.py:300
+#: zaqar/queues/transport/wsgi/v1_1/messages.py:367
 msgid "Message could not be deleted."
 msgstr ""
 
-#: marconi/queues/transport/wsgi/v1_0/metadata.py:54
-#: marconi/queues/transport/wsgi/v1_1/metadata.py:54
+#: zaqar/queues/transport/wsgi/v1_0/metadata.py:54
+#: zaqar/queues/transport/wsgi/v1_1/metadata.py:54
 msgid "Queue metadata could not be retrieved."
 msgstr ""
 
-#: marconi/queues/transport/wsgi/v1_0/metadata.py:91
-#: marconi/queues/transport/wsgi/v1_1/metadata.py:91
+#: zaqar/queues/transport/wsgi/v1_0/metadata.py:91
+#: zaqar/queues/transport/wsgi/v1_1/metadata.py:91
 msgid "Metadata could not be updated."
 msgstr ""
 
-#: marconi/queues/transport/wsgi/v1_0/queues.py:48
-#: marconi/queues/transport/wsgi/v1_1/queues.py:48
+#: zaqar/queues/transport/wsgi/v1_0/queues.py:48
+#: zaqar/queues/transport/wsgi/v1_1/queues.py:48
 msgid "Queue could not be created."
 msgstr ""
 
-#: marconi/queues/transport/wsgi/v1_0/queues.py:77
-#: marconi/queues/transport/wsgi/v1_1/queues.py:63
+#: zaqar/queues/transport/wsgi/v1_0/queues.py:77
+#: zaqar/queues/transport/wsgi/v1_1/queues.py:63
 msgid "Queue could not be deleted."
 msgstr ""
 
-#: marconi/queues/transport/wsgi/v1_0/queues.py:113
-#: marconi/queues/transport/wsgi/v1_1/queues.py:99
+#: zaqar/queues/transport/wsgi/v1_0/queues.py:113
+#: zaqar/queues/transport/wsgi/v1_1/queues.py:99
 msgid "Queues could not be listed."
 msgstr ""
 
-#: marconi/queues/transport/wsgi/v1_0/stats.py:63
-#: marconi/queues/transport/wsgi/v1_1/stats.py:74
+#: zaqar/queues/transport/wsgi/v1_0/stats.py:63
+#: zaqar/queues/transport/wsgi/v1_1/stats.py:74
 msgid "Queue stats could not be read."
 msgstr ""
 
-#: marconi/queues/transport/wsgi/v1_1/messages.py:166
+#: zaqar/queues/transport/wsgi/v1_1/messages.py:166
 msgid "No messages were found in the request body."
 msgstr ""
 
-#: marconi/queues/transport/wsgi/v1_1/messages.py:296
+#: zaqar/queues/transport/wsgi/v1_1/messages.py:296
 msgid "Messages could not be popped."
 msgstr ""
 
diff --git a/marconi/openstack/__init__.py b/zaqar/openstack/__init__.py
similarity index 100%
rename from marconi/openstack/__init__.py
rename to zaqar/openstack/__init__.py
diff --git a/marconi/openstack/common/__init__.py b/zaqar/openstack/common/__init__.py
similarity index 100%
rename from marconi/openstack/common/__init__.py
rename to zaqar/openstack/common/__init__.py
diff --git a/marconi/openstack/common/cache/__init__.py b/zaqar/openstack/common/cache/__init__.py
similarity index 100%
rename from marconi/openstack/common/cache/__init__.py
rename to zaqar/openstack/common/cache/__init__.py
diff --git a/marconi/openstack/common/cache/_backends/__init__.py b/zaqar/openstack/common/cache/_backends/__init__.py
similarity index 100%
rename from marconi/openstack/common/cache/_backends/__init__.py
rename to zaqar/openstack/common/cache/_backends/__init__.py
diff --git a/marconi/openstack/common/cache/_backends/memory.py b/zaqar/openstack/common/cache/_backends/memory.py
similarity index 97%
rename from marconi/openstack/common/cache/_backends/memory.py
rename to zaqar/openstack/common/cache/_backends/memory.py
index 0f2d52ee2..9632b80bc 100644
--- a/marconi/openstack/common/cache/_backends/memory.py
+++ b/zaqar/openstack/common/cache/_backends/memory.py
@@ -14,9 +14,9 @@
 
 import collections
 
-from marconi.openstack.common.cache import backends
-from marconi.openstack.common import lockutils
-from marconi.openstack.common import timeutils
+from zaqar.openstack.common.cache import backends
+from zaqar.openstack.common import lockutils
+from zaqar.openstack.common import timeutils
 
 
 class MemoryBackend(backends.BaseCache):
diff --git a/marconi/openstack/common/cache/backends.py b/zaqar/openstack/common/cache/backends.py
similarity index 100%
rename from marconi/openstack/common/cache/backends.py
rename to zaqar/openstack/common/cache/backends.py
diff --git a/marconi/openstack/common/cache/cache.py b/zaqar/openstack/common/cache/cache.py
similarity index 96%
rename from marconi/openstack/common/cache/cache.py
rename to zaqar/openstack/common/cache/cache.py
index ab29b9a60..941b27b6a 100644
--- a/marconi/openstack/common/cache/cache.py
+++ b/zaqar/openstack/common/cache/cache.py
@@ -71,7 +71,7 @@ def get_cache(url='memory://'):
     parameters = parse.parse_qsl(query)
     kwargs = {'options': dict(parameters)}
 
-    mgr = driver.DriverManager('marconi.openstack.common.cache.backends', backend,
+    mgr = driver.DriverManager('zaqar.openstack.common.cache.backends', backend,
                                invoke_on_load=True,
                                invoke_args=[parsed],
                                invoke_kwds=kwargs)
diff --git a/marconi/openstack/common/config/__init__.py b/zaqar/openstack/common/config/__init__.py
similarity index 100%
rename from marconi/openstack/common/config/__init__.py
rename to zaqar/openstack/common/config/__init__.py
diff --git a/marconi/openstack/common/config/generator.py b/zaqar/openstack/common/config/generator.py
similarity index 97%
rename from marconi/openstack/common/config/generator.py
rename to zaqar/openstack/common/config/generator.py
index f302a5726..34ac86434 100644
--- a/marconi/openstack/common/config/generator.py
+++ b/zaqar/openstack/common/config/generator.py
@@ -31,10 +31,10 @@ from oslo.config import cfg
 import six
 import stevedore.named
 
-from marconi.openstack.common import gettextutils
-from marconi.openstack.common import importutils
+from zaqar.openstack.common import gettextutils
+from zaqar.openstack.common import importutils
 
-gettextutils.install('marconi')
+gettextutils.install('zaqar')
 
 STROPT = "StrOpt"
 BOOLOPT = "BoolOpt"
@@ -238,11 +238,11 @@ def _sanitize_default(name, value):
         return '10.0.0.1'
     elif value in (hostname, fqdn):
         if 'host' in name:
-            return 'marconi'
+            return 'zaqar'
     elif value.endswith(hostname):
-        return value.replace(hostname, 'marconi')
+        return value.replace(hostname, 'zaqar')
     elif value.endswith(fqdn):
-        return value.replace(fqdn, 'marconi')
+        return value.replace(fqdn, 'zaqar')
     elif value.strip() != value:
         return '"%s"' % value
     return value
diff --git a/marconi/openstack/common/excutils.py b/zaqar/openstack/common/excutils.py
similarity index 98%
rename from marconi/openstack/common/excutils.py
rename to zaqar/openstack/common/excutils.py
index 3d7c3002f..06001af01 100644
--- a/marconi/openstack/common/excutils.py
+++ b/zaqar/openstack/common/excutils.py
@@ -24,7 +24,7 @@ import traceback
 
 import six
 
-from marconi.openstack.common.gettextutils import _LE
+from zaqar.openstack.common.gettextutils import _LE
 
 
 class save_and_reraise_exception(object):
diff --git a/marconi/openstack/common/fileutils.py b/zaqar/openstack/common/fileutils.py
similarity index 97%
rename from marconi/openstack/common/fileutils.py
rename to zaqar/openstack/common/fileutils.py
index bbf445e39..2f4e70c27 100644
--- a/marconi/openstack/common/fileutils.py
+++ b/zaqar/openstack/common/fileutils.py
@@ -18,8 +18,8 @@ import errno
 import os
 import tempfile
 
-from marconi.openstack.common import excutils
-from marconi.openstack.common import log as logging
+from zaqar.openstack.common import excutils
+from zaqar.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 
diff --git a/marconi/openstack/common/gettextutils.py b/zaqar/openstack/common/gettextutils.py
similarity index 98%
rename from marconi/openstack/common/gettextutils.py
rename to zaqar/openstack/common/gettextutils.py
index d8eec8024..33db7a2d0 100644
--- a/marconi/openstack/common/gettextutils.py
+++ b/zaqar/openstack/common/gettextutils.py
@@ -19,7 +19,7 @@ gettext for openstack-common modules.
 
 Usual usage in an openstack.common module:
 
-    from marconi.openstack.common.gettextutils import _
+    from zaqar.openstack.common.gettextutils import _
 """
 
 import copy
@@ -120,7 +120,7 @@ class TranslatorFactory(object):
 # module within each application.
 
 # Create the global translation functions.
-_translators = TranslatorFactory('marconi')
+_translators = TranslatorFactory('zaqar')
 
 # The primary translation function using the well-known name "_"
 _ = _translators.primary
@@ -150,7 +150,7 @@ def enable_lazy():
     # FIXME(dhellmann): This function will be removed in oslo.i18n,
     # because the TranslatorFactory makes it superfluous.
     global _, _LI, _LW, _LE, _LC, USE_LAZY
-    tf = TranslatorFactory('marconi', lazy=True)
+    tf = TranslatorFactory('zaqar', lazy=True)
     _ = tf.primary
     _LI = tf.log_info
     _LW = tf.log_warning
@@ -201,7 +201,7 @@ class Message(six.text_type):
     """
 
     def __new__(cls, msgid, msgtext=None, params=None,
-                domain='marconi', *args):
+                domain='zaqar', *args):
         """Create a new Message object.
 
         In order for translation to work gettext requires a message ID, this
diff --git a/marconi/openstack/common/importutils.py b/zaqar/openstack/common/importutils.py
similarity index 98%
rename from marconi/openstack/common/importutils.py
rename to zaqar/openstack/common/importutils.py
index 5153b5900..d654e7e60 100644
--- a/marconi/openstack/common/importutils.py
+++ b/zaqar/openstack/common/importutils.py
@@ -59,7 +59,7 @@ def import_module(import_str):
 
 
 def import_versioned_module(version, submodule=None):
-    module = 'marconi.v%s' % version
+    module = 'zaqar.v%s' % version
     if submodule:
         module = '.'.join((module, submodule))
     return import_module(module)
diff --git a/marconi/openstack/common/jsonutils.py b/zaqar/openstack/common/jsonutils.py
similarity index 97%
rename from marconi/openstack/common/jsonutils.py
rename to zaqar/openstack/common/jsonutils.py
index 3a21a7b15..8bf6d78ac 100644
--- a/marconi/openstack/common/jsonutils.py
+++ b/zaqar/openstack/common/jsonutils.py
@@ -51,10 +51,10 @@ else:
 import six
 import six.moves.xmlrpc_client as xmlrpclib
 
-from marconi.openstack.common import gettextutils
-from marconi.openstack.common import importutils
-from marconi.openstack.common import strutils
-from marconi.openstack.common import timeutils
+from zaqar.openstack.common import gettextutils
+from zaqar.openstack.common import importutils
+from zaqar.openstack.common import strutils
+from zaqar.openstack.common import timeutils
 
 netaddr = importutils.try_import("netaddr")
 
diff --git a/marconi/openstack/common/local.py b/zaqar/openstack/common/local.py
similarity index 100%
rename from marconi/openstack/common/local.py
rename to zaqar/openstack/common/local.py
diff --git a/marconi/openstack/common/lockutils.py b/zaqar/openstack/common/lockutils.py
similarity index 97%
rename from marconi/openstack/common/lockutils.py
rename to zaqar/openstack/common/lockutils.py
index 65e0b86ef..0664e3979 100644
--- a/marconi/openstack/common/lockutils.py
+++ b/zaqar/openstack/common/lockutils.py
@@ -28,9 +28,9 @@ import weakref
 
 from oslo.config import cfg
 
-from marconi.openstack.common import fileutils
-from marconi.openstack.common.gettextutils import _, _LE, _LI
-from marconi.openstack.common import log as logging
+from zaqar.openstack.common import fileutils
+from zaqar.openstack.common.gettextutils import _, _LE, _LI
+from zaqar.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)
@@ -40,7 +40,7 @@ util_opts = [
     cfg.BoolOpt('disable_process_locking', default=False,
                 help='Enables or disables inter-process locks.'),
     cfg.StrOpt('lock_path',
-               default=os.environ.get("MARCONI_LOCK_PATH"),
+               default=os.environ.get("ZAQAR_LOCK_PATH"),
                help='Directory to use for lock files.')
 ]
 
@@ -366,7 +366,7 @@ def main(argv):
     """
 
     lock_dir = tempfile.mkdtemp()
-    os.environ["MARCONI_LOCK_PATH"] = lock_dir
+    os.environ["ZAQAR_LOCK_PATH"] = lock_dir
     try:
         ret_val = subprocess.call(argv[1:])
     finally:
diff --git a/marconi/openstack/common/log.py b/zaqar/openstack/common/log.py
similarity index 99%
rename from marconi/openstack/common/log.py
rename to zaqar/openstack/common/log.py
index b84f8ecad..c42de284f 100644
--- a/marconi/openstack/common/log.py
+++ b/zaqar/openstack/common/log.py
@@ -41,10 +41,10 @@ from oslo.config import cfg
 import six
 from six import moves
 
-from marconi.openstack.common.gettextutils import _
-from marconi.openstack.common import importutils
-from marconi.openstack.common import jsonutils
-from marconi.openstack.common import local
+from zaqar.openstack.common.gettextutils import _
+from zaqar.openstack.common import importutils
+from zaqar.openstack.common import jsonutils
+from zaqar.openstack.common import local
 
 
 _DEFAULT_LOG_DATE_FORMAT = "%Y-%m-%d %H:%M:%S"
@@ -542,7 +542,7 @@ def _setup_logging_from_conf(project, version):
 
     if CONF.publish_errors:
         handler = importutils.import_object(
-            "marconi.openstack.common.log_handler.PublishErrorsHandler",
+            "zaqar.openstack.common.log_handler.PublishErrorsHandler",
             logging.ERROR)
         log_root.addHandler(handler)
 
diff --git a/marconi/openstack/common/strutils.py b/zaqar/openstack/common/strutils.py
similarity index 99%
rename from marconi/openstack/common/strutils.py
rename to zaqar/openstack/common/strutils.py
index d9336469f..fc2abc312 100644
--- a/marconi/openstack/common/strutils.py
+++ b/zaqar/openstack/common/strutils.py
@@ -24,7 +24,7 @@ import unicodedata
 
 import six
 
-from marconi.openstack.common.gettextutils import _
+from zaqar.openstack.common.gettextutils import _
 
 
 UNIT_PREFIX_EXPONENT = {
diff --git a/marconi/openstack/common/timeutils.py b/zaqar/openstack/common/timeutils.py
similarity index 100%
rename from marconi/openstack/common/timeutils.py
rename to zaqar/openstack/common/timeutils.py
diff --git a/marconi/queues/__init__.py b/zaqar/queues/__init__.py
similarity index 100%
rename from marconi/queues/__init__.py
rename to zaqar/queues/__init__.py
diff --git a/marconi/queues/api/__init__.py b/zaqar/queues/api/__init__.py
similarity index 100%
rename from marconi/queues/api/__init__.py
rename to zaqar/queues/api/__init__.py
diff --git a/marconi/queues/api/v1/__init__.py b/zaqar/queues/api/v1/__init__.py
similarity index 100%
rename from marconi/queues/api/v1/__init__.py
rename to zaqar/queues/api/v1/__init__.py
diff --git a/marconi/queues/api/v1/request.py b/zaqar/queues/api/v1/request.py
similarity index 99%
rename from marconi/queues/api/v1/request.py
rename to zaqar/queues/api/v1/request.py
index 1852d59f4..933327ea3 100644
--- a/marconi/queues/api/v1/request.py
+++ b/zaqar/queues/api/v1/request.py
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from marconi.common import api
+from zaqar.common import api
 
 
 class RequestSchema(api.Api):
diff --git a/marconi/queues/api/v1/response.py b/zaqar/queues/api/v1/response.py
similarity index 99%
rename from marconi/queues/api/v1/response.py
rename to zaqar/queues/api/v1/response.py
index e206866b3..1f979c2e9 100644
--- a/marconi/queues/api/v1/response.py
+++ b/zaqar/queues/api/v1/response.py
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from marconi.common import api
+from zaqar.common import api
 
 
 class ResponseSchema(api.Api):
diff --git a/marconi/queues/api/v1_1/__init__.py b/zaqar/queues/api/v1_1/__init__.py
similarity index 100%
rename from marconi/queues/api/v1_1/__init__.py
rename to zaqar/queues/api/v1_1/__init__.py
diff --git a/marconi/queues/api/v1_1/request.py b/zaqar/queues/api/v1_1/request.py
similarity index 99%
rename from marconi/queues/api/v1_1/request.py
rename to zaqar/queues/api/v1_1/request.py
index dfb12d93f..9c603adce 100644
--- a/marconi/queues/api/v1_1/request.py
+++ b/zaqar/queues/api/v1_1/request.py
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from marconi.common import api
+from zaqar.common import api
 
 
 class RequestSchema(api.Api):
diff --git a/marconi/queues/api/v1_1/response.py b/zaqar/queues/api/v1_1/response.py
similarity index 99%
rename from marconi/queues/api/v1_1/response.py
rename to zaqar/queues/api/v1_1/response.py
index 73a387d3f..e7b75b336 100644
--- a/marconi/queues/api/v1_1/response.py
+++ b/zaqar/queues/api/v1_1/response.py
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from marconi.common import api
+from zaqar.common import api
 
 
 class ResponseSchema(api.Api):
diff --git a/marconi/queues/bootstrap.py b/zaqar/queues/bootstrap.py
similarity index 88%
rename from marconi/queues/bootstrap.py
rename to zaqar/queues/bootstrap.py
index e0e76ef2f..69bc2f686 100644
--- a/marconi/queues/bootstrap.py
+++ b/zaqar/queues/bootstrap.py
@@ -16,23 +16,23 @@
 from oslo.config import cfg
 from stevedore import driver
 
-from marconi.common import decorators
-from marconi.common import errors
-from marconi.openstack.common.cache import cache as oslo_cache
-from marconi.openstack.common import log
-from marconi.queues.storage import pipeline
-from marconi.queues.storage import pooling
-from marconi.queues.storage import utils as storage_utils
+from zaqar.common import decorators
+from zaqar.common import errors
+from zaqar.openstack.common.cache import cache as oslo_cache
+from zaqar.openstack.common import log
+from zaqar.queues.storage import pipeline
+from zaqar.queues.storage import pooling
+from zaqar.queues.storage import utils as storage_utils
 
 LOG = log.getLogger(__name__)
 
 _CLI_OPTIONS = (
     cfg.BoolOpt('daemon', default=False,
-                help='Run Marconi server in background.'),
+                help='Run Zaqar server in background.'),
 )
 
 # NOTE (Obulpathi): Register daemon command line option for
-# marconi-server
+# zaqar-server
 CONF = cfg.CONF
 CONF.register_cli_opts(_CLI_OPTIONS)
 
@@ -63,7 +63,7 @@ def _config_options():
 
 
 class Bootstrap(object):
-    """Defines the Marconi bootstrapper.
+    """Defines the Zaqar bootstrapper.
 
     The bootstrap loads up drivers per a given configuration, and
     manages their lifetimes.
@@ -75,7 +75,7 @@ class Bootstrap(object):
         self.conf.register_opts(_DRIVER_OPTIONS, group=_DRIVER_GROUP)
         self.driver_conf = self.conf[_DRIVER_GROUP]
 
-        log.setup('marconi')
+        log.setup('zaqar')
 
     @decorators.lazy_property(write=False)
     def storage(self):
@@ -122,7 +122,7 @@ class Bootstrap(object):
         ]
 
         try:
-            mgr = driver.DriverManager('marconi.queues.transport',
+            mgr = driver.DriverManager('zaqar.queues.transport',
                                        transport_name,
                                        invoke_on_load=True,
                                        invoke_args=args)
diff --git a/marconi/queues/storage/__init__.py b/zaqar/queues/storage/__init__.py
similarity index 89%
rename from marconi/queues/storage/__init__.py
rename to zaqar/queues/storage/__init__.py
index 1d80f24d5..a466c3b88 100644
--- a/marconi/queues/storage/__init__.py
+++ b/zaqar/queues/storage/__init__.py
@@ -11,10 +11,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""Marconi Storage Drivers"""
+"""Zaqar Storage Drivers"""
 
-from marconi.queues.storage import base
-from marconi.queues.storage import errors  # NOQA
+from zaqar.queues.storage import base
+from zaqar.queues.storage import errors  # NOQA
 
 # Hoist classes into package namespace
 ControlDriverBase = base.ControlDriverBase
diff --git a/marconi/queues/storage/base.py b/zaqar/queues/storage/base.py
similarity index 98%
rename from marconi/queues/storage/base.py
rename to zaqar/queues/storage/base.py
index ad83fc40e..0a9c6d472 100644
--- a/marconi/queues/storage/base.py
+++ b/zaqar/queues/storage/base.py
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""Implements the DriverBase abstract class for Marconi storage drivers."""
+"""Implements the DriverBase abstract class for Zaqar storage drivers."""
 
 import abc
 
@@ -34,7 +34,7 @@ class DriverBase(object):
     :type conf: `oslo.config.ConfigOpts`
     :param cache: Cache instance to use for reducing latency
         for certain lookups.
-    :type cache: `marconi.openstack.common.cache.backends.BaseCache`
+    :type cache: `zaqar.openstack.common.cache.backends.BaseCache`
     """
     def __init__(self, conf, cache):
         self.conf = conf
@@ -55,7 +55,7 @@ class DataDriverBase(DriverBase):
     :type conf: `oslo.config.ConfigOpts`
     :param cache: Cache instance to use for reducing latency
         for certain lookups.
-    :type cache: `marconi.openstack.common.cache.backends.BaseCache`
+    :type cache: `zaqar.openstack.common.cache.backends.BaseCache`
     """
 
     def __init__(self, conf, cache):
@@ -97,7 +97,7 @@ class ControlDriverBase(DriverBase):
     :type conf: `oslo.config.ConfigOpts`
     :param cache: Cache instance to use for reducing latency
         for certain lookups.
-    :type cache: `marconi.openstack.common.cache.backends.BaseCache`
+    :type cache: `zaqar.openstack.common.cache.backends.BaseCache`
     """
 
     @abc.abstractproperty
diff --git a/marconi/queues/storage/errors.py b/zaqar/queues/storage/errors.py
similarity index 100%
rename from marconi/queues/storage/errors.py
rename to zaqar/queues/storage/errors.py
diff --git a/marconi/queues/storage/mongodb/__init__.py b/zaqar/queues/storage/mongodb/__init__.py
similarity index 87%
rename from marconi/queues/storage/mongodb/__init__.py
rename to zaqar/queues/storage/mongodb/__init__.py
index 26f8b6386..0a8037bdd 100644
--- a/marconi/queues/storage/mongodb/__init__.py
+++ b/zaqar/queues/storage/mongodb/__init__.py
@@ -11,9 +11,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""MongoDB Storage Driver for Marconi"""
+"""MongoDB Storage Driver for Zaqar"""
 
-from marconi.queues.storage.mongodb import driver
+from zaqar.queues.storage.mongodb import driver
 
 # Hoist classes into package namespace
 ControlDriver = driver.ControlDriver
diff --git a/marconi/queues/storage/mongodb/catalogue.py b/zaqar/queues/storage/mongodb/catalogue.py
similarity index 94%
rename from marconi/queues/storage/mongodb/catalogue.py
rename to zaqar/queues/storage/mongodb/catalogue.py
index 43597544b..333df16ad 100644
--- a/marconi/queues/storage/mongodb/catalogue.py
+++ b/zaqar/queues/storage/mongodb/catalogue.py
@@ -23,10 +23,10 @@ Serves to construct an association between a project + queue -> pool
 }
 """
 
-import marconi.openstack.common.log as logging
-from marconi.queues.storage import base
-from marconi.queues.storage import errors
-from marconi.queues.storage.mongodb import utils
+import zaqar.openstack.common.log as logging
+from zaqar.queues.storage import base
+from zaqar.queues.storage import errors
+from zaqar.queues.storage.mongodb import utils
 
 
 LOG = logging.getLogger(__name__)
diff --git a/marconi/queues/storage/mongodb/claims.py b/zaqar/queues/storage/mongodb/claims.py
similarity index 97%
rename from marconi/queues/storage/mongodb/claims.py
rename to zaqar/queues/storage/mongodb/claims.py
index cf217d4f9..cc55c91aa 100644
--- a/marconi/queues/storage/mongodb/claims.py
+++ b/zaqar/queues/storage/mongodb/claims.py
@@ -25,11 +25,11 @@ import datetime
 
 from bson import objectid
 
-import marconi.openstack.common.log as logging
-from marconi.openstack.common import timeutils
-from marconi.queues import storage
-from marconi.queues.storage import errors
-from marconi.queues.storage.mongodb import utils
+import zaqar.openstack.common.log as logging
+from zaqar.openstack.common import timeutils
+from zaqar.queues import storage
+from zaqar.queues.storage import errors
+from zaqar.queues.storage.mongodb import utils
 
 
 LOG = logging.getLogger(__name__)
diff --git a/marconi/queues/storage/mongodb/controllers.py b/zaqar/queues/storage/mongodb/controllers.py
similarity index 80%
rename from marconi/queues/storage/mongodb/controllers.py
rename to zaqar/queues/storage/mongodb/controllers.py
index efbda28b2..6b09ba39f 100644
--- a/marconi/queues/storage/mongodb/controllers.py
+++ b/zaqar/queues/storage/mongodb/controllers.py
@@ -22,11 +22,11 @@ Field Mappings:
     updated and documented in each controller class.
 """
 
-from marconi.queues.storage.mongodb import catalogue
-from marconi.queues.storage.mongodb import claims
-from marconi.queues.storage.mongodb import messages
-from marconi.queues.storage.mongodb import pools
-from marconi.queues.storage.mongodb import queues
+from zaqar.queues.storage.mongodb import catalogue
+from zaqar.queues.storage.mongodb import claims
+from zaqar.queues.storage.mongodb import messages
+from zaqar.queues.storage.mongodb import pools
+from zaqar.queues.storage.mongodb import queues
 
 
 CatalogueController = catalogue.CatalogueController
diff --git a/marconi/queues/storage/mongodb/driver.py b/zaqar/queues/storage/mongodb/driver.py
similarity index 94%
rename from marconi/queues/storage/mongodb/driver.py
rename to zaqar/queues/storage/mongodb/driver.py
index d49ba94a7..6274bece2 100644
--- a/marconi/queues/storage/mongodb/driver.py
+++ b/zaqar/queues/storage/mongodb/driver.py
@@ -20,11 +20,11 @@ import ssl
 import pymongo
 import pymongo.errors
 
-from marconi.common import decorators
-from marconi.openstack.common import log as logging
-from marconi.queues import storage
-from marconi.queues.storage.mongodb import controllers
-from marconi.queues.storage.mongodb import options
+from zaqar.common import decorators
+from zaqar.openstack.common import log as logging
+from zaqar.queues import storage
+from zaqar.queues.storage.mongodb import controllers
+from zaqar.queues.storage.mongodb import options
 
 
 LOG = logging.getLogger(__name__)
@@ -109,7 +109,7 @@ class DataDriver(storage.DataDriverBase):
 
         # NOTE(kgriffs): Partition names are zero-based, and
         # the list is ordered by partition, which means that a
-        # caller can, e.g., get marconi_mp0 by simply indexing
+        # caller can, e.g., get zaqar_mp0 by simply indexing
         # the first element in the list of databases:
         #
         #     self.driver.message_databases[0]
diff --git a/marconi/queues/storage/mongodb/messages.py b/zaqar/queues/storage/mongodb/messages.py
similarity index 98%
rename from marconi/queues/storage/mongodb/messages.py
rename to zaqar/queues/storage/mongodb/messages.py
index 67f618852..036d78921 100644
--- a/marconi/queues/storage/mongodb/messages.py
+++ b/zaqar/queues/storage/mongodb/messages.py
@@ -28,12 +28,12 @@ from bson import objectid
 import pymongo.errors
 import pymongo.read_preferences
 
-from marconi.i18n import _
-import marconi.openstack.common.log as logging
-from marconi.openstack.common import timeutils
-from marconi.queues import storage
-from marconi.queues.storage import errors
-from marconi.queues.storage.mongodb import utils
+from zaqar.i18n import _
+import zaqar.openstack.common.log as logging
+from zaqar.openstack.common import timeutils
+from zaqar.queues import storage
+from zaqar.queues.storage import errors
+from zaqar.queues.storage.mongodb import utils
 
 
 LOG = logging.getLogger(__name__)
@@ -139,7 +139,7 @@ class MessageController(storage.Message):
         #
         # NOTE(kgriffs): Order matters, since it is used to lookup the
         # collection by partition number. For example, self._collections[2]
-        # would provide access to marconi_p2.messages (partition numbers are
+        # would provide access to zaqar_p2.messages (partition numbers are
         # zero-based).
         self._collections = [db.messages
                              for db in self.driver.message_databases]
diff --git a/marconi/queues/storage/mongodb/options.py b/zaqar/queues/storage/mongodb/options.py
similarity index 98%
rename from marconi/queues/storage/mongodb/options.py
rename to zaqar/queues/storage/mongodb/options.py
index 390a2a0d6..57ac0b348 100644
--- a/marconi/queues/storage/mongodb/options.py
+++ b/zaqar/queues/storage/mongodb/options.py
@@ -52,7 +52,7 @@ MONGODB_OPTIONS = (
                      '``ssl_cert_reqs``, ``ssl_ca_certs`` need to be set '
                      'accordingly.')),
 
-    cfg.StrOpt('database', default='marconi', help='Database name.'),
+    cfg.StrOpt('database', default='zaqar', help='Database name.'),
 
     cfg.IntOpt('partitions', default=2,
                help=('Number of databases across which to '
diff --git a/marconi/queues/storage/mongodb/pools.py b/zaqar/queues/storage/mongodb/pools.py
similarity index 95%
rename from marconi/queues/storage/mongodb/pools.py
rename to zaqar/queues/storage/mongodb/pools.py
index 420b4f168..197d19db1 100644
--- a/marconi/queues/storage/mongodb/pools.py
+++ b/zaqar/queues/storage/mongodb/pools.py
@@ -24,10 +24,10 @@ Schema:
 
 import functools
 
-from marconi.common import utils as common_utils
-from marconi.queues.storage import base
-from marconi.queues.storage import errors
-from marconi.queues.storage.mongodb import utils
+from zaqar.common import utils as common_utils
+from zaqar.queues.storage import base
+from zaqar.queues.storage import errors
+from zaqar.queues.storage.mongodb import utils
 
 POOLS_INDEX = [
     ('n', 1)
diff --git a/marconi/queues/storage/mongodb/queues.py b/zaqar/queues/storage/mongodb/queues.py
similarity index 97%
rename from marconi/queues/storage/mongodb/queues.py
rename to zaqar/queues/storage/mongodb/queues.py
index 75a631d1d..7cba71d72 100644
--- a/marconi/queues/storage/mongodb/queues.py
+++ b/zaqar/queues/storage/mongodb/queues.py
@@ -23,13 +23,13 @@ Field Mappings:
 
 import pymongo.errors
 
-from marconi.common import decorators
-from marconi.i18n import _
-import marconi.openstack.common.log as logging
-from marconi.openstack.common import timeutils
-from marconi.queues import storage
-from marconi.queues.storage import errors
-from marconi.queues.storage.mongodb import utils
+from zaqar.common import decorators
+from zaqar.i18n import _
+import zaqar.openstack.common.log as logging
+from zaqar.openstack.common import timeutils
+from zaqar.queues import storage
+from zaqar.queues.storage import errors
+from zaqar.queues.storage.mongodb import utils
 
 LOG = logging.getLogger(__name__)
 
diff --git a/marconi/queues/storage/mongodb/utils.py b/zaqar/queues/storage/mongodb/utils.py
similarity index 97%
rename from marconi/queues/storage/mongodb/utils.py
rename to zaqar/queues/storage/mongodb/utils.py
index 234ee42b3..ceae872ca 100644
--- a/marconi/queues/storage/mongodb/utils.py
+++ b/zaqar/queues/storage/mongodb/utils.py
@@ -26,10 +26,10 @@ from bson import objectid
 from bson import tz_util
 from pymongo import errors
 
-from marconi.i18n import _
-import marconi.openstack.common.log as logging
-from marconi.openstack.common import timeutils
-from marconi.queues.storage import errors as storage_errors
+from zaqar.i18n import _
+import zaqar.openstack.common.log as logging
+from zaqar.openstack.common import timeutils
+from zaqar.queues.storage import errors as storage_errors
 
 
 # BSON ObjectId gives TZ-aware datetime, so we generate a
@@ -245,7 +245,7 @@ def raises_conn_error(func):
     """Handles the MongoDB ConnectionFailure error.
 
     This decorator catches MongoDB's ConnectionFailure
-    error and raises Marconi's ConnectionError instead.
+    error and raises Zaqar's ConnectionError instead.
     """
 
     @functools.wraps(func)
diff --git a/marconi/queues/storage/pipeline.py b/zaqar/queues/storage/pipeline.py
similarity index 93%
rename from marconi/queues/storage/pipeline.py
rename to zaqar/queues/storage/pipeline.py
index 1ce8e51a2..5daa737e1 100644
--- a/marconi/queues/storage/pipeline.py
+++ b/zaqar/queues/storage/pipeline.py
@@ -15,11 +15,11 @@
 from oslo.config import cfg
 from stevedore import driver
 
-from marconi import common
-from marconi.common import decorators
-from marconi.i18n import _
-from marconi.openstack.common import log as logging
-from marconi.queues.storage import base
+from zaqar import common
+from zaqar.common import decorators
+from zaqar.i18n import _
+from zaqar.openstack.common import log as logging
+from zaqar.queues.storage import base
 
 LOG = logging.getLogger(__name__)
 
@@ -71,7 +71,7 @@ def _get_storage_pipeline(resource_name, conf):
     pipeline = []
     for ns in storage_conf[resource_name + '_pipeline']:
         try:
-            mgr = driver.DriverManager('marconi.queues.storage.stages',
+            mgr = driver.DriverManager('zaqar.queues.storage.stages',
                                        ns, invoke_on_load=True)
             pipeline.append(mgr.driver)
         except RuntimeError as exc:
diff --git a/marconi/queues/storage/pooling.py b/zaqar/queues/storage/pooling.py
similarity index 96%
rename from marconi/queues/storage/pooling.py
rename to zaqar/queues/storage/pooling.py
index ec8e8466c..10a0f9b05 100644
--- a/marconi/queues/storage/pooling.py
+++ b/zaqar/queues/storage/pooling.py
@@ -17,12 +17,12 @@ import itertools
 
 from oslo.config import cfg
 
-from marconi.common import decorators
-from marconi.common.storage import select
-from marconi.openstack.common import log
-from marconi.queues import storage
-from marconi.queues.storage import errors
-from marconi.queues.storage import utils
+from zaqar.common import decorators
+from zaqar.common.storage import select
+from zaqar.openstack.common import log
+from zaqar.queues import storage
+from zaqar.queues.storage import errors
+from zaqar.queues.storage import utils
 
 LOG = log.getLogger(__name__)
 
@@ -33,7 +33,7 @@ _CATALOG_OPTIONS = (
 
 _CATALOG_GROUP = 'pooling:catalog'
 
-# NOTE(kgriffs): E.g.: 'marconi-pooling:5083853/my-queue'
+# NOTE(kgriffs): E.g.: 'zaqar-pooling:5083853/my-queue'
 _POOL_CACHE_PREFIX = 'pooling:'
 
 # TODO(kgriffs): If a queue is migrated, everyone's
@@ -193,7 +193,7 @@ class QueueController(RoutingController):
         if target:
 
             # NOTE(cpp-cabrera): delete from the catalogue first. If
-            # marconi crashes in the middle of these two operations,
+            # zaqar crashes in the middle of these two operations,
             # it is desirable that the entry be missing from the
             # catalogue and present in storage, rather than the
             # reverse. The former case leads to all operations
@@ -368,14 +368,14 @@ class Catalog(object):
         self._pools_ctrl = control.pools_controller
         self._catalogue_ctrl = control.catalogue_controller
 
-    # FIXME(cpp-cabrera): https://bugs.launchpad.net/marconi/+bug/1252791
+    # FIXME(cpp-cabrera): https://bugs.launchpad.net/zaqar/+bug/1252791
     def _init_driver(self, pool_id):
         """Given a pool name, returns a storage driver.
 
         :param pool_id: The name of a pool.
         :type pool_id: six.text_type
         :returns: a storage driver
-        :rtype: marconi.queues.storage.base.DataDriverBase
+        :rtype: zaqar.queues.storage.base.DataDriverBase
         """
         pool = self._pools_ctrl.get(pool_id, detailed=True)
         conf = utils.dynamic_conf(pool['uri'], pool['options'])
@@ -472,7 +472,7 @@ class Catalog(object):
         :param pool_id: The name of a pool.
         :type pool_id: six.text_type
         :returns: a storage driver
-        :rtype: marconi.queues.storage.base.DataDriver
+        :rtype: zaqar.queues.storage.base.DataDriver
         """
 
         try:
diff --git a/marconi/queues/storage/sqlalchemy/__init__.py b/zaqar/queues/storage/sqlalchemy/__init__.py
similarity index 92%
rename from marconi/queues/storage/sqlalchemy/__init__.py
rename to zaqar/queues/storage/sqlalchemy/__init__.py
index 47c996ec1..f72a24c95 100644
--- a/marconi/queues/storage/sqlalchemy/__init__.py
+++ b/zaqar/queues/storage/sqlalchemy/__init__.py
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from marconi.queues.storage.sqlalchemy import driver
+from zaqar.queues.storage.sqlalchemy import driver
 
 # Hoist classes into package namespace
 ControlDriver = driver.ControlDriver
diff --git a/marconi/queues/storage/sqlalchemy/catalogue.py b/zaqar/queues/storage/sqlalchemy/catalogue.py
similarity index 95%
rename from marconi/queues/storage/sqlalchemy/catalogue.py
rename to zaqar/queues/storage/sqlalchemy/catalogue.py
index 437f0d18d..1c1698aad 100644
--- a/marconi/queues/storage/sqlalchemy/catalogue.py
+++ b/zaqar/queues/storage/sqlalchemy/catalogue.py
@@ -24,9 +24,9 @@ queue: string
 
 import sqlalchemy as sa
 
-from marconi.queues.storage import base
-from marconi.queues.storage import errors
-from marconi.queues.storage.sqlalchemy import tables
+from zaqar.queues.storage import base
+from zaqar.queues.storage import errors
+from zaqar.queues.storage.sqlalchemy import tables
 
 
 def _match(project, queue):
diff --git a/marconi/queues/storage/sqlalchemy/claims.py b/zaqar/queues/storage/sqlalchemy/claims.py
similarity index 96%
rename from marconi/queues/storage/sqlalchemy/claims.py
rename to zaqar/queues/storage/sqlalchemy/claims.py
index 517da9af7..846eb3482 100644
--- a/marconi/queues/storage/sqlalchemy/claims.py
+++ b/zaqar/queues/storage/sqlalchemy/claims.py
@@ -16,11 +16,11 @@
 import sqlalchemy as sa
 from sqlalchemy.sql import func as sfunc
 
-from marconi.openstack.common import timeutils
-from marconi.queues import storage
-from marconi.queues.storage import errors
-from marconi.queues.storage.sqlalchemy import tables
-from marconi.queues.storage.sqlalchemy import utils
+from zaqar.openstack.common import timeutils
+from zaqar.queues import storage
+from zaqar.queues.storage import errors
+from zaqar.queues.storage.sqlalchemy import tables
+from zaqar.queues.storage.sqlalchemy import utils
 
 
 class ClaimController(storage.Claim):
diff --git a/marconi/queues/storage/sqlalchemy/controllers.py b/zaqar/queues/storage/sqlalchemy/controllers.py
similarity index 75%
rename from marconi/queues/storage/sqlalchemy/controllers.py
rename to zaqar/queues/storage/sqlalchemy/controllers.py
index 07e7407e7..63c8e0391 100644
--- a/marconi/queues/storage/sqlalchemy/controllers.py
+++ b/zaqar/queues/storage/sqlalchemy/controllers.py
@@ -13,11 +13,11 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-from marconi.queues.storage.sqlalchemy import catalogue
-from marconi.queues.storage.sqlalchemy import claims
-from marconi.queues.storage.sqlalchemy import messages
-from marconi.queues.storage.sqlalchemy import pools
-from marconi.queues.storage.sqlalchemy import queues
+from zaqar.queues.storage.sqlalchemy import catalogue
+from zaqar.queues.storage.sqlalchemy import claims
+from zaqar.queues.storage.sqlalchemy import messages
+from zaqar.queues.storage.sqlalchemy import pools
+from zaqar.queues.storage.sqlalchemy import queues
 
 
 QueueController = queues.QueueController
diff --git a/marconi/queues/storage/sqlalchemy/driver.py b/zaqar/queues/storage/sqlalchemy/driver.py
similarity index 93%
rename from marconi/queues/storage/sqlalchemy/driver.py
rename to zaqar/queues/storage/sqlalchemy/driver.py
index 7645a1c53..6ae491300 100644
--- a/marconi/queues/storage/sqlalchemy/driver.py
+++ b/zaqar/queues/storage/sqlalchemy/driver.py
@@ -17,13 +17,13 @@ import logging
 
 import sqlalchemy as sa
 
-from marconi.common import decorators
-from marconi.i18n import _
-from marconi.queues import storage
-from marconi.queues.storage.sqlalchemy import controllers
-from marconi.queues.storage.sqlalchemy import options
-from marconi.queues.storage.sqlalchemy import tables
-from marconi.queues.storage.sqlalchemy import utils
+from zaqar.common import decorators
+from zaqar.i18n import _
+from zaqar.queues import storage
+from zaqar.queues.storage.sqlalchemy import controllers
+from zaqar.queues.storage.sqlalchemy import options
+from zaqar.queues.storage.sqlalchemy import tables
+from zaqar.queues.storage.sqlalchemy import utils
 
 
 LOG = logging.getLogger(__name__)
diff --git a/marconi/queues/storage/sqlalchemy/messages.py b/zaqar/queues/storage/sqlalchemy/messages.py
similarity index 98%
rename from marconi/queues/storage/sqlalchemy/messages.py
rename to zaqar/queues/storage/sqlalchemy/messages.py
index 5257ee651..3aed2da77 100644
--- a/marconi/queues/storage/sqlalchemy/messages.py
+++ b/zaqar/queues/storage/sqlalchemy/messages.py
@@ -18,11 +18,11 @@ import calendar
 import sqlalchemy as sa
 from sqlalchemy.sql import func as sfunc
 
-from marconi.openstack.common import timeutils
-from marconi.queues import storage
-from marconi.queues.storage import errors
-from marconi.queues.storage.sqlalchemy import tables
-from marconi.queues.storage.sqlalchemy import utils
+from zaqar.openstack.common import timeutils
+from zaqar.queues import storage
+from zaqar.queues.storage import errors
+from zaqar.queues.storage.sqlalchemy import tables
+from zaqar.queues.storage.sqlalchemy import utils
 
 
 class MessageController(storage.Message):
diff --git a/marconi/queues/storage/sqlalchemy/options.py b/zaqar/queues/storage/sqlalchemy/options.py
similarity index 100%
rename from marconi/queues/storage/sqlalchemy/options.py
rename to zaqar/queues/storage/sqlalchemy/options.py
diff --git a/marconi/queues/storage/sqlalchemy/pools.py b/zaqar/queues/storage/sqlalchemy/pools.py
similarity index 94%
rename from marconi/queues/storage/sqlalchemy/pools.py
rename to zaqar/queues/storage/sqlalchemy/pools.py
index e54591188..63bd1a592 100644
--- a/marconi/queues/storage/sqlalchemy/pools.py
+++ b/zaqar/queues/storage/sqlalchemy/pools.py
@@ -26,11 +26,11 @@ import functools
 
 import sqlalchemy as sa
 
-from marconi.common import utils as common_utils
-from marconi.queues.storage import base
-from marconi.queues.storage import errors
-from marconi.queues.storage.sqlalchemy import tables
-from marconi.queues.storage.sqlalchemy import utils
+from zaqar.common import utils as common_utils
+from zaqar.queues.storage import base
+from zaqar.queues.storage import errors
+from zaqar.queues.storage.sqlalchemy import tables
+from zaqar.queues.storage.sqlalchemy import utils
 
 
 class PoolsController(base.PoolsBase):
diff --git a/marconi/queues/storage/sqlalchemy/queues.py b/zaqar/queues/storage/sqlalchemy/queues.py
similarity index 96%
rename from marconi/queues/storage/sqlalchemy/queues.py
rename to zaqar/queues/storage/sqlalchemy/queues.py
index 2fa61c106..800f358ba 100644
--- a/marconi/queues/storage/sqlalchemy/queues.py
+++ b/zaqar/queues/storage/sqlalchemy/queues.py
@@ -15,10 +15,10 @@
 import sqlalchemy as sa
 from sqlalchemy.sql import func as sfunc
 
-from marconi.queues import storage
-from marconi.queues.storage import errors
-from marconi.queues.storage.sqlalchemy import tables
-from marconi.queues.storage.sqlalchemy import utils
+from zaqar.queues import storage
+from zaqar.queues.storage import errors
+from zaqar.queues.storage.sqlalchemy import tables
+from zaqar.queues.storage.sqlalchemy import utils
 
 
 class QueueController(storage.Queue):
diff --git a/marconi/queues/storage/sqlalchemy/tables.py b/zaqar/queues/storage/sqlalchemy/tables.py
similarity index 98%
rename from marconi/queues/storage/sqlalchemy/tables.py
rename to zaqar/queues/storage/sqlalchemy/tables.py
index 00dc54bf1..b7294b959 100644
--- a/marconi/queues/storage/sqlalchemy/tables.py
+++ b/zaqar/queues/storage/sqlalchemy/tables.py
@@ -14,7 +14,7 @@
 
 import sqlalchemy as sa
 
-from marconi.openstack.common import timeutils
+from zaqar.openstack.common import timeutils
 
 metadata = sa.MetaData()
 
diff --git a/marconi/queues/storage/sqlalchemy/utils.py b/zaqar/queues/storage/sqlalchemy/utils.py
similarity index 91%
rename from marconi/queues/storage/sqlalchemy/utils.py
rename to zaqar/queues/storage/sqlalchemy/utils.py
index 44f120071..4282140b1 100644
--- a/marconi/queues/storage/sqlalchemy/utils.py
+++ b/zaqar/queues/storage/sqlalchemy/utils.py
@@ -19,11 +19,11 @@ import sqlalchemy as sa
 from sqlalchemy import exc
 from sqlalchemy.sql import func as sfunc
 
-from marconi.openstack.common import jsonutils
-from marconi.openstack.common import log as logging
-from marconi.openstack.common import strutils
-from marconi.queues.storage import errors
-from marconi.queues.storage.sqlalchemy import tables
+from zaqar.openstack.common import jsonutils
+from zaqar.openstack.common import log as logging
+from zaqar.openstack.common import strutils
+from zaqar.queues.storage import errors
+from zaqar.queues.storage.sqlalchemy import tables
 
 
 LOG = logging.getLogger(__name__)
@@ -67,7 +67,7 @@ def get_age(created):
     return sfunc.now() - created
 
 # The utilities below make the database IDs opaque to the users
-# of Marconi API.  The only purpose is to advise the users NOT to
+# of Zaqar API.  The only purpose is to advise the users NOT to
 # make assumptions on the implementation of and/or relationship
 # between the message IDs, the markers, and claim IDs.
 #
diff --git a/marconi/queues/storage/utils.py b/zaqar/queues/storage/utils.py
similarity index 95%
rename from marconi/queues/storage/utils.py
rename to zaqar/queues/storage/utils.py
index 6c2e4990d..d01e23b3d 100644
--- a/marconi/queues/storage/utils.py
+++ b/zaqar/queues/storage/utils.py
@@ -16,9 +16,9 @@ from oslo.config import cfg
 import six
 from stevedore import driver
 
-from marconi.common import errors
-from marconi.common import utils
-from marconi.openstack.common import log
+from zaqar.common import errors
+from zaqar.common import utils
+from zaqar.openstack.common import log
 
 LOG = log.getLogger(__name__)
 
@@ -71,7 +71,7 @@ def load_storage_driver(conf, cache, control_mode=False):
     """
 
     mode = 'control' if control_mode else 'data'
-    driver_type = 'marconi.queues.{0}.storage'.format(mode)
+    driver_type = 'zaqar.queues.{0}.storage'.format(mode)
 
     try:
         mgr = driver.DriverManager(driver_type,
@@ -127,7 +127,7 @@ def can_connect(uri):
     :returns: True if can connect else False
     :rtype: bool
     """
-    driver_type = 'marconi.queues.data.storage'
+    driver_type = 'zaqar.queues.data.storage'
     storage_type = six.moves.urllib.parse.urlparse(uri).scheme
 
     try:
diff --git a/marconi/queues/transport/__init__.py b/zaqar/queues/transport/__init__.py
similarity index 89%
rename from marconi/queues/transport/__init__.py
rename to zaqar/queues/transport/__init__.py
index 0018a71df..9fd50dff7 100644
--- a/marconi/queues/transport/__init__.py
+++ b/zaqar/queues/transport/__init__.py
@@ -11,9 +11,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""Marconi Transport Drivers"""
+"""Zaqar Transport Drivers"""
 
-from marconi.queues.transport import base
+from zaqar.queues.transport import base
 
 # Hoist into package namespace
 DriverBase = base.DriverBase
diff --git a/marconi/queues/transport/auth.py b/zaqar/queues/transport/auth.py
similarity index 97%
rename from marconi/queues/transport/auth.py
rename to zaqar/queues/transport/auth.py
index faae355aa..c4da41b28 100644
--- a/marconi/queues/transport/auth.py
+++ b/zaqar/queues/transport/auth.py
@@ -17,7 +17,7 @@
 
 from keystoneclient.middleware import auth_token
 
-from marconi.openstack.common import log
+from zaqar.openstack.common import log
 
 
 STRATEGIES = {}
diff --git a/marconi/queues/transport/base.py b/zaqar/queues/transport/base.py
similarity index 93%
rename from marconi/queues/transport/base.py
rename to zaqar/queues/transport/base.py
index 9bdef63e0..8240ecbb1 100644
--- a/marconi/queues/transport/base.py
+++ b/zaqar/queues/transport/base.py
@@ -71,11 +71,11 @@ class DriverBase(object):
     :param conf: configuration instance
     :type conf: oslo.config.cfg.CONF
     :param storage: The storage driver
-    :type storage: marconi.queues.storage.base.DataDriverBase
+    :type storage: zaqar.queues.storage.base.DataDriverBase
     :param cache: caching object
-    :type cache: marconi.openstack.common.cache.backends.BaseCache
+    :type cache: zaqar.openstack.common.cache.backends.BaseCache
     :param control: Storage driver to handle the control plane
-    :type control: marconi.queues.storage.base.ControlDriverBase
+    :type control: zaqar.queues.storage.base.ControlDriverBase
     """
 
     def __init__(self, conf, storage, cache, control):
diff --git a/marconi/queues/transport/utils.py b/zaqar/queues/transport/utils.py
similarity index 97%
rename from marconi/queues/transport/utils.py
rename to zaqar/queues/transport/utils.py
index 81d5c744c..0b1b2a8f9 100644
--- a/marconi/queues/transport/utils.py
+++ b/zaqar/queues/transport/utils.py
@@ -15,7 +15,7 @@
 
 import json
 
-from marconi.openstack.common import strutils
+from zaqar.openstack.common import strutils
 
 
 class MalformedJSON(ValueError):
diff --git a/marconi/queues/transport/validation.py b/zaqar/queues/transport/validation.py
similarity index 99%
rename from marconi/queues/transport/validation.py
rename to zaqar/queues/transport/validation.py
index 81ca3846a..8e1b23991 100644
--- a/marconi/queues/transport/validation.py
+++ b/zaqar/queues/transport/validation.py
@@ -17,7 +17,7 @@ import re
 
 from oslo.config import cfg
 
-from marconi.i18n import _
+from zaqar.i18n import _
 
 MIN_MESSAGE_TTL = 60
 MIN_CLAIM_TTL = 60
diff --git a/marconi/queues/transport/wsgi/__init__.py b/zaqar/queues/transport/wsgi/__init__.py
similarity index 92%
rename from marconi/queues/transport/wsgi/__init__.py
rename to zaqar/queues/transport/wsgi/__init__.py
index 47957b62d..7ebc3bfa1 100644
--- a/marconi/queues/transport/wsgi/__init__.py
+++ b/zaqar/queues/transport/wsgi/__init__.py
@@ -13,7 +13,7 @@
 
 """WSGI Transport Driver"""
 
-from marconi.queues.transport.wsgi import driver
+from zaqar.queues.transport.wsgi import driver
 
 # Hoist into package namespace
 Driver = driver.Driver
diff --git a/marconi/queues/transport/wsgi/app.py b/zaqar/queues/transport/wsgi/app.py
similarity index 88%
rename from marconi/queues/transport/wsgi/app.py
rename to zaqar/queues/transport/wsgi/app.py
index ce37e6a21..023121587 100644
--- a/marconi/queues/transport/wsgi/app.py
+++ b/zaqar/queues/transport/wsgi/app.py
@@ -18,7 +18,7 @@
 This app should be used by external WSGI
 containers. For example:
 
-    $ gunicorn marconi.queues.transport.wsgi.app:app
+    $ gunicorn zaqar.queues.transport.wsgi.app:app
 
 NOTE: As for external containers, it is necessary
 to put config files in the standard paths. There's
@@ -28,12 +28,12 @@ to the WSGI app when it is called from other apps.
 
 from oslo.config import cfg
 
-from marconi.queues import bootstrap
+from zaqar.queues import bootstrap
 
 # TODO(kgriffs): For now, we have to use the global config
 # to pick up common options from openstack.common.log, since
 # that module uses the global CONF instance exclusively.
 conf = cfg.CONF
-conf(project='marconi', prog='marconi-queues', args=[])
+conf(project='zaqar', prog='zaqar-queues', args=[])
 
 app = bootstrap.Bootstrap(conf).transport.app
diff --git a/marconi/queues/transport/wsgi/driver.py b/zaqar/queues/transport/wsgi/driver.py
similarity index 89%
rename from marconi/queues/transport/wsgi/driver.py
rename to zaqar/queues/transport/wsgi/driver.py
index a037755b4..9b9a2477e 100644
--- a/marconi/queues/transport/wsgi/driver.py
+++ b/zaqar/queues/transport/wsgi/driver.py
@@ -19,15 +19,15 @@ from wsgiref import simple_server
 import falcon
 from oslo.config import cfg
 
-from marconi.common import decorators
-from marconi.common.transport.wsgi import helpers
-from marconi.i18n import _
-import marconi.openstack.common.log as logging
-from marconi.queues import transport
-from marconi.queues.transport import auth
-from marconi.queues.transport import validation
-from marconi.queues.transport.wsgi import v1_0
-from marconi.queues.transport.wsgi import v1_1
+from zaqar.common import decorators
+from zaqar.common.transport.wsgi import helpers
+from zaqar.i18n import _
+import zaqar.openstack.common.log as logging
+from zaqar.queues import transport
+from zaqar.queues.transport import auth
+from zaqar.queues.transport import validation
+from zaqar.queues.transport.wsgi import v1_0
+from zaqar.queues.transport.wsgi import v1_1
 
 _WSGI_OPTIONS = (
     cfg.StrOpt('bind', default='127.0.0.1',
diff --git a/marconi/queues/transport/wsgi/errors.py b/zaqar/queues/transport/wsgi/errors.py
similarity index 94%
rename from marconi/queues/transport/wsgi/errors.py
rename to zaqar/queues/transport/wsgi/errors.py
index 7fbde2ad8..24ec17a75 100644
--- a/marconi/queues/transport/wsgi/errors.py
+++ b/zaqar/queues/transport/wsgi/errors.py
@@ -15,11 +15,11 @@
 
 import falcon
 
-from marconi.i18n import _
+from zaqar.i18n import _
 
 
 class HTTPServiceUnavailable(falcon.HTTPServiceUnavailable):
-    """Wraps falcon.HTTPServiceUnavailable with Marconi messaging."""
+    """Wraps falcon.HTTPServiceUnavailable with Zaqar messaging."""
 
     TITLE = _(u'Service temporarily unavailable')
     DESCRIPTION = _(u'Please try again in a few seconds.')
diff --git a/marconi/queues/transport/wsgi/utils.py b/zaqar/queues/transport/wsgi/utils.py
similarity index 97%
rename from marconi/queues/transport/wsgi/utils.py
rename to zaqar/queues/transport/wsgi/utils.py
index 0ac4e8e2e..1bc984415 100644
--- a/marconi/queues/transport/wsgi/utils.py
+++ b/zaqar/queues/transport/wsgi/utils.py
@@ -14,10 +14,10 @@
 
 import uuid
 
-from marconi.i18n import _
-import marconi.openstack.common.log as logging
-from marconi.queues.transport import utils
-from marconi.queues.transport.wsgi import errors
+from zaqar.i18n import _
+import zaqar.openstack.common.log as logging
+from zaqar.queues.transport import utils
+from zaqar.queues.transport.wsgi import errors
 
 
 JSONObject = dict
diff --git a/marconi/queues/transport/wsgi/v1_0/__init__.py b/zaqar/queues/transport/wsgi/v1_0/__init__.py
similarity index 85%
rename from marconi/queues/transport/wsgi/v1_0/__init__.py
rename to zaqar/queues/transport/wsgi/v1_0/__init__.py
index 3a755c560..32670e6df 100644
--- a/marconi/queues/transport/wsgi/v1_0/__init__.py
+++ b/zaqar/queues/transport/wsgi/v1_0/__init__.py
@@ -12,14 +12,14 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-from marconi.queues.transport.wsgi.v1_0 import claims
-from marconi.queues.transport.wsgi.v1_0 import health
-from marconi.queues.transport.wsgi.v1_0 import homedoc
-from marconi.queues.transport.wsgi.v1_0 import messages
-from marconi.queues.transport.wsgi.v1_0 import metadata
-from marconi.queues.transport.wsgi.v1_0 import pools
-from marconi.queues.transport.wsgi.v1_0 import queues
-from marconi.queues.transport.wsgi.v1_0 import stats
+from zaqar.queues.transport.wsgi.v1_0 import claims
+from zaqar.queues.transport.wsgi.v1_0 import health
+from zaqar.queues.transport.wsgi.v1_0 import homedoc
+from zaqar.queues.transport.wsgi.v1_0 import messages
+from zaqar.queues.transport.wsgi.v1_0 import metadata
+from zaqar.queues.transport.wsgi.v1_0 import pools
+from zaqar.queues.transport.wsgi.v1_0 import queues
+from zaqar.queues.transport.wsgi.v1_0 import stats
 
 
 def public_endpoints(driver):
diff --git a/marconi/queues/transport/wsgi/v1_0/claims.py b/zaqar/queues/transport/wsgi/v1_0/claims.py
similarity index 95%
rename from marconi/queues/transport/wsgi/v1_0/claims.py
rename to zaqar/queues/transport/wsgi/v1_0/claims.py
index 3e3daa2bf..d317a84d0 100644
--- a/marconi/queues/transport/wsgi/v1_0/claims.py
+++ b/zaqar/queues/transport/wsgi/v1_0/claims.py
@@ -16,13 +16,13 @@
 import falcon
 import six
 
-from marconi.i18n import _
-import marconi.openstack.common.log as logging
-from marconi.queues.storage import errors as storage_errors
-from marconi.queues.transport import utils
-from marconi.queues.transport import validation
-from marconi.queues.transport.wsgi import errors as wsgi_errors
-from marconi.queues.transport.wsgi import utils as wsgi_utils
+from zaqar.i18n import _
+import zaqar.openstack.common.log as logging
+from zaqar.queues.storage import errors as storage_errors
+from zaqar.queues.transport import utils
+from zaqar.queues.transport import validation
+from zaqar.queues.transport.wsgi import errors as wsgi_errors
+from zaqar.queues.transport.wsgi import utils as wsgi_utils
 
 LOG = logging.getLogger(__name__)
 
diff --git a/marconi/queues/transport/wsgi/v1_0/health.py b/zaqar/queues/transport/wsgi/v1_0/health.py
similarity index 100%
rename from marconi/queues/transport/wsgi/v1_0/health.py
rename to zaqar/queues/transport/wsgi/v1_0/health.py
diff --git a/marconi/queues/transport/wsgi/v1_0/homedoc.py b/zaqar/queues/transport/wsgi/v1_0/homedoc.py
similarity index 100%
rename from marconi/queues/transport/wsgi/v1_0/homedoc.py
rename to zaqar/queues/transport/wsgi/v1_0/homedoc.py
diff --git a/marconi/queues/transport/wsgi/v1_0/messages.py b/zaqar/queues/transport/wsgi/v1_0/messages.py
similarity index 96%
rename from marconi/queues/transport/wsgi/v1_0/messages.py
rename to zaqar/queues/transport/wsgi/v1_0/messages.py
index 06416279a..61faaf689 100644
--- a/marconi/queues/transport/wsgi/v1_0/messages.py
+++ b/zaqar/queues/transport/wsgi/v1_0/messages.py
@@ -16,13 +16,13 @@
 import falcon
 import six
 
-from marconi.i18n import _
-import marconi.openstack.common.log as logging
-from marconi.queues.storage import errors as storage_errors
-from marconi.queues.transport import utils
-from marconi.queues.transport import validation
-from marconi.queues.transport.wsgi import errors as wsgi_errors
-from marconi.queues.transport.wsgi import utils as wsgi_utils
+from zaqar.i18n import _
+import zaqar.openstack.common.log as logging
+from zaqar.queues.storage import errors as storage_errors
+from zaqar.queues.transport import utils
+from zaqar.queues.transport import validation
+from zaqar.queues.transport.wsgi import errors as wsgi_errors
+from zaqar.queues.transport.wsgi import utils as wsgi_utils
 
 LOG = logging.getLogger(__name__)
 
diff --git a/marconi/queues/transport/wsgi/v1_0/metadata.py b/zaqar/queues/transport/wsgi/v1_0/metadata.py
similarity index 89%
rename from marconi/queues/transport/wsgi/v1_0/metadata.py
rename to zaqar/queues/transport/wsgi/v1_0/metadata.py
index e42674fb1..ca83e9abc 100644
--- a/marconi/queues/transport/wsgi/v1_0/metadata.py
+++ b/zaqar/queues/transport/wsgi/v1_0/metadata.py
@@ -16,13 +16,13 @@
 import falcon
 import six
 
-from marconi.i18n import _
-import marconi.openstack.common.log as logging
-from marconi.queues.storage import errors as storage_errors
-from marconi.queues.transport import utils
-from marconi.queues.transport import validation
-from marconi.queues.transport.wsgi import errors as wsgi_errors
-from marconi.queues.transport.wsgi import utils as wsgi_utils
+from zaqar.i18n import _
+import zaqar.openstack.common.log as logging
+from zaqar.queues.storage import errors as storage_errors
+from zaqar.queues.transport import utils
+from zaqar.queues.transport import validation
+from zaqar.queues.transport.wsgi import errors as wsgi_errors
+from zaqar.queues.transport.wsgi import utils as wsgi_utils
 
 
 LOG = logging.getLogger(__name__)
diff --git a/marconi/queues/transport/wsgi/v1_0/pools.py b/zaqar/queues/transport/wsgi/v1_0/pools.py
similarity index 93%
rename from marconi/queues/transport/wsgi/v1_0/pools.py
rename to zaqar/queues/transport/wsgi/v1_0/pools.py
index d59ac0165..ad3634efb 100644
--- a/marconi/queues/transport/wsgi/v1_0/pools.py
+++ b/zaqar/queues/transport/wsgi/v1_0/pools.py
@@ -36,14 +36,14 @@ registered, there is an optional field:
 import falcon
 import jsonschema
 
-from marconi.common.schemas import pools as schema
-from marconi.common.transport.wsgi import utils
-from marconi.common import utils as common_utils
-from marconi.openstack.common import log
-from marconi.queues.storage import errors
-from marconi.queues.storage import utils as storage_utils
-from marconi.queues.transport import utils as transport_utils
-from marconi.queues.transport.wsgi import errors as wsgi_errors
+from zaqar.common.schemas import pools as schema
+from zaqar.common.transport.wsgi import utils
+from zaqar.common import utils as common_utils
+from zaqar.openstack.common import log
+from zaqar.queues.storage import errors
+from zaqar.queues.storage import utils as storage_utils
+from zaqar.queues.transport import utils as transport_utils
+from zaqar.queues.transport.wsgi import errors as wsgi_errors
 
 LOG = log.getLogger(__name__)
 
diff --git a/marconi/queues/transport/wsgi/v1_0/queues.py b/zaqar/queues/transport/wsgi/v1_0/queues.py
similarity index 95%
rename from marconi/queues/transport/wsgi/v1_0/queues.py
rename to zaqar/queues/transport/wsgi/v1_0/queues.py
index 3bac09285..9bf38f969 100644
--- a/marconi/queues/transport/wsgi/v1_0/queues.py
+++ b/zaqar/queues/transport/wsgi/v1_0/queues.py
@@ -16,11 +16,11 @@
 import falcon
 import six
 
-from marconi.i18n import _
-import marconi.openstack.common.log as logging
-from marconi.queues.transport import utils
-from marconi.queues.transport import validation
-from marconi.queues.transport.wsgi import errors as wsgi_errors
+from zaqar.i18n import _
+import zaqar.openstack.common.log as logging
+from zaqar.queues.transport import utils
+from zaqar.queues.transport import validation
+from zaqar.queues.transport.wsgi import errors as wsgi_errors
 
 
 LOG = logging.getLogger(__name__)
diff --git a/marconi/queues/transport/wsgi/v1_0/stats.py b/zaqar/queues/transport/wsgi/v1_0/stats.py
similarity index 88%
rename from marconi/queues/transport/wsgi/v1_0/stats.py
rename to zaqar/queues/transport/wsgi/v1_0/stats.py
index 704dde370..c88b99bdb 100644
--- a/marconi/queues/transport/wsgi/v1_0/stats.py
+++ b/zaqar/queues/transport/wsgi/v1_0/stats.py
@@ -15,11 +15,11 @@
 
 import falcon
 
-from marconi.i18n import _
-import marconi.openstack.common.log as logging
-from marconi.queues.storage import errors as storage_errors
-from marconi.queues.transport import utils
-from marconi.queues.transport.wsgi import errors as wsgi_errors
+from zaqar.i18n import _
+import zaqar.openstack.common.log as logging
+from zaqar.queues.storage import errors as storage_errors
+from zaqar.queues.transport import utils
+from zaqar.queues.transport.wsgi import errors as wsgi_errors
 
 
 LOG = logging.getLogger(__name__)
diff --git a/marconi/queues/transport/wsgi/v1_1/__init__.py b/zaqar/queues/transport/wsgi/v1_1/__init__.py
similarity index 86%
rename from marconi/queues/transport/wsgi/v1_1/__init__.py
rename to zaqar/queues/transport/wsgi/v1_1/__init__.py
index 8e1f942b4..59d34d208 100644
--- a/marconi/queues/transport/wsgi/v1_1/__init__.py
+++ b/zaqar/queues/transport/wsgi/v1_1/__init__.py
@@ -12,14 +12,14 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-from marconi.queues.transport.wsgi.v1_1 import claims
-from marconi.queues.transport.wsgi.v1_1 import health
-from marconi.queues.transport.wsgi.v1_1 import homedoc
-from marconi.queues.transport.wsgi.v1_1 import messages
-from marconi.queues.transport.wsgi.v1_1 import ping
-from marconi.queues.transport.wsgi.v1_1 import pools
-from marconi.queues.transport.wsgi.v1_1 import queues
-from marconi.queues.transport.wsgi.v1_1 import stats
+from zaqar.queues.transport.wsgi.v1_1 import claims
+from zaqar.queues.transport.wsgi.v1_1 import health
+from zaqar.queues.transport.wsgi.v1_1 import homedoc
+from zaqar.queues.transport.wsgi.v1_1 import messages
+from zaqar.queues.transport.wsgi.v1_1 import ping
+from zaqar.queues.transport.wsgi.v1_1 import pools
+from zaqar.queues.transport.wsgi.v1_1 import queues
+from zaqar.queues.transport.wsgi.v1_1 import stats
 
 
 def public_endpoints(driver):
diff --git a/marconi/queues/transport/wsgi/v1_1/claims.py b/zaqar/queues/transport/wsgi/v1_1/claims.py
similarity index 95%
rename from marconi/queues/transport/wsgi/v1_1/claims.py
rename to zaqar/queues/transport/wsgi/v1_1/claims.py
index d3edb12e6..5c92d05de 100644
--- a/marconi/queues/transport/wsgi/v1_1/claims.py
+++ b/zaqar/queues/transport/wsgi/v1_1/claims.py
@@ -16,13 +16,13 @@
 import falcon
 import six
 
-from marconi.i18n import _
-import marconi.openstack.common.log as logging
-from marconi.queues.storage import errors as storage_errors
-from marconi.queues.transport import utils
-from marconi.queues.transport import validation
-from marconi.queues.transport.wsgi import errors as wsgi_errors
-from marconi.queues.transport.wsgi import utils as wsgi_utils
+from zaqar.i18n import _
+import zaqar.openstack.common.log as logging
+from zaqar.queues.storage import errors as storage_errors
+from zaqar.queues.transport import utils
+from zaqar.queues.transport import validation
+from zaqar.queues.transport.wsgi import errors as wsgi_errors
+from zaqar.queues.transport.wsgi import utils as wsgi_utils
 
 LOG = logging.getLogger(__name__)
 
diff --git a/marconi/queues/transport/wsgi/v1_1/health.py b/zaqar/queues/transport/wsgi/v1_1/health.py
similarity index 100%
rename from marconi/queues/transport/wsgi/v1_1/health.py
rename to zaqar/queues/transport/wsgi/v1_1/health.py
diff --git a/marconi/queues/transport/wsgi/v1_1/homedoc.py b/zaqar/queues/transport/wsgi/v1_1/homedoc.py
similarity index 100%
rename from marconi/queues/transport/wsgi/v1_1/homedoc.py
rename to zaqar/queues/transport/wsgi/v1_1/homedoc.py
diff --git a/marconi/queues/transport/wsgi/v1_1/messages.py b/zaqar/queues/transport/wsgi/v1_1/messages.py
similarity index 97%
rename from marconi/queues/transport/wsgi/v1_1/messages.py
rename to zaqar/queues/transport/wsgi/v1_1/messages.py
index 194a3bca4..7d3e87206 100644
--- a/marconi/queues/transport/wsgi/v1_1/messages.py
+++ b/zaqar/queues/transport/wsgi/v1_1/messages.py
@@ -16,13 +16,13 @@
 import falcon
 import six
 
-from marconi.i18n import _
-import marconi.openstack.common.log as logging
-from marconi.queues.storage import errors as storage_errors
-from marconi.queues.transport import utils
-from marconi.queues.transport import validation
-from marconi.queues.transport.wsgi import errors as wsgi_errors
-from marconi.queues.transport.wsgi import utils as wsgi_utils
+from zaqar.i18n import _
+import zaqar.openstack.common.log as logging
+from zaqar.queues.storage import errors as storage_errors
+from zaqar.queues.transport import utils
+from zaqar.queues.transport import validation
+from zaqar.queues.transport.wsgi import errors as wsgi_errors
+from zaqar.queues.transport.wsgi import utils as wsgi_utils
 
 LOG = logging.getLogger(__name__)
 
diff --git a/marconi/queues/transport/wsgi/v1_1/ping.py b/zaqar/queues/transport/wsgi/v1_1/ping.py
similarity index 100%
rename from marconi/queues/transport/wsgi/v1_1/ping.py
rename to zaqar/queues/transport/wsgi/v1_1/ping.py
diff --git a/marconi/queues/transport/wsgi/v1_1/pools.py b/zaqar/queues/transport/wsgi/v1_1/pools.py
similarity index 93%
rename from marconi/queues/transport/wsgi/v1_1/pools.py
rename to zaqar/queues/transport/wsgi/v1_1/pools.py
index d59ac0165..ad3634efb 100644
--- a/marconi/queues/transport/wsgi/v1_1/pools.py
+++ b/zaqar/queues/transport/wsgi/v1_1/pools.py
@@ -36,14 +36,14 @@ registered, there is an optional field:
 import falcon
 import jsonschema
 
-from marconi.common.schemas import pools as schema
-from marconi.common.transport.wsgi import utils
-from marconi.common import utils as common_utils
-from marconi.openstack.common import log
-from marconi.queues.storage import errors
-from marconi.queues.storage import utils as storage_utils
-from marconi.queues.transport import utils as transport_utils
-from marconi.queues.transport.wsgi import errors as wsgi_errors
+from zaqar.common.schemas import pools as schema
+from zaqar.common.transport.wsgi import utils
+from zaqar.common import utils as common_utils
+from zaqar.openstack.common import log
+from zaqar.queues.storage import errors
+from zaqar.queues.storage import utils as storage_utils
+from zaqar.queues.transport import utils as transport_utils
+from zaqar.queues.transport.wsgi import errors as wsgi_errors
 
 LOG = log.getLogger(__name__)
 
diff --git a/marconi/queues/transport/wsgi/v1_1/queues.py b/zaqar/queues/transport/wsgi/v1_1/queues.py
similarity index 93%
rename from marconi/queues/transport/wsgi/v1_1/queues.py
rename to zaqar/queues/transport/wsgi/v1_1/queues.py
index 7af973220..7453ea501 100644
--- a/marconi/queues/transport/wsgi/v1_1/queues.py
+++ b/zaqar/queues/transport/wsgi/v1_1/queues.py
@@ -16,13 +16,13 @@
 import falcon
 import six
 
-from marconi.i18n import _
-import marconi.openstack.common.log as logging
-from marconi.queues.storage import errors as storage_errors
-from marconi.queues.transport import utils
-from marconi.queues.transport import validation
-from marconi.queues.transport.wsgi import errors as wsgi_errors
-from marconi.queues.transport.wsgi import utils as wsgi_utils
+from zaqar.i18n import _
+import zaqar.openstack.common.log as logging
+from zaqar.queues.storage import errors as storage_errors
+from zaqar.queues.transport import utils
+from zaqar.queues.transport import validation
+from zaqar.queues.transport.wsgi import errors as wsgi_errors
+from zaqar.queues.transport.wsgi import utils as wsgi_utils
 
 
 LOG = logging.getLogger(__name__)
diff --git a/marconi/queues/transport/wsgi/v1_1/stats.py b/zaqar/queues/transport/wsgi/v1_1/stats.py
similarity index 90%
rename from marconi/queues/transport/wsgi/v1_1/stats.py
rename to zaqar/queues/transport/wsgi/v1_1/stats.py
index b9e995b4c..7ae729e5e 100644
--- a/marconi/queues/transport/wsgi/v1_1/stats.py
+++ b/zaqar/queues/transport/wsgi/v1_1/stats.py
@@ -15,11 +15,11 @@
 
 import falcon
 
-from marconi.i18n import _
-import marconi.openstack.common.log as logging
-from marconi.queues.storage import errors as storage_errors
-from marconi.queues.transport import utils
-from marconi.queues.transport.wsgi import errors as wsgi_errors
+from zaqar.i18n import _
+import zaqar.openstack.common.log as logging
+from zaqar.queues.storage import errors as storage_errors
+from zaqar.queues.transport import utils
+from zaqar.queues.transport.wsgi import errors as wsgi_errors
 
 
 LOG = logging.getLogger(__name__)
diff --git a/marconi/queues/transport/zmq/__init__.py b/zaqar/queues/transport/zmq/__init__.py
similarity index 100%
rename from marconi/queues/transport/zmq/__init__.py
rename to zaqar/queues/transport/zmq/__init__.py
diff --git a/marconi/tests/__init__.py b/zaqar/tests/__init__.py
similarity index 89%
rename from marconi/tests/__init__.py
rename to zaqar/tests/__init__.py
index 16b8bd914..049642c98 100644
--- a/marconi/tests/__init__.py
+++ b/zaqar/tests/__init__.py
@@ -13,10 +13,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""Marconi Unit-ish Tests"""
+"""Zaqar Unit-ish Tests"""
 
-from marconi.tests import base
-from marconi.tests import helpers
+from zaqar.tests import base
+from zaqar.tests import helpers
 
 
 SKIP_SLOW_TESTS = helpers.SKIP_SLOW_TESTS
diff --git a/marconi/tests/base.py b/zaqar/tests/base.py
similarity index 90%
rename from marconi/tests/base.py
rename to zaqar/tests/base.py
index ad809c090..1faa5ac45 100644
--- a/marconi/tests/base.py
+++ b/zaqar/tests/base.py
@@ -22,7 +22,7 @@ import testtools
 
 
 class TestBase(testtools.TestCase):
-    """Child class of testtools.TestCase for testing Marconi.
+    """Child class of testtools.TestCase for testing Zaqar.
 
     Inherit from this and write your test methods. If the child class defines
     a prepare(self) method, this method will be called before executing each
@@ -34,7 +34,7 @@ class TestBase(testtools.TestCase):
     def setUp(self):
         super(TestBase, self).setUp()
 
-        self.useFixture(fixtures.FakeLogger('marconi'))
+        self.useFixture(fixtures.FakeLogger('zaqar'))
 
         # NOTE(kgriffs): Don't monkey-patch stdout since it breaks
         # debugging with pdb.
@@ -48,7 +48,7 @@ class TestBase(testtools.TestCase):
 
     @classmethod
     def conf_path(cls, filename):
-        """Returns the full path to the specified Marconi conf file.
+        """Returns the full path to the specified Zaqar conf file.
 
         :param filename: Name of the conf file to find (e.g.,
                          'wsgi_memory.conf')
@@ -57,7 +57,7 @@ class TestBase(testtools.TestCase):
         if os.path.exists(filename):
             return filename
 
-        return os.path.join(os.environ["MARCONI_TESTS_CONFIGS_DIR"], filename)
+        return os.path.join(os.environ["ZAQAR_TESTS_CONFIGS_DIR"], filename)
 
     @classmethod
     def load_conf(cls, filename):
diff --git a/marconi/tests/faulty_storage.py b/zaqar/tests/faulty_storage.py
similarity index 98%
rename from marconi/tests/faulty_storage.py
rename to zaqar/tests/faulty_storage.py
index e183f5094..258f89600 100644
--- a/marconi/tests/faulty_storage.py
+++ b/zaqar/tests/faulty_storage.py
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from marconi.queues import storage
+from zaqar.queues import storage
 
 
 class DataDriver(storage.DataDriverBase):
diff --git a/marconi/tests/functional/__init__.py b/zaqar/tests/functional/__init__.py
similarity index 100%
rename from marconi/tests/functional/__init__.py
rename to zaqar/tests/functional/__init__.py
diff --git a/marconi/tests/functional/base.py b/zaqar/tests/functional/base.py
similarity index 90%
rename from marconi/tests/functional/base.py
rename to zaqar/tests/functional/base.py
index 2fce10015..95764019d 100644
--- a/marconi/tests/functional/base.py
+++ b/zaqar/tests/functional/base.py
@@ -21,27 +21,27 @@ import os
 import jsonschema
 import six
 
-from marconi.openstack.common import timeutils
-from marconi.queues.api.v1 import response as response_v1
-from marconi.queues.api.v1_1 import response as response_v1_1
-from marconi.queues import bootstrap
-from marconi.queues.transport import base as transport_base
+from zaqar.openstack.common import timeutils
+from zaqar.queues.api.v1 import response as response_v1
+from zaqar.queues.api.v1_1 import response as response_v1_1
+from zaqar.queues import bootstrap
+from zaqar.queues.transport import base as transport_base
 # TODO(flaper87): This is necessary to register,
 # wsgi configs and won't be permanent. It'll be
 # refactored as part of the work for this blueprint
-from marconi.queues.transport import validation
-from marconi.queues.transport import wsgi  # noqa
-from marconi import tests as testing
-from marconi.tests.functional import config
-from marconi.tests.functional import helpers
-from marconi.tests.functional import http
+from zaqar.queues.transport import validation
+from zaqar.queues.transport import wsgi  # noqa
+from zaqar import tests as testing
+from zaqar.tests.functional import config
+from zaqar.tests.functional import helpers
+from zaqar.tests.functional import http
 
 # TODO(kgriffs): Run functional tests to a devstack gate job and
 # set this using an environment variable or something.
 #
 # TODO(kgriffs): Find a more general way to do this; we seem to be
 # using this environ flag pattern over and over againg.
-_TEST_INTEGRATION = os.environ.get('MARCONI_TEST_INTEGRATION') is not None
+_TEST_INTEGRATION = os.environ.get('ZAQAR_TEST_INTEGRATION') is not None
 
 
 class FunctionalTestBase(testing.TestBase):
@@ -60,7 +60,7 @@ class FunctionalTestBase(testing.TestBase):
         if not self.cfg.run_tests:
             self.skipTest("Functional tests disabled")
 
-        self.mconf = self.load_conf(self.cfg.marconi.config)
+        self.mconf = self.load_conf(self.cfg.zaqar.config)
 
         validator = validation.Validator(self.mconf)
         self.limits = validator._limits_conf
@@ -74,7 +74,7 @@ class FunctionalTestBase(testing.TestBase):
             # an external wsgi server instance.
 
             # NOTE(flaper87): Use running instances.
-            if self.cfg.marconi.run_server:
+            if self.cfg.zaqar.run_server:
                 if not (self.server and self.server.is_alive()):
                     self.server = self.server_class()
                     self.server.start(self.mconf)
@@ -84,7 +84,7 @@ class FunctionalTestBase(testing.TestBase):
             self.client = http.WSGIClient(
                 bootstrap.Bootstrap(config.cfg.CONF).transport.app)
 
-        self.headers = helpers.create_marconi_headers(self.cfg)
+        self.headers = helpers.create_zaqar_headers(self.cfg)
 
         if self.cfg.auth.auth_on:
             auth_token = helpers.get_keystone_token(self.cfg, self.client)
@@ -200,7 +200,7 @@ class FunctionalTestBase(testing.TestBase):
 @six.add_metaclass(abc.ABCMeta)
 class Server(object):
 
-    name = "marconi-functional-test-server"
+    name = "zaqar-functional-test-server"
 
     def __init__(self):
         self.process = None
@@ -261,18 +261,18 @@ class Server(object):
         self.process.terminate()
 
 
-class MarconiServer(Server):
+class ZaqarServer(Server):
 
-    name = "marconi-wsgiref-test-server"
+    name = "zaqar-wsgiref-test-server"
 
     def get_target(self, conf):
         server = bootstrap.Bootstrap(conf)
         return server.run
 
 
-class MarconiAdminServer(Server):
+class ZaqarAdminServer(Server):
 
-    name = "marconi-admin-wsgiref-test-server"
+    name = "zaqar-admin-wsgiref-test-server"
 
     def get_target(self, conf):
         conf.admin_mode = True
diff --git a/marconi/tests/functional/config.py b/zaqar/tests/functional/config.py
similarity index 87%
rename from marconi/tests/functional/config.py
rename to zaqar/tests/functional/config.py
index 584b67743..f145c70c1 100644
--- a/marconi/tests/functional/config.py
+++ b/zaqar/tests/functional/config.py
@@ -30,10 +30,10 @@ _AUTH_OPTIONS = (
 )
 
 
-_MARCONI_OPTIONS = (
+_ZAQAR_OPTIONS = (
     cfg.BoolOpt("run_server", default=True),
     cfg.StrOpt("url", default="http://127.0.0.1:8888"),
-    cfg.StrOpt("config", default="functional-marconi.conf"),
+    cfg.StrOpt("config", default="functional-zaqar.conf"),
 )
 
 
@@ -47,9 +47,9 @@ def load_config():
     conf = cfg.ConfigOpts()
     conf.register_opts(_DEFAULT)
     conf.register_opts(_AUTH_OPTIONS, group="auth")
-    conf.register_opts(_MARCONI_OPTIONS, group="marconi")
+    conf.register_opts(_ZAQAR_OPTIONS, group="zaqar")
     conf.register_opts(_HEADERS_OPTIONS, group="headers")
-    conf_path = os.path.join(os.environ["MARCONI_TESTS_CONFIGS_DIR"],
+    conf_path = os.path.join(os.environ["ZAQAR_TESTS_CONFIGS_DIR"],
                              "functional-tests.conf")
     conf(args=[], default_config_files=[conf_path])
     return conf
diff --git a/marconi/tests/functional/helpers.py b/zaqar/tests/functional/helpers.py
similarity index 97%
rename from marconi/tests/functional/helpers.py
rename to zaqar/tests/functional/helpers.py
index 719e5d37b..8a81d155d 100644
--- a/marconi/tests/functional/helpers.py
+++ b/zaqar/tests/functional/helpers.py
@@ -40,8 +40,8 @@ def get_keystone_token(conf, client):
     return response_body['access']['token']['id']
 
 
-def create_marconi_headers(conf):
-    """Returns headers to be used for all Marconi requests."""
+def create_zaqar_headers(conf):
+    """Returns headers to be used for all Zaqar requests."""
 
     headers = {
         "User-Agent": conf.headers.user_agent,
diff --git a/marconi/tests/functional/http.py b/zaqar/tests/functional/http.py
similarity index 99%
rename from marconi/tests/functional/http.py
rename to zaqar/tests/functional/http.py
index e2b9397f0..3528739db 100755
--- a/marconi/tests/functional/http.py
+++ b/zaqar/tests/functional/http.py
@@ -20,7 +20,7 @@ from falcon import testing as ftest
 import requests
 import six
 
-from marconi.openstack.common import jsonutils
+from zaqar.openstack.common import jsonutils
 
 
 def _build_url(method):
diff --git a/marconi/tests/helpers.py b/zaqar/tests/helpers.py
similarity index 94%
rename from marconi/tests/helpers.py
rename to zaqar/tests/helpers.py
index 47b51f218..5424bbb9a 100644
--- a/marconi/tests/helpers.py
+++ b/zaqar/tests/helpers.py
@@ -22,8 +22,8 @@ import six
 import testtools
 
 
-SKIP_SLOW_TESTS = os.environ.get('MARCONI_TEST_SLOW') is None
-SKIP_MONGODB_TESTS = os.environ.get('MARCONI_TEST_MONGODB') is None
+SKIP_SLOW_TESTS = os.environ.get('ZAQAR_TEST_SLOW') is None
+SKIP_MONGODB_TESTS = os.environ.get('ZAQAR_TEST_MONGODB') is None
 
 
 @contextlib.contextmanager
@@ -192,14 +192,14 @@ def pool_entries(controller, count):
 def requires_mongodb(test_case):
     """Decorator to flag a test case as being dependent on MongoDB.
 
-    MongoDB-specific tests will be skipped unless the MARCONI_TEST_MONGODB
+    MongoDB-specific tests will be skipped unless the ZAQAR_TEST_MONGODB
     environment variable is set. If the variable is set, the tests will
     assume that mongod is running and listening on localhost.
     """
 
     reason = ('Skipping tests that require MongoDB. Ensure '
               'mongod is running on localhost and then set '
-              'MARCONI_TEST_MONGODB in order to enable tests '
+              'ZAQAR_TEST_MONGODB in order to enable tests '
               'that are specific to this storage backend. ')
 
     return testtools.skipIf(SKIP_MONGODB_TESTS, reason)(test_case)
@@ -208,7 +208,7 @@ def requires_mongodb(test_case):
 def is_slow(condition=lambda self: True):
     """Decorator to flag slow tests.
 
-    Slow tests will be skipped unless MARCONI_TEST_SLOW is set, and
+    Slow tests will be skipped unless ZAQAR_TEST_SLOW is set, and
     condition(self) returns True.
 
     :param condition: Function that returns True IFF the test will be slow;
@@ -220,7 +220,7 @@ def is_slow(condition=lambda self: True):
         @functools.wraps(test_method)
         def wrapper(self):
             if SKIP_SLOW_TESTS and condition(self):
-                msg = ('Skipping slow test. Set MARCONI_TEST_SLOW '
+                msg = ('Skipping slow test. Set ZAQAR_TEST_SLOW '
                        'to enable slow tests.')
 
                 self.skipTest(msg)
diff --git a/marconi/tests/queues/__init__.py b/zaqar/tests/queues/__init__.py
similarity index 100%
rename from marconi/tests/queues/__init__.py
rename to zaqar/tests/queues/__init__.py
diff --git a/marconi/tests/queues/storage/__init__.py b/zaqar/tests/queues/storage/__init__.py
similarity index 100%
rename from marconi/tests/queues/storage/__init__.py
rename to zaqar/tests/queues/storage/__init__.py
diff --git a/marconi/tests/queues/storage/base.py b/zaqar/tests/queues/storage/base.py
similarity index 99%
rename from marconi/tests/queues/storage/base.py
rename to zaqar/tests/queues/storage/base.py
index d4a41d84b..15be629c6 100644
--- a/marconi/tests/queues/storage/base.py
+++ b/zaqar/tests/queues/storage/base.py
@@ -22,13 +22,13 @@ import ddt
 import six
 from testtools import matchers
 
-from marconi.openstack.common.cache import cache as oslo_cache
-from marconi.openstack.common import timeutils
-from marconi.queues import bootstrap
-from marconi.queues import storage
-from marconi.queues.storage import errors
-from marconi import tests as testing
-from marconi.tests import helpers
+from zaqar.openstack.common.cache import cache as oslo_cache
+from zaqar.openstack.common import timeutils
+from zaqar.queues import bootstrap
+from zaqar.queues import storage
+from zaqar.queues.storage import errors
+from zaqar import tests as testing
+from zaqar.tests import helpers
 
 
 class ControllerBaseTest(testing.TestBase):
diff --git a/marconi/tests/queues/transport/__init__.py b/zaqar/tests/queues/transport/__init__.py
similarity index 100%
rename from marconi/tests/queues/transport/__init__.py
rename to zaqar/tests/queues/transport/__init__.py
diff --git a/marconi/tests/queues/transport/wsgi/__init__.py b/zaqar/tests/queues/transport/wsgi/__init__.py
similarity index 93%
rename from marconi/tests/queues/transport/wsgi/__init__.py
rename to zaqar/tests/queues/transport/wsgi/__init__.py
index 635f1526c..2ff3aff77 100644
--- a/marconi/tests/queues/transport/wsgi/__init__.py
+++ b/zaqar/tests/queues/transport/wsgi/__init__.py
@@ -15,7 +15,7 @@
 # TODO(kgriffs): Consider consolidating all of these tests into a
 # single module.
 
-from marconi.tests.queues.transport.wsgi import base
+from zaqar.tests.queues.transport.wsgi import base
 
 TestBase = base.TestBase
 TestBaseFaulty = base.TestBaseFaulty
diff --git a/marconi/tests/queues/transport/wsgi/base.py b/zaqar/tests/queues/transport/wsgi/base.py
similarity index 95%
rename from marconi/tests/queues/transport/wsgi/base.py
rename to zaqar/tests/queues/transport/wsgi/base.py
index d97db44f3..ca6513f3a 100644
--- a/marconi/tests/queues/transport/wsgi/base.py
+++ b/zaqar/tests/queues/transport/wsgi/base.py
@@ -14,11 +14,11 @@
 
 from falcon import testing as ftest
 
-from marconi.openstack.common import jsonutils
-from marconi.queues import bootstrap
-from marconi.queues.transport import validation
-from marconi.queues.transport.wsgi import driver
-from marconi import tests as testing
+from zaqar.openstack.common import jsonutils
+from zaqar.queues import bootstrap
+from zaqar.queues.transport import validation
+from zaqar.queues.transport.wsgi import driver
+from zaqar import tests as testing
 
 
 class TestBase(testing.TestBase):
diff --git a/marconi/tests/queues/transport/wsgi/v1_1/__init__.py b/zaqar/tests/queues/transport/wsgi/v1/__init__.py
similarity index 71%
rename from marconi/tests/queues/transport/wsgi/v1_1/__init__.py
rename to zaqar/tests/queues/transport/wsgi/v1/__init__.py
index cb751a75a..d086a8152 100644
--- a/marconi/tests/queues/transport/wsgi/v1_1/__init__.py
+++ b/zaqar/tests/queues/transport/wsgi/v1/__init__.py
@@ -12,15 +12,15 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-from marconi.tests.queues.transport.wsgi.v1_1 import test_auth
-from marconi.tests.queues.transport.wsgi.v1_1 import test_claims
-from marconi.tests.queues.transport.wsgi.v1_1 import test_default_limits
-from marconi.tests.queues.transport.wsgi.v1_1 import test_home
-from marconi.tests.queues.transport.wsgi.v1_1 import test_media_type
-from marconi.tests.queues.transport.wsgi.v1_1 import test_messages
-from marconi.tests.queues.transport.wsgi.v1_1 import test_pools
-from marconi.tests.queues.transport.wsgi.v1_1 import test_queue_lifecycle as l
-from marconi.tests.queues.transport.wsgi.v1_1 import test_validation
+from zaqar.tests.queues.transport.wsgi.v1 import test_auth
+from zaqar.tests.queues.transport.wsgi.v1 import test_claims
+from zaqar.tests.queues.transport.wsgi.v1 import test_default_limits
+from zaqar.tests.queues.transport.wsgi.v1 import test_home
+from zaqar.tests.queues.transport.wsgi.v1 import test_media_type
+from zaqar.tests.queues.transport.wsgi.v1 import test_messages
+from zaqar.tests.queues.transport.wsgi.v1 import test_pools
+from zaqar.tests.queues.transport.wsgi.v1 import test_queue_lifecycle as l
+from zaqar.tests.queues.transport.wsgi.v1 import test_validation
 
 TestAuth = test_auth.TestAuth
 TestClaimsFaultyDriver = test_claims.TestClaimsFaultyDriver
diff --git a/marconi/tests/queues/transport/wsgi/v1/test_auth.py b/zaqar/tests/queues/transport/wsgi/v1/test_auth.py
similarity index 96%
rename from marconi/tests/queues/transport/wsgi/v1/test_auth.py
rename to zaqar/tests/queues/transport/wsgi/v1/test_auth.py
index 6b695611c..f4648b062 100644
--- a/marconi/tests/queues/transport/wsgi/v1/test_auth.py
+++ b/zaqar/tests/queues/transport/wsgi/v1/test_auth.py
@@ -20,7 +20,7 @@ import falcon
 from falcon import testing
 from keystoneclient.middleware import auth_token
 
-from marconi.tests.queues.transport.wsgi import base
+from zaqar.tests.queues.transport.wsgi import base
 
 
 class TestAuth(base.V1Base):
diff --git a/marconi/tests/queues/transport/wsgi/v1/test_claims.py b/zaqar/tests/queues/transport/wsgi/v1/test_claims.py
similarity index 97%
rename from marconi/tests/queues/transport/wsgi/v1/test_claims.py
rename to zaqar/tests/queues/transport/wsgi/v1/test_claims.py
index 4468d694e..54a8cdda3 100644
--- a/marconi/tests/queues/transport/wsgi/v1/test_claims.py
+++ b/zaqar/tests/queues/transport/wsgi/v1/test_claims.py
@@ -21,10 +21,10 @@ import falcon
 import mock
 from testtools import matchers
 
-from marconi.openstack.common import jsonutils
-from marconi.openstack.common import timeutils
-from marconi import tests as testing
-from marconi.tests.queues.transport.wsgi import base
+from zaqar.openstack.common import jsonutils
+from zaqar.openstack.common import timeutils
+from zaqar import tests as testing
+from zaqar.tests.queues.transport.wsgi import base
 
 
 @ddt.ddt
@@ -126,7 +126,7 @@ class ClaimsBaseTest(base.V1Base):
         self.assertEqual(len(listed['messages']), len(claimed))
 
         now = timeutils.utcnow() + datetime.timedelta(seconds=10)
-        timeutils_utcnow = 'marconi.openstack.common.timeutils.utcnow'
+        timeutils_utcnow = 'zaqar.openstack.common.timeutils.utcnow'
         with mock.patch(timeutils_utcnow) as mock_utcnow:
             mock_utcnow.return_value = now
             body = self.simulate_get(claim_href, self.project_id)
diff --git a/marconi/tests/queues/transport/wsgi/v1/test_default_limits.py b/zaqar/tests/queues/transport/wsgi/v1/test_default_limits.py
similarity index 96%
rename from marconi/tests/queues/transport/wsgi/v1/test_default_limits.py
rename to zaqar/tests/queues/transport/wsgi/v1/test_default_limits.py
index 21040fbff..e0c1c30ee 100644
--- a/marconi/tests/queues/transport/wsgi/v1/test_default_limits.py
+++ b/zaqar/tests/queues/transport/wsgi/v1/test_default_limits.py
@@ -18,9 +18,9 @@ import uuid
 
 import falcon
 
-from marconi.openstack.common import jsonutils
-from marconi.queues import storage
-from marconi.tests.queues.transport.wsgi import base
+from zaqar.openstack.common import jsonutils
+from zaqar.queues import storage
+from zaqar.tests.queues.transport.wsgi import base
 
 
 class TestDefaultLimits(base.V1Base):
diff --git a/marconi/tests/queues/transport/wsgi/v1/test_home.py b/zaqar/tests/queues/transport/wsgi/v1/test_home.py
similarity index 86%
rename from marconi/tests/queues/transport/wsgi/v1/test_home.py
rename to zaqar/tests/queues/transport/wsgi/v1/test_home.py
index 1253e33a8..8a5929c76 100644
--- a/marconi/tests/queues/transport/wsgi/v1/test_home.py
+++ b/zaqar/tests/queues/transport/wsgi/v1/test_home.py
@@ -15,8 +15,8 @@
 import falcon
 import six.moves.urllib.parse as urlparse
 
-from marconi.openstack.common import jsonutils
-from marconi.tests.queues.transport.wsgi import base
+from zaqar.openstack.common import jsonutils
+from zaqar.tests.queues.transport.wsgi import base
 
 
 class TestHomeDocument(base.V1Base):
@@ -40,8 +40,8 @@ class TestHomeDocument(base.V1Base):
         self.assertEqual(self.srmock.status, falcon.HTTP_200)
         resp = jsonutils.loads(body[0])
         queue_href_template = resp['resources']['rel/queue']['href-template']
-        path_1 = 'https://marconi.example.com' + self.url_prefix
-        path_2 = 'https://marconi.example.com' + self.url_prefix + '/'
+        path_1 = 'https://zaqar.example.com' + self.url_prefix
+        path_2 = 'https://zaqar.example.com' + self.url_prefix + '/'
 
         # Verify all the href template start with the correct version prefix
         for resource in list(resp['resources']):
@@ -49,7 +49,7 @@ class TestHomeDocument(base.V1Base):
                             startswith(self.url_prefix))
 
         url = urlparse.urljoin(path_1, queue_href_template)
-        expected = ('https://marconi.example.com' + self.url_prefix +
+        expected = ('https://zaqar.example.com' + self.url_prefix +
                     '/queues/foo')
         self.assertEqual(url.format(queue_name='foo'), expected)
 
diff --git a/marconi/tests/queues/transport/wsgi/v1/test_media_type.py b/zaqar/tests/queues/transport/wsgi/v1/test_media_type.py
similarity index 97%
rename from marconi/tests/queues/transport/wsgi/v1/test_media_type.py
rename to zaqar/tests/queues/transport/wsgi/v1/test_media_type.py
index 7ed834d1f..0f0485b14 100644
--- a/marconi/tests/queues/transport/wsgi/v1/test_media_type.py
+++ b/zaqar/tests/queues/transport/wsgi/v1/test_media_type.py
@@ -19,7 +19,7 @@ import falcon
 from falcon import testing
 
 
-from marconi.tests.queues.transport.wsgi import base
+from zaqar.tests.queues.transport.wsgi import base
 
 
 class TestMediaType(base.V1Base):
diff --git a/marconi/tests/queues/transport/wsgi/v1/test_messages.py b/zaqar/tests/queues/transport/wsgi/v1/test_messages.py
similarity index 98%
rename from marconi/tests/queues/transport/wsgi/v1/test_messages.py
rename to zaqar/tests/queues/transport/wsgi/v1/test_messages.py
index f12618df2..0639bd785 100644
--- a/marconi/tests/queues/transport/wsgi/v1/test_messages.py
+++ b/zaqar/tests/queues/transport/wsgi/v1/test_messages.py
@@ -23,11 +23,11 @@ import six
 from testtools import matchers
 
 
-from marconi.openstack.common import jsonutils
-from marconi.openstack.common import timeutils
-from marconi.queues.transport import validation
-from marconi import tests as testing
-from marconi.tests.queues.transport.wsgi import base
+from zaqar.openstack.common import jsonutils
+from zaqar.openstack.common import timeutils
+from zaqar.queues.transport import validation
+from zaqar import tests as testing
+from zaqar.tests.queues.transport.wsgi import base
 
 
 @ddt.ddt
@@ -94,7 +94,7 @@ class MessagesBaseTest(base.V1Base):
 
         # Test GET on the message resource directly
         # NOTE(cpp-cabrera): force the passing of time to age a message
-        timeutils_utcnow = 'marconi.openstack.common.timeutils.utcnow'
+        timeutils_utcnow = 'zaqar.openstack.common.timeutils.utcnow'
         now = timeutils.utcnow() + datetime.timedelta(seconds=10)
         with mock.patch(timeutils_utcnow) as mock_utcnow:
             mock_utcnow.return_value = now
diff --git a/marconi/tests/queues/transport/wsgi/v1/test_pools.py b/zaqar/tests/queues/transport/wsgi/v1/test_pools.py
similarity index 98%
rename from marconi/tests/queues/transport/wsgi/v1/test_pools.py
rename to zaqar/tests/queues/transport/wsgi/v1/test_pools.py
index 10470bcd4..8b34dec22 100644
--- a/marconi/tests/queues/transport/wsgi/v1/test_pools.py
+++ b/zaqar/tests/queues/transport/wsgi/v1/test_pools.py
@@ -19,9 +19,9 @@ import ddt
 import falcon
 
 
-from marconi.openstack.common import jsonutils
-from marconi import tests as testing
-from marconi.tests.queues.transport.wsgi import base
+from zaqar.openstack.common import jsonutils
+from zaqar import tests as testing
+from zaqar.tests.queues.transport.wsgi import base
 
 
 @contextlib.contextmanager
diff --git a/marconi/tests/queues/transport/wsgi/v1/test_queue_lifecycle.py b/zaqar/tests/queues/transport/wsgi/v1/test_queue_lifecycle.py
similarity index 99%
rename from marconi/tests/queues/transport/wsgi/v1/test_queue_lifecycle.py
rename to zaqar/tests/queues/transport/wsgi/v1/test_queue_lifecycle.py
index b9eab80a6..4855aefcf 100644
--- a/marconi/tests/queues/transport/wsgi/v1/test_queue_lifecycle.py
+++ b/zaqar/tests/queues/transport/wsgi/v1/test_queue_lifecycle.py
@@ -16,9 +16,9 @@ import ddt
 import falcon
 import six
 
-from marconi.openstack.common import jsonutils
-from marconi import tests as testing
-from marconi.tests.queues.transport.wsgi import base
+from zaqar.openstack.common import jsonutils
+from zaqar import tests as testing
+from zaqar.tests.queues.transport.wsgi import base
 
 
 @ddt.ddt
diff --git a/marconi/tests/queues/transport/wsgi/v1/test_validation.py b/zaqar/tests/queues/transport/wsgi/v1/test_validation.py
similarity index 98%
rename from marconi/tests/queues/transport/wsgi/v1/test_validation.py
rename to zaqar/tests/queues/transport/wsgi/v1/test_validation.py
index ff4da23de..80f02575b 100644
--- a/marconi/tests/queues/transport/wsgi/v1/test_validation.py
+++ b/zaqar/tests/queues/transport/wsgi/v1/test_validation.py
@@ -18,7 +18,7 @@ import uuid
 
 import falcon
 
-from marconi.tests.queues.transport.wsgi import base
+from zaqar.tests.queues.transport.wsgi import base
 
 
 class TestValidation(base.V1Base):
diff --git a/marconi/tests/queues/transport/wsgi/v1/__init__.py b/zaqar/tests/queues/transport/wsgi/v1_1/__init__.py
similarity index 73%
rename from marconi/tests/queues/transport/wsgi/v1/__init__.py
rename to zaqar/tests/queues/transport/wsgi/v1_1/__init__.py
index d55528308..a17ae81de 100644
--- a/marconi/tests/queues/transport/wsgi/v1/__init__.py
+++ b/zaqar/tests/queues/transport/wsgi/v1_1/__init__.py
@@ -12,15 +12,15 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-from marconi.tests.queues.transport.wsgi.v1 import test_auth
-from marconi.tests.queues.transport.wsgi.v1 import test_claims
-from marconi.tests.queues.transport.wsgi.v1 import test_default_limits
-from marconi.tests.queues.transport.wsgi.v1 import test_home
-from marconi.tests.queues.transport.wsgi.v1 import test_media_type
-from marconi.tests.queues.transport.wsgi.v1 import test_messages
-from marconi.tests.queues.transport.wsgi.v1 import test_pools
-from marconi.tests.queues.transport.wsgi.v1 import test_queue_lifecycle as l
-from marconi.tests.queues.transport.wsgi.v1 import test_validation
+from zaqar.tests.queues.transport.wsgi.v1_1 import test_auth
+from zaqar.tests.queues.transport.wsgi.v1_1 import test_claims
+from zaqar.tests.queues.transport.wsgi.v1_1 import test_default_limits
+from zaqar.tests.queues.transport.wsgi.v1_1 import test_home
+from zaqar.tests.queues.transport.wsgi.v1_1 import test_media_type
+from zaqar.tests.queues.transport.wsgi.v1_1 import test_messages
+from zaqar.tests.queues.transport.wsgi.v1_1 import test_pools
+from zaqar.tests.queues.transport.wsgi.v1_1 import test_queue_lifecycle as l
+from zaqar.tests.queues.transport.wsgi.v1_1 import test_validation
 
 TestAuth = test_auth.TestAuth
 TestClaimsFaultyDriver = test_claims.TestClaimsFaultyDriver
diff --git a/marconi/tests/queues/transport/wsgi/v1_1/test_auth.py b/zaqar/tests/queues/transport/wsgi/v1_1/test_auth.py
similarity index 96%
rename from marconi/tests/queues/transport/wsgi/v1_1/test_auth.py
rename to zaqar/tests/queues/transport/wsgi/v1_1/test_auth.py
index 9dd773337..7c22a4b98 100644
--- a/marconi/tests/queues/transport/wsgi/v1_1/test_auth.py
+++ b/zaqar/tests/queues/transport/wsgi/v1_1/test_auth.py
@@ -20,7 +20,7 @@ import falcon
 from falcon import testing
 from keystoneclient.middleware import auth_token
 
-from marconi.tests.queues.transport.wsgi import base
+from zaqar.tests.queues.transport.wsgi import base
 
 
 class TestAuth(base.V1_1Base):
diff --git a/marconi/tests/queues/transport/wsgi/v1_1/test_claims.py b/zaqar/tests/queues/transport/wsgi/v1_1/test_claims.py
similarity index 98%
rename from marconi/tests/queues/transport/wsgi/v1_1/test_claims.py
rename to zaqar/tests/queues/transport/wsgi/v1_1/test_claims.py
index 68a0e0dee..c4cd16b48 100644
--- a/marconi/tests/queues/transport/wsgi/v1_1/test_claims.py
+++ b/zaqar/tests/queues/transport/wsgi/v1_1/test_claims.py
@@ -22,10 +22,10 @@ import falcon
 import mock
 from testtools import matchers
 
-from marconi.openstack.common import jsonutils
-from marconi.openstack.common import timeutils
-from marconi import tests as testing
-from marconi.tests.queues.transport.wsgi import base
+from zaqar.openstack.common import jsonutils
+from zaqar.openstack.common import timeutils
+from zaqar import tests as testing
+from zaqar.tests.queues.transport.wsgi import base
 
 
 @ddt.ddt
@@ -173,7 +173,7 @@ class ClaimsBaseTest(base.V1_1Base):
         self.assertEqual(len(listed['messages']), len(claimed))
 
         now = timeutils.utcnow() + datetime.timedelta(seconds=10)
-        timeutils_utcnow = 'marconi.openstack.common.timeutils.utcnow'
+        timeutils_utcnow = 'zaqar.openstack.common.timeutils.utcnow'
         with mock.patch(timeutils_utcnow) as mock_utcnow:
             mock_utcnow.return_value = now
             body = self.simulate_get(claim_href, headers=self.headers)
diff --git a/marconi/tests/queues/transport/wsgi/v1_1/test_default_limits.py b/zaqar/tests/queues/transport/wsgi/v1_1/test_default_limits.py
similarity index 97%
rename from marconi/tests/queues/transport/wsgi/v1_1/test_default_limits.py
rename to zaqar/tests/queues/transport/wsgi/v1_1/test_default_limits.py
index 3af2a9646..4096bd172 100644
--- a/marconi/tests/queues/transport/wsgi/v1_1/test_default_limits.py
+++ b/zaqar/tests/queues/transport/wsgi/v1_1/test_default_limits.py
@@ -18,9 +18,9 @@ import uuid
 
 import falcon
 
-from marconi.openstack.common import jsonutils
-from marconi.queues import storage
-from marconi.tests.queues.transport.wsgi import base
+from zaqar.openstack.common import jsonutils
+from zaqar.queues import storage
+from zaqar.tests.queues.transport.wsgi import base
 
 
 class TestDefaultLimits(base.V1_1Base):
diff --git a/marconi/tests/queues/transport/wsgi/v1_1/test_home.py b/zaqar/tests/queues/transport/wsgi/v1_1/test_home.py
similarity index 88%
rename from marconi/tests/queues/transport/wsgi/v1_1/test_home.py
rename to zaqar/tests/queues/transport/wsgi/v1_1/test_home.py
index dcd55f428..4a9de5974 100644
--- a/marconi/tests/queues/transport/wsgi/v1_1/test_home.py
+++ b/zaqar/tests/queues/transport/wsgi/v1_1/test_home.py
@@ -17,8 +17,8 @@ import uuid
 import falcon
 import six.moves.urllib.parse as urlparse
 
-from marconi.openstack.common import jsonutils
-from marconi.tests.queues.transport.wsgi import base
+from zaqar.openstack.common import jsonutils
+from zaqar.tests.queues.transport.wsgi import base
 
 
 class TestHomeDocument(base.V1_1Base):
@@ -50,8 +50,8 @@ class TestHomeDocument(base.V1_1Base):
         self.assertEqual(self.srmock.status, falcon.HTTP_200)
         resp = jsonutils.loads(body[0])
         queue_href_template = resp['resources']['rel/queue']['href-template']
-        path_1 = 'https://marconi.example.com' + self.url_prefix
-        path_2 = 'https://marconi.example.com' + self.url_prefix + '/'
+        path_1 = 'https://zaqar.example.com' + self.url_prefix
+        path_2 = 'https://zaqar.example.com' + self.url_prefix + '/'
 
         # Verify all the href template start with the correct version prefix
         for resource in list(resp['resources']):
@@ -59,7 +59,7 @@ class TestHomeDocument(base.V1_1Base):
                             startswith(self.url_prefix))
 
         url = urlparse.urljoin(path_1, queue_href_template)
-        expected = ('https://marconi.example.com' + self.url_prefix +
+        expected = ('https://zaqar.example.com' + self.url_prefix +
                     '/queues/foo')
         self.assertEqual(url.format(queue_name='foo'), expected)
 
diff --git a/marconi/tests/queues/transport/wsgi/v1_1/test_media_type.py b/zaqar/tests/queues/transport/wsgi/v1_1/test_media_type.py
similarity index 96%
rename from marconi/tests/queues/transport/wsgi/v1_1/test_media_type.py
rename to zaqar/tests/queues/transport/wsgi/v1_1/test_media_type.py
index a8a43c7c8..96f69a7d3 100644
--- a/marconi/tests/queues/transport/wsgi/v1_1/test_media_type.py
+++ b/zaqar/tests/queues/transport/wsgi/v1_1/test_media_type.py
@@ -18,7 +18,7 @@ import uuid
 import falcon
 from falcon import testing
 
-from marconi.tests.queues.transport.wsgi import base
+from zaqar.tests.queues.transport.wsgi import base
 
 
 class TestMediaType(base.V1_1Base):
diff --git a/marconi/tests/queues/transport/wsgi/v1_1/test_messages.py b/zaqar/tests/queues/transport/wsgi/v1_1/test_messages.py
similarity index 98%
rename from marconi/tests/queues/transport/wsgi/v1_1/test_messages.py
rename to zaqar/tests/queues/transport/wsgi/v1_1/test_messages.py
index a8924344b..6f14b85b7 100644
--- a/marconi/tests/queues/transport/wsgi/v1_1/test_messages.py
+++ b/zaqar/tests/queues/transport/wsgi/v1_1/test_messages.py
@@ -22,11 +22,11 @@ import mock
 import six
 from testtools import matchers
 
-from marconi.openstack.common import jsonutils
-from marconi.openstack.common import timeutils
-from marconi.queues.transport import validation
-from marconi import tests as testing
-from marconi.tests.queues.transport.wsgi import base
+from zaqar.openstack.common import jsonutils
+from zaqar.openstack.common import timeutils
+from zaqar.queues.transport import validation
+from zaqar import tests as testing
+from zaqar.tests.queues.transport.wsgi import base
 
 
 @ddt.ddt
@@ -95,7 +95,7 @@ class MessagesBaseTest(base.V1_1Base):
 
         # Test GET on the message resource directly
         # NOTE(cpp-cabrera): force the passing of time to age a message
-        timeutils_utcnow = 'marconi.openstack.common.timeutils.utcnow'
+        timeutils_utcnow = 'zaqar.openstack.common.timeutils.utcnow'
         now = timeutils.utcnow() + datetime.timedelta(seconds=10)
         with mock.patch(timeutils_utcnow) as mock_utcnow:
             mock_utcnow.return_value = now
diff --git a/marconi/tests/queues/transport/wsgi/v1_1/test_pools.py b/zaqar/tests/queues/transport/wsgi/v1_1/test_pools.py
similarity index 98%
rename from marconi/tests/queues/transport/wsgi/v1_1/test_pools.py
rename to zaqar/tests/queues/transport/wsgi/v1_1/test_pools.py
index 83bb81e53..987868c6e 100644
--- a/marconi/tests/queues/transport/wsgi/v1_1/test_pools.py
+++ b/zaqar/tests/queues/transport/wsgi/v1_1/test_pools.py
@@ -18,9 +18,9 @@ import uuid
 import ddt
 import falcon
 
-from marconi.openstack.common import jsonutils
-from marconi import tests as testing
-from marconi.tests.queues.transport.wsgi import base
+from zaqar.openstack.common import jsonutils
+from zaqar import tests as testing
+from zaqar.tests.queues.transport.wsgi import base
 
 
 @contextlib.contextmanager
diff --git a/marconi/tests/queues/transport/wsgi/v1_1/test_queue_lifecycle.py b/zaqar/tests/queues/transport/wsgi/v1_1/test_queue_lifecycle.py
similarity index 99%
rename from marconi/tests/queues/transport/wsgi/v1_1/test_queue_lifecycle.py
rename to zaqar/tests/queues/transport/wsgi/v1_1/test_queue_lifecycle.py
index 8e4f62207..14b62e59c 100644
--- a/marconi/tests/queues/transport/wsgi/v1_1/test_queue_lifecycle.py
+++ b/zaqar/tests/queues/transport/wsgi/v1_1/test_queue_lifecycle.py
@@ -18,9 +18,9 @@ import ddt
 import falcon
 import six
 
-from marconi.openstack.common import jsonutils
-from marconi import tests as testing
-from marconi.tests.queues.transport.wsgi import base
+from zaqar.openstack.common import jsonutils
+from zaqar import tests as testing
+from zaqar.tests.queues.transport.wsgi import base
 
 
 @ddt.ddt
diff --git a/marconi/tests/queues/transport/wsgi/v1_1/test_validation.py b/zaqar/tests/queues/transport/wsgi/v1_1/test_validation.py
similarity index 98%
rename from marconi/tests/queues/transport/wsgi/v1_1/test_validation.py
rename to zaqar/tests/queues/transport/wsgi/v1_1/test_validation.py
index 60604743f..418e9f9ab 100644
--- a/marconi/tests/queues/transport/wsgi/v1_1/test_validation.py
+++ b/zaqar/tests/queues/transport/wsgi/v1_1/test_validation.py
@@ -18,7 +18,7 @@ import uuid
 
 import falcon
 
-from marconi.tests.queues.transport.wsgi import base
+from zaqar.tests.queues.transport.wsgi import base
 
 
 class TestValidation(base.V1_1Base):
diff --git a/marconi/version.py b/zaqar/version.py
similarity index 90%
rename from marconi/version.py
rename to zaqar/version.py
index a3acf9555..fbcdb678c 100644
--- a/marconi/version.py
+++ b/zaqar/version.py
@@ -17,18 +17,18 @@ import pbr.packaging
 import pbr.version
 
 
-version_info = pbr.version.VersionInfo('marconi')
+version_info = pbr.version.VersionInfo('zaqar')
 
 
 def verify_sha(expected):
-    """Verifies the commit hash for an interim Marconi build.
+    """Verifies the commit hash for an interim Zaqar build.
 
-    This function may be used to verify that the version of the marconi
+    This function may be used to verify that the version of the zaqar
     package, as imported from an environment's site-packages, is the
     expected build. This allows continuous integration scripts to
     detect out-of-date installations of the package.
 
-    Note that this function will ALWAYS return False for Marconi packages
+    Note that this function will ALWAYS return False for Zaqar packages
     that were not installed from git.
 
     :param expected: The expected commit object name. May be either a full