diff --git a/etc/marconi.conf-sample b/etc/marconi.conf-sample
index 5a1e85f26..86ca72dac 100644
--- a/etc/marconi.conf-sample
+++ b/etc/marconi.conf-sample
@@ -70,11 +70,11 @@ database = marconi
 
 [limits:transport]
 # The maximum number of queue records per page when listing queues
-;queue_payload_uplimit = 20
+;queue_paging_uplimit = 20
 # The maximum number of messages in a message posting, maximum
 # number of messages per page when listing or claiming messages,
 # and maximum number of messages involved in a bulk operation.
-;message_payload_uplimit = 20
+;message_paging_uplimit = 20
 # Expiration limits; the minimal values are all 60 (seconds)
 ;message_ttl_max = 1209600
 ;claim_ttl_max = 43200
diff --git a/marconi/transport/validation.py b/marconi/transport/validation.py
index 73e034dd3..b71b4ac00 100644
--- a/marconi/transport/validation.py
+++ b/marconi/transport/validation.py
@@ -21,9 +21,9 @@ from marconi.common import config
 from marconi.common import exceptions
 
 OPTIONS = {
-    'queue_payload_uplimit': 20,
+    'queue_paging_uplimit': 20,
     'metadata_size_uplimit': 64 * 1024,
-    'message_payload_uplimit': 20,
+    'message_paging_uplimit': 20,
     'message_size_uplimit': 256 * 1024,
     'message_ttl_max': 1209600,
     'claim_ttl_max': 43200,
@@ -61,10 +61,10 @@ def queue_listing(limit=None, **kwargs):
     :raises: ValidationFailed if the limit is exceeded
     """
 
-    if limit is not None and not (0 < limit <= CFG.queue_payload_uplimit):
+    if limit is not None and not (0 < limit <= CFG.queue_paging_uplimit):
         raise exceptions.ValidationFailed(
-            'queue payload count not in (0, %d]' %
-            CFG.queue_payload_uplimit)
+            'queue paging count not in (0, %d]' %
+            CFG.queue_paging_uplimit)
 
 
 def queue_content(metadata, check_size):
@@ -123,10 +123,10 @@ def message_listing(limit=None, **kwargs):
     :raises: ValidationFailed if the limit is exceeded
     """
 
-    if limit is not None and not (0 < limit <= CFG.message_payload_uplimit):
+    if limit is not None and not (0 < limit <= CFG.message_paging_uplimit):
         raise exceptions.ValidationFailed(
-            'message payload count not in (0, %d]' %
-            CFG.message_payload_uplimit)
+            'message paging count not in (0, %d]' %
+            CFG.message_paging_uplimit)
 
 
 def claim_creation(metadata, **kwargs):