diff --git a/sumpy/fmm.py b/sumpy/fmm.py
index f4936a34a7112191512930924674ccdcaedff16a..4c9b8360cb8aee3fe0b9dfd2364f3089abe7c257 100644
--- a/sumpy/fmm.py
+++ b/sumpy/fmm.py
@@ -304,8 +304,8 @@ class SumpyExpansionWrangler(object):
                     source_boxes=source_boxes[start:stop],
                     centers=self.tree.box_centers,
                     strengths=src_weights,
-                    expansions=mpoles_view,
-                    base_ibox=level_start_ibox,
+                    tgt_expansions=mpoles_view,
+                    tgt_base_ibox=level_start_ibox,
 
                     wait_for=src_weights.events,
 
diff --git a/sumpy/p2e.py b/sumpy/p2e.py
index 431547768eee4785fe01a9bd9ca256b7fc2975d1..a3af57b8c9980120f79879cfb0b47e4a8cd3fb19 100644
--- a/sumpy/p2e.py
+++ b/sumpy/p2e.py
@@ -132,7 +132,7 @@ class P2EFromSingleBox(P2EBase):
                         """] + self.get_loopy_instructions() + ["""
                     end
                     """] + ["""
-                    expansions[src_ibox-base_ibox, {coeffidx}] = \
+                    tgt_expansions[src_ibox-tgt_base_ibox, {coeffidx}] = \
                             simul_reduce(sum, isrc, strength*coeff{coeffidx}) \
                             {{id_prefix=write_expn}}
                     """.format(coeffidx=i) for i in range(ncoeffs)] + ["""
@@ -145,9 +145,9 @@ class P2EFromSingleBox(P2EBase):
                     lp.GlobalArg("box_source_starts,box_source_counts_nonchild",
                         None, shape=None),
                     lp.GlobalArg("centers", None, shape="dim, aligned_nboxes"),
-                    lp.GlobalArg("expansions", None,
+                    lp.GlobalArg("tgt_expansions", None,
                         shape=("nboxes", ncoeffs), offset=lp.auto),
-                    lp.ValueArg("nboxes,aligned_nboxes,base_ibox", np.int32),
+                    lp.ValueArg("nboxes,aligned_nboxes,tgt_base_ibox", np.int32),
                     lp.ValueArg("nsources", np.int32),
                     "..."
                 ] + gather_loopy_source_arguments([self.expansion]),
diff --git a/sumpy/version.py b/sumpy/version.py
index de46cccfcf1fe6adcdd7c0bf77be169fcd515089..5561f99d3e1ad67dd718c901fb184e1b8af48440 100644
--- a/sumpy/version.py
+++ b/sumpy/version.py
@@ -25,4 +25,4 @@ VERSION = (2016, 1)
 VERSION_STATUS = "beta1"
 VERSION_TEXT = ".".join(str(x) for x in VERSION) + VERSION_STATUS
 
-KERNEL_VERSION = 10
+KERNEL_VERSION = 11
diff --git a/test/test_kernels.py b/test/test_kernels.py
index a520fa4ec9b1e7a9658b3ff800ea539ffbb70f84..465ce178443dd321c4860bc5ec153aa492e2e9db 100644
--- a/test/test_kernels.py
+++ b/test/test_kernels.py
@@ -199,6 +199,7 @@ def test_p2e2p(ctx_getter, base_knl, expn_class, order, with_source_derivative):
                 sources=sources,
                 strengths=strengths,
                 nboxes=1,
+                tgt_base_ibox=0,
 
                 #flags="print_hl_cl",
                 out_host=True, **extra_source_kwargs)
@@ -214,7 +215,8 @@ def test_p2e2p(ctx_getter, base_knl, expn_class, order, with_source_derivative):
 
         evt, (pot, grad_x, ) = e2p(
                 queue,
-                expansions=mpoles,
+                src_expansions=mpoles,
+                src_base_ibox=0,
                 target_boxes=source_boxes,
                 box_target_starts=box_target_starts,
                 box_target_counts_nonchild=box_target_counts_nonchild,
@@ -381,7 +383,10 @@ def test_translations(ctx_getter, knl, local_expn_class, mpole_expn_class):
 
         evt, (pot,) = e2p(
                 queue,
-                expansions=mpoles,
+
+                src_expansions=mpoles,
+                src_base_ibox=0,
+
                 target_boxes=e2p_target_boxes,
                 box_target_starts=e2p_box_target_starts,
                 box_target_counts_nonchild=e2p_box_target_counts_nonchild,
@@ -435,6 +440,8 @@ def test_translations(ctx_getter, knl, local_expn_class, mpole_expn_class):
                 strengths=strengths,
                 nboxes=nboxes,
 
+                tgt_base_ibox=0,
+
                 #flags="print_hl_wrapper",
                 out_host=True, **extra_kwargs)
 
@@ -457,7 +464,12 @@ def test_translations(ctx_getter, knl, local_expn_class, mpole_expn_class):
 
         evt, (mpoles,) = m2m(queue,
                 src_expansions=mpoles,
+                src_base_ibox=0,
+                tgt_base_ibox=0,
+                ntgt_level_boxes=mpoles.shape[0],
+
                 target_boxes=m2m_target_boxes,
+
                 src_box_starts=m2m_src_box_starts,
                 src_box_lists=m2m_src_box_lists,
                 centers=centers,
@@ -481,6 +493,10 @@ def test_translations(ctx_getter, knl, local_expn_class, mpole_expn_class):
 
         evt, (mpoles,) = m2l(queue,
                 src_expansions=mpoles,
+                src_base_ibox=0,
+                tgt_base_ibox=0,
+                ntgt_level_boxes=mpoles.shape[0],
+
                 target_boxes=m2l_target_boxes,
                 src_box_starts=m2l_src_box_starts,
                 src_box_lists=m2l_src_box_lists,
@@ -505,6 +521,10 @@ def test_translations(ctx_getter, knl, local_expn_class, mpole_expn_class):
 
         evt, (mpoles,) = l2l(queue,
                 src_expansions=mpoles,
+                src_base_ibox=0,
+                tgt_base_ibox=0,
+                ntgt_level_boxes=mpoles.shape[0],
+
                 target_boxes=l2l_target_boxes,
                 src_box_starts=l2l_src_box_starts,
                 src_box_lists=l2l_src_box_lists,