diff --git a/oslo_messaging/_drivers/amqp.py b/oslo_messaging/_drivers/amqp.py
index d6ad58cfc..071a00475 100644
--- a/oslo_messaging/_drivers/amqp.py
+++ b/oslo_messaging/_drivers/amqp.py
@@ -16,11 +16,10 @@
 #    under the License.
 
 """
-Shared code between AMQP based openstack.common.rpc implementations.
+Utilities for drivers based on the AMQPDriverBase.
 
-The code in this module is shared between the rpc implementations based on
-AMQP. Specifically, this includes impl_kombu.  impl_carrot also
-uses AMQP, but is deprecated and predates this code.
+This module contains utility code used by drivers based on the AMQPDriverBase
+class. Specifically this includes the impl_rabbit driver.
 """
 
 import collections
diff --git a/oslo_messaging/tests/notify/test_logger.py b/oslo_messaging/tests/notify/test_logger.py
index bf7e2d961..ede3fdc5b 100644
--- a/oslo_messaging/tests/notify/test_logger.py
+++ b/oslo_messaging/tests/notify/test_logger.py
@@ -29,7 +29,7 @@ from six.moves import mock
 
 load_tests = testscenarios.load_tests_apply_scenarios
 
-# Stolen from openstack.common.logging
+# Stolen from oslo.log
 logging.AUDIT = logging.INFO + 1
 logging.addLevelName(logging.AUDIT, 'AUDIT')