diff --git a/doc/reference.rst b/doc/reference.rst
index 75592a63c4fec2f9bfb93b2eae8bb8e9f67af8e9..9d75a924b71847d04632b4945f9228c80c2e01f4 100644
--- a/doc/reference.rst
+++ b/doc/reference.rst
@@ -402,7 +402,7 @@ Caching, Precomputation and Prefetching
 
 .. autofunction:: add_prefetch
 
-.. autofunction:: buffer_write
+.. autofunction:: buffer_array
 
 Influencing data access
 ^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/loopy/__init__.py b/loopy/__init__.py
index d9f67a43724a2b28d7192d3b79a04750920509ba..4a5b540409e4e051eb24d93a8a4dd4288b281ef2 100644
--- a/loopy/__init__.py
+++ b/loopy/__init__.py
@@ -55,7 +55,7 @@ from loopy.kernel.creation import make_kernel, UniqueName
 from loopy.library.reduction import register_reduction_parser
 from loopy.subst import extract_subst, expand_subst, temporary_to_subst
 from loopy.precompute import precompute
-from loopy.buffer_writes import buffer_write
+from loopy.buffer import buffer_array
 from loopy.padding import (split_arg_axis, find_padding_multiple,
         add_padding)
 from loopy.preprocess import (preprocess_kernel, realize_reduction,
@@ -83,7 +83,7 @@ __all__ = [
         "register_reduction_parser",
 
         "extract_subst", "expand_subst", "temporary_to_subst",
-        "precompute", "buffer_write",
+        "precompute", "buffer_array",
         "split_arg_axis", "find_padding_multiple", "add_padding",
 
         "get_dot_dependency_graph",
diff --git a/loopy/array_buffer.py b/loopy/array_buffer_map.py
similarity index 100%
rename from loopy/array_buffer.py
rename to loopy/array_buffer_map.py
diff --git a/loopy/buffer_writes.py b/loopy/buffer.py
similarity index 98%
rename from loopy/buffer_writes.py
rename to loopy/buffer.py
index 7616dcba59d57997786538d9a67525bdfe07cac1..e8e15dbdf1a95a0d21007d4245521dd5a04b0a24 100644
--- a/loopy/buffer_writes.py
+++ b/loopy/buffer.py
@@ -1,6 +1,5 @@
 from __future__ import division, absolute_import
-import six
-from six.moves import range, zip
+from six.moves import range
 
 __copyright__ = "Copyright (C) 2012-2015 Andreas Kloeckner"
 
@@ -24,7 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 """
 
-from loopy.array_buffer import (ArrayToBufferMap, NoOpArrayToBufferMap,
+from loopy.array_buffer_map import (ArrayToBufferMap, NoOpArrayToBufferMap,
         AccessDescriptor)
 from loopy.symbolic import (get_dependencies, ExpandingIdentityMapper,
         SubstitutionMapper)
@@ -111,7 +110,7 @@ class ArrayAccessReplacer(ExpandingIdentityMapper):
 # }}}
 
 
-def buffer_write(kernel, var_name, buffer_inames, init_expression=None,
+def buffer_array(kernel, var_name, buffer_inames, init_expression=None,
         store_expression=None, within=None, default_tag="l.auto",
         temporary_is_local=None, fetch_bounding_box=False):
     """
@@ -186,7 +185,7 @@ def buffer_write(kernel, var_name, buffer_inames, init_expression=None,
                             expands_footprint=True,
                             storage_axis_exprs=index))
 
-    # {{{ use given / find new storage_axes
+    # {{{ find fetch/store inames
 
     init_inames = []
     store_inames = []
@@ -204,7 +203,7 @@ def buffer_write(kernel, var_name, buffer_inames, init_expression=None,
 
     # }}}
 
-    # {{{ modify loop domains
+    # {{{ modify loop domain
 
     non1_init_inames = []
     non1_store_inames = []
diff --git a/loopy/precompute.py b/loopy/precompute.py
index 3044b8f7dcc50907b01c9710b0e7880aac93ba4c..15b46ecd648ab9289c4d2a467dd5b5cbaa6a4be4 100644
--- a/loopy/precompute.py
+++ b/loopy/precompute.py
@@ -32,7 +32,7 @@ import numpy as np
 
 from pymbolic import var
 
-from loopy.array_buffer import (ArrayToBufferMap, NoOpArrayToBufferMap,
+from loopy.array_buffer_map import (ArrayToBufferMap, NoOpArrayToBufferMap,
         AccessDescriptor)
 
 
diff --git a/test/test_fortran.py b/test/test_fortran.py
index eeac0b23abe75dffc27375bfc4b66b9708c7e63c..04be96b04c67ba3d4791bc94ba7ce4f38ad9be50 100644
--- a/test/test_fortran.py
+++ b/test/test_fortran.py
@@ -316,7 +316,7 @@ def test_matmul(ctx_factory, buffer_inames):
     knl = lp.precompute(knl, "a_acc", "k_inner,i_inner")
     knl = lp.precompute(knl, "b_acc", "j_inner,k_inner")
 
-    knl = lp.buffer_write(knl, "c", buffer_inames=buffer_inames,
+    knl = lp.buffer_array(knl, "c", buffer_inames=buffer_inames,
             init_expression="0", store_expression="base+buffer")
 
     #ctx = ctx_factory()