diff --git a/doc/ref_transform.rst b/doc/ref_transform.rst
index fcd470dc2da4c836753c2b04b5fc5a1aa224b3db..f16f8bfdbb26b716af27762d8502bff592496d7c 100644
--- a/doc/ref_transform.rst
+++ b/doc/ref_transform.rst
@@ -44,16 +44,16 @@ Influencing data access
 
 .. autofunction:: change_arg_to_image
 
-.. autofunction:: tag_data_axes
+.. autofunction:: tag_array_axes
 
 .. autofunction:: remove_unused_arguments
 
-.. autofunction:: set_array_dim_names
+.. autofunction:: set_array_axis_names
 
 Padding Data
 ------------
 
-.. autofunction:: split_array_dim
+.. autofunction:: split_array_axis
 
 .. autofunction:: find_padding_multiple
 
diff --git a/loopy/__init__.py b/loopy/__init__.py
index 4322bf928d524bfa4b52ca9698fcfaefac93d804..66940842f342760f80de3759e567bbc1a932f3bb 100644
--- a/loopy/__init__.py
+++ b/loopy/__init__.py
@@ -75,8 +75,10 @@ from loopy.transform.instruction import (
         tag_instructions)
 
 from loopy.transform.data import (
-        add_prefetch, change_arg_to_image, tag_data_axes,
-        set_array_dim_names, remove_unused_arguments,
+        add_prefetch, change_arg_to_image,
+        tag_array_axes, tag_data_axes,
+        set_array_axis_names, set_array_dim_names,
+        remove_unused_arguments,
         alias_temporaries, set_argument_order,
         rename_argument,
         set_temporary_scope)
@@ -94,7 +96,8 @@ from loopy.transform.arithmetic import (
         collect_common_factors_on_increment)
 
 from loopy.transform.padding import (
-        split_array_dim, split_arg_axis, find_padding_multiple,
+        split_array_axis, split_array_dim, split_arg_axis,
+        find_padding_multiple,
         add_padding)
 
 from loopy.transform.ilp import realize_ilp
@@ -164,8 +167,10 @@ __all__ = [
         "affine_map_inames", "find_unused_axis_tag",
         "make_reduction_inames_unique",
 
-        "add_prefetch", "change_arg_to_image", "tag_data_axes",
-        "set_array_dim_names", "remove_unused_arguments",
+        "add_prefetch", "change_arg_to_image",
+        "tag_array_axes", "tag_data_axes",
+        "set_array_axis_names", "set_array_dim_names",
+        "remove_unused_arguments",
         "alias_temporaries", "set_argument_order",
         "rename_argument", "set_temporary_scope",
 
@@ -183,8 +188,8 @@ __all__ = [
 
         "fold_constants", "collect_common_factors_on_increment",
 
-        "split_array_dim", "split_arg_axis", "find_padding_multiple",
-        "add_padding",
+        "split_array_axis", "split_array_dim", "split_arg_axis",
+        "find_padding_multiple", "add_padding",
 
         "realize_ilp",
 
@@ -387,8 +392,8 @@ def make_copy_kernel(new_dim_tags, old_dim_tags=None):
             "output[%s] = input[%s]"
             % (commad_indices, commad_indices))
 
-    result = tag_data_axes(result, "input", old_dim_tags)
-    result = tag_data_axes(result, "output", new_dim_tags)
+    result = tag_array_axes(result, "input", old_dim_tags)
+    result = tag_array_axes(result, "output", new_dim_tags)
 
     unrolled_tags = (SeparateArrayArrayDimTag, VectorArrayDimTag)
     for i in range(rank):
diff --git a/loopy/transform/data.py b/loopy/transform/data.py
index 89ad1cdb52d69cf1bee981bc93679fb76883dc54..5b64ec6f78a24a5776a96320c4cd50e590c17b16 100644
--- a/loopy/transform/data.py
+++ b/loopy/transform/data.py
@@ -29,6 +29,8 @@ from islpy import dim_type
 
 from loopy.kernel.data import ImageArg
 
+from pytools import MovedFunctionDeprecationWrapper
+
 
 # {{{ convenience: add_prefetch
 
@@ -300,11 +302,11 @@ def change_arg_to_image(knl, name):
 
 # {{{ tag data axes
 
-def tag_data_axes(knl, ary_names, dim_tags):
+def tag_array_axes(knl, ary_names, dim_tags):
     from loopy.kernel.tools import ArrayChanger
 
     if isinstance(ary_names, str):
-        ary_names = ary_names.split(",")
+        ary_names = [ary_name.strip() for ary_name in ary_names.split(",")]
 
     for ary_name in ary_names:
         achng = ArrayChanger(knl, ary_name)
@@ -322,12 +324,15 @@ def tag_data_axes(knl, ary_names, dim_tags):
 
     return knl
 
+
+tag_data_axes = MovedFunctionDeprecationWrapper(tag_array_axes)
+
 # }}}
 
 
-# {{{ set_array_dim_names
+# {{{ set_array_axis_names
 
-def set_array_dim_names(kernel, ary_names, dim_names):
+def set_array_axis_names(kernel, ary_names, dim_names):
     from loopy.kernel.tools import ArrayChanger
     if isinstance(ary_names, str):
         ary_names = ary_names.split(",")
@@ -345,6 +350,8 @@ def set_array_dim_names(kernel, ary_names, dim_names):
 
     return kernel
 
+set_array_dim_names = MovedFunctionDeprecationWrapper(set_array_axis_names)
+
 # }}}