diff --git a/doc/ref_kernel.rst b/doc/ref_kernel.rst
index 11ec7f030bb073b78a4bafd822452d0de646c620..896388d2911a6d3c0e7783d7b1b3833b87c770d0 100644
--- a/doc/ref_kernel.rst
+++ b/doc/ref_kernel.rst
@@ -406,7 +406,9 @@ Arguments
     :members:
     :undoc-members:
 
-.. autofunction:: GlobalArg
+.. autoclass:: ArrayArg
+    :members:
+    :undoc-members:
 
 .. autoclass:: ConstantArg
     :members:
@@ -591,7 +593,7 @@ Do not create :class:`LoopKernel` objects directly. Instead, refer to
 Implementation Detail: The Base Array
 -------------------------------------
 
-All array-like data in :mod:`loopy` (such as :class:`GlobalArg` and
+All array-like data in :mod:`loopy` (such as :class:`ArrayArg` and
 :class:`TemporaryVariable`) derive from single, shared base array type,
 described next.
 
diff --git a/loopy/kernel/data.py b/loopy/kernel/data.py
index d6490aa880b0d465a658a0cdb19d8a2ddb4a742c..7877f8b939444bf3dc095037ffeaa1bb548c39d6 100644
--- a/loopy/kernel/data.py
+++ b/loopy/kernel/data.py
@@ -49,7 +49,7 @@ from warnings import warn
 class auto(object):  # noqa
     """A generic placeholder object for something that should be automatically
     determined.  See, for example, the *shape* or *strides* argument of
-    :func:`GlobalArg`.
+    :class:`ArrayArg`.
     """