diff --git a/authority/static/dialog/index.html b/authority/static/dialog/index.html
index 4cf619d1596e73148d5e93f37350fad8ac5e8d8a..c39b37c66599c807e1aeec32f9cf405f7c05891e 100644
--- a/authority/static/dialog/index.html
+++ b/authority/static/dialog/index.html
@@ -1,13 +1,13 @@
 <html>
 <head>
-  <title> FirefoxID </title>
+  <title> BrowserID </title>
   <link href="../dialog/style.css" type="text/css" media="screen" rel="stylesheet"></link>
 </head>
 <body id="body">
 <div id="authenticate_dialog" class="dialog">
-  <div class="title"> Sign in with Firefox ID </div>
+  <div class="title"> Sign in with BrowserID </div>
   <div class="content">
-    <div class="summary">Enter your email and Firefox ID password to log into <span class="sitename bad"></span>:</div>
+    <div class="summary">Enter your email and BrowserID password to log into <span class="sitename bad"></span>:</div>
     <div class="input">
       <div class="label"> Email </div>
       <div class="input"> <input type="text"></input></div>
@@ -21,14 +21,14 @@
       No such account exists with that email and/or password
     </div>
     <div class="actions">
-      <div class="action"><a href="#">Don't have a Firefox ID yet?</a></div>
+      <div class="action"><a href="#">Don't have a BrowserID yet?</a></div>
     </div>
   </div>
 </div>
 <div id="create_dialog" class="dialog">
-  <div class="title"> Create Your Firefox ID </div>
+  <div class="title"> Create Your BrowserID </div>
   <div class="content">
-    <div class="summary">Firefox ID makes logging in safer and easier.  To begin, please provide an email address and pick a password:</div>
+    <div class="summary">BrowserID makes logging in safer and easier.  To begin, please provide an email address and pick a password:</div>
     <div class="input">
       <div class="label"> Email </div>
       <div class="input"> <input type="text"></input></div>
@@ -51,7 +51,7 @@
 <div id="confirm_email_dialog" class="dialog">
   <div class="title"> Confirm Your Email </div>
   <div class="content">
-    <div class="summary">Welcome, <span class="email good"></span>.  You will receive a <strong>confirmation email</strong> in a few moments.  To activate your Firefox ID, please <strong>visit the link</strong> included in the email.</div>
+    <div class="summary">Welcome, <span class="email good"></span>.  You will receive a <strong>confirmation email</strong> in a few moments.  To activate your BrowserID, please <strong>visit the link</strong> included in the email.</div>
     <div class="attention">
       Waiting for email confirmation... <span class="bad"> THIS ISN'T REAL!  JUST WAIT 5 SECONDS!</span>
     </div>
@@ -81,7 +81,7 @@
   </div>
 </div>
 <div id="sign_in_dialog" class="dialog">
-  <div class="title"> Sign in with Firefox ID </div>
+  <div class="title"> Sign in with BrowserID </div>
   <div class="content">
     <p>How would you like to idenitfy yourself to <span class="sitename"></span>:</p>
     <form id="identities" name="identities">
@@ -93,12 +93,12 @@
   </div>
 </div>
 <div id="error_dialog" class="dialog">
-  <div class="title"> Sign in with Firefox ID </div>
+  <div class="title"> Sign in with BrowserID </div>
   <div class="content">
   </div>
 </div>
 <div id="waiting_dialog" class="dialog">
-  <div class="title"> Sign in with Firefox ID </div>
+  <div class="title"> Sign in with BrowserID </div>
   <div class="content">
   </div>
 </div>
diff --git a/authority/static/dialog/main.js b/authority/static/dialog/main.js
index 7ab635dae615bab4b0269fe188a406e0d12c9999..0357e73de89e07e046b5d08838c826f6406048dc 100644
--- a/authority/static/dialog/main.js
+++ b/authority/static/dialog/main.js
@@ -552,7 +552,7 @@
       var msgs = {
         "canceled": "user canceled selection",
         "notImplemented": "the user tried to invoke behavior that's not yet implemented",
-        "serverError": "a technical problem was encountered while trying to communicate with FirefoxID servers."
+        "serverError": "a technical problem was encountered while trying to communicate with BrowserID servers."
       };
       var msg = msgs[code];
       if (!msg) {