diff --git a/cmd/cart/amqp-order-handler.go b/cmd/cart/amqp-order-handler.go
index 972cbb9..0552c3e 100644
--- a/cmd/cart/amqp-order-handler.go
+++ b/cmd/cart/amqp-order-handler.go
@@ -27,7 +27,7 @@ func (h *AmqpOrderHandler) DefineTopics() error {
 	defer ch.Close()
 
 	queue, err := ch.QueueDeclare(
-		"orders", // name
+		"order-queue", // name
 		false,
 		false,
 		false,
@@ -51,10 +51,10 @@ func (h *AmqpOrderHandler) OrderCompleted(body []byte) error {
 	defer cancel()
 
 	return ch.PublishWithContext(ctx,
-		"",       // exchange
-		"orders", // routing key
-		false,    // mandatory
-		false,    // immediate
+		"",           // exchange
+		h.queue.Name, // routing key
+		false,        // mandatory
+		false,        // immediate
 		amqp.Publishing{
 			DeliveryMode: amqp.Persistent,
 			ContentType:  "application/json",