diff --git a/browser/views/neighborhood/component.html b/browser/views/neighborhood/component.html
index 6b1c154..2bb5557 100644
--- a/browser/views/neighborhood/component.html
+++ b/browser/views/neighborhood/component.html
@@ -5,7 +5,7 @@
   <template>
     <link rel="stylesheet" href="../common/common.css">
     <h2 page-title>Neighborhood</h2>
-    <p>List of PipeToBrowser instances currently published</p>
+    <p>List of Pipe2Browser instances currently published</p>
     <p2b-namespace-list names="{{existingNames}}"></p2b-namespace-list>
   </template>
   <script>
diff --git a/browser/views/neighborhood/view.js b/browser/views/neighborhood/view.js
index befc2a1..b88b689 100644
--- a/browser/views/neighborhood/view.js
+++ b/browser/views/neighborhood/view.js
@@ -5,7 +5,7 @@
 import { View } from 'libs/mvc/view'
 
 /*
- * View displaying a list of currently published PipeToBrowsers instances
+ * View displaying a list of currently published Pipe2Browsers instances
  * @class
  * @extends {View}
  */
diff --git a/go/src/v.io/x/p2b/main.go b/go/src/v.io/x/p2b/main.go
index f2fbc07..2f5edda 100644
--- a/go/src/v.io/x/p2b/main.go
+++ b/go/src/v.io/x/p2b/main.go
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// Command p2b is a client for the pipetobrowser service. It pipes its
-// standard input to a pipetobrowser service.
+// Command p2b is a client for the Pipe2Browser service. It pipes its
+// standard input to a Pipe2Browser service.
 package main
 
 import (