diff --git a/doc/source/devref/index.rst b/doc/source/devref/index.rst
index b4ae7562f52a..7c942ae4aaad 100644
--- a/doc/source/devref/index.rst
+++ b/doc/source/devref/index.rst
@@ -41,7 +41,7 @@ Background Concepts for Nova
    il8n
    distributed_scheduler
    multinic
-   rabbit
+   rpc
 
 Other Resources
 ---------------
diff --git a/doc/source/devref/rabbit.rst b/doc/source/devref/rpc.rst
similarity index 98%
rename from doc/source/devref/rabbit.rst
rename to doc/source/devref/rpc.rst
index a12e3e31ca27..8ed901a6b121 100644
--- a/doc/source/devref/rabbit.rst
+++ b/doc/source/devref/rpc.rst
@@ -25,7 +25,7 @@ AMQP is the messaging technology chosen by the OpenStack cloud.  The AMQP broker
 
 Nova uses direct, fanout, and topic-based exchanges. The architecture looks like the one depicted in the figure below:
 
-.. image:: /images/rabbit/arch.png
+.. image:: /images/rpc/arch.png
    :width: 60%
 
 ..
@@ -47,7 +47,7 @@ Figure 2 shows the following internal elements:
     * Direct Exchange: this is a routing table that is created during rpc.call operations; there are many instances of this kind of exchange throughout the life-cycle of a message broker node, one for each rpc.call invoked.
     * Queue Element: A Queue is a message bucket. Messages are kept in the queue until a Consumer (either Topic or Direct Consumer) connects to the queue and fetch it. Queues can be shared or can be exclusive. Queues whose routing key is 'topic' are shared amongst Workers of the same personality.
 
-.. image:: /images/rabbit/rabt.png
+.. image:: /images/rpc/rabt.png
    :width: 60%
 
 ..
@@ -62,7 +62,7 @@ The diagram below shows the message flow during an rp.call operation:
     3. once the task is completed, a Direct Publisher is allocated to send the response message to the queuing system.
     4. once the message is dispatched by the exchange, it is fetched by the Direct Consumer dictated by the routing key (such as 'msg_id') and passed to the Invoker.
 
-.. image:: /images/rabbit/flow1.png
+.. image:: /images/rpc/flow1.png
    :width: 60%
 
 ..
@@ -75,7 +75,7 @@ The diagram below the message flow during an rp.cast operation:
     1. A Topic Publisher is instantiated to send the message request to the queuing system.
     2. Once the message is dispatched by the exchange, it is fetched by the Topic Consumer dictated by the routing key (such as 'topic') and passed to the Worker in charge of the task.
 
-.. image:: /images/rabbit/flow2.png
+.. image:: /images/rpc/flow2.png
    :width: 60%
 
 ..
@@ -102,7 +102,7 @@ The figure below shows the status of a RabbitMQ node after Nova components' boot
        7. scheduler.phantom (phantom is hostname)
        8. scheduler
 
-.. image:: /images/rabbit/state.png
+.. image:: /images/rpc/state.png
    :width: 60%
 
 ..
diff --git a/doc/source/images/rabbit/arch.png b/doc/source/images/rpc/arch.png
similarity index 100%
rename from doc/source/images/rabbit/arch.png
rename to doc/source/images/rpc/arch.png
diff --git a/doc/source/images/rabbit/arch.svg b/doc/source/images/rpc/arch.svg
similarity index 100%
rename from doc/source/images/rabbit/arch.svg
rename to doc/source/images/rpc/arch.svg
diff --git a/doc/source/images/rabbit/flow1.png b/doc/source/images/rpc/flow1.png
similarity index 100%
rename from doc/source/images/rabbit/flow1.png
rename to doc/source/images/rpc/flow1.png
diff --git a/doc/source/images/rabbit/flow1.svg b/doc/source/images/rpc/flow1.svg
similarity index 100%
rename from doc/source/images/rabbit/flow1.svg
rename to doc/source/images/rpc/flow1.svg
diff --git a/doc/source/images/rabbit/flow2.png b/doc/source/images/rpc/flow2.png
similarity index 100%
rename from doc/source/images/rabbit/flow2.png
rename to doc/source/images/rpc/flow2.png
diff --git a/doc/source/images/rabbit/flow2.svg b/doc/source/images/rpc/flow2.svg
similarity index 100%
rename from doc/source/images/rabbit/flow2.svg
rename to doc/source/images/rpc/flow2.svg
diff --git a/doc/source/images/rabbit/rabt.png b/doc/source/images/rpc/rabt.png
similarity index 100%
rename from doc/source/images/rabbit/rabt.png
rename to doc/source/images/rpc/rabt.png
diff --git a/doc/source/images/rabbit/rabt.svg b/doc/source/images/rpc/rabt.svg
similarity index 100%
rename from doc/source/images/rabbit/rabt.svg
rename to doc/source/images/rpc/rabt.svg
diff --git a/doc/source/images/rabbit/state.png b/doc/source/images/rpc/state.png
similarity index 100%
rename from doc/source/images/rabbit/state.png
rename to doc/source/images/rpc/state.png