diff --git a/sumpy/p2p.py b/sumpy/p2p.py
index c18b6c54e0731494ecb3c1c0c0fcf9707087412e..8c37b0e06ea93f5cf07c561b05b188671f6de36d 100644
--- a/sumpy/p2p.py
+++ b/sumpy/p2p.py
@@ -40,8 +40,10 @@ __doc__ = """
 Particle-to-particle
 --------------------
 
-.. autoclass:: P2PBase
+.. autoclass:: P2PComputationBase
+.. autoclass:: SingleSrcTgtListP2PBase
 .. autoclass:: P2P
+.. autoclass:: P2PMatrixGenerator
 .. autoclass:: P2PFromCSR
 
 """
@@ -227,8 +229,8 @@ class P2P(SingleSrcTgtListP2PBase):
 
 # }}}
 
-# {{{ P2P Matrix Writer
 
+# {{{ P2P matrix writer
 
 class P2PMatrixGenerator(SingleSrcTgtListP2PBase):
     default_name = "p2p_matrix"
@@ -246,7 +248,7 @@ class P2PMatrixGenerator(SingleSrcTgtListP2PBase):
         return [
                 """
                 result_{i}[itgt, isrc] = \
-                    knl_{i}_scaling * pair_result_{i} {inames=isrc:itgt}
+                    knl_{i}_scaling * pair_result_{i} {{inames=isrc:itgt}}
                 """.format(i=iknl)
                 for iknl in range(len(self.kernels))
                 ]