diff --git a/sumpy/p2p.py b/sumpy/p2p.py
index 6899e79512db378cd844d46f55180728a0ef995a..359e1ac0d676c39e43fbdfe24e22983fafac31c8 100644
--- a/sumpy/p2p.py
+++ b/sumpy/p2p.py
@@ -1,6 +1,9 @@
 from __future__ import division, absolute_import
 
-__copyright__ = "Copyright (C) 2012 Andreas Kloeckner"
+__copyright__ = """
+Copyright (C) 2012 Andreas Kloeckner
+Copyright (C) 2018 Alexandru Fikl
+"""
 
 __license__ = """
 Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -206,7 +209,7 @@ class P2P(P2PBase):
     def get_result_store_instructions(self):
         return ["""
                 result[{i}, itgt] = knl_{i}_scaling \
-                    * simul_reduce(sum, isrc, pair_result_{i})
+                    * simul_reduce(sum, isrc, pair_result_{i}) {inames=itgt}
                 """.format(i=iknl)
                 for iknl in range(len(self.kernels))]
 
@@ -242,7 +245,7 @@ class P2PMatrixGenerator(P2PBase):
         return [
                 """
                 result_{i}[itgt, isrc] = \
-                    knl_{i}_scaling * pair_result_{i}
+                    knl_{i}_scaling * pair_result_{i} {inames=isrc:itgt}
                 """.format(i=iknl)
                 for iknl in range(len(self.kernels))
                 ]
diff --git a/test/test_matrixgen.py b/test/test_matrixgen.py
index 592cc0cda7cf8f9a97fd8fa35945e99bb7a753f5..244a555b30e8be3a10c0bf635f936d89f3ebdce7 100644
--- a/test/test_matrixgen.py
+++ b/test/test_matrixgen.py
@@ -1,6 +1,6 @@
 from __future__ import division, absolute_import, print_function
 
-__copyright__ = "Copyright (C) 2017 Matt Wala"
+__copyright__ = "Copyright (C) 2018 Alexandru Fikl"
 
 __license__ = """
 Permission is hereby granted, free of charge, to any person obtaining a copy