diff --git a/go/src/p2b/vdl/p2b.vdl.go b/go/src/p2b/vdl/p2b.vdl.go
index d58f01e..97dfeba 100644
--- a/go/src/p2b/vdl/p2b.vdl.go
+++ b/go/src/p2b/vdl/p2b.vdl.go
@@ -99,7 +99,7 @@
 	// Calling Finish is mandatory for releasing stream resources, unless the call
 	// has been canceled or any of the other methods return an error.  Finish should
 	// be called at most once.
-	Finish() (vdl.AnyRep, error)
+	Finish() (*vdl.Value, error)
 }
 
 type implViewerPipeCall struct {
@@ -123,7 +123,7 @@
 func (c implViewerPipeCallSend) Close() error {
 	return c.c.CloseSend()
 }
-func (c *implViewerPipeCall) Finish() (o0 vdl.AnyRep, err error) {
+func (c *implViewerPipeCall) Finish() (o0 *vdl.Value, err error) {
 	err = c.Call.Finish(&o0)
 	return
 }
@@ -137,7 +137,7 @@
 	// Pipe creates a bidirectional pipe between client and viewer
 	// service, returns total number of bytes received by the service
 	// after streaming ends
-	Pipe(ViewerPipeContext) (vdl.AnyRep, error)
+	Pipe(ViewerPipeContext) (*vdl.Value, error)
 }
 
 // ViewerServerStubMethods is the server interface containing
@@ -148,7 +148,7 @@
 	// Pipe creates a bidirectional pipe between client and viewer
 	// service, returns total number of bytes received by the service
 	// after streaming ends
-	Pipe(*ViewerPipeContextStub) (vdl.AnyRep, error)
+	Pipe(*ViewerPipeContextStub) (*vdl.Value, error)
 }
 
 // ViewerServerStub adds universal methods to ViewerServerStubMethods.
@@ -180,7 +180,7 @@
 	gs   *ipc.GlobState
 }
 
-func (s implViewerServerStub) Pipe(ctx *ViewerPipeContextStub) (vdl.AnyRep, error) {
+func (s implViewerServerStub) Pipe(ctx *ViewerPipeContextStub) (*vdl.Value, error) {
 	return s.impl.Pipe(ctx)
 }
 
@@ -205,7 +205,7 @@
 			Name: "Pipe",
 			Doc:  "// Pipe creates a bidirectional pipe between client and viewer\n// service, returns total number of bytes received by the service\n// after streaming ends",
 			OutArgs: []ipc.ArgDesc{
-				{"", ``}, // vdl.AnyRep
+				{"", ``}, // *vdl.Value
 			},
 		},
 	},
