diff --git a/notebook/static/notebook/js/menubar.js b/notebook/static/notebook/js/menubar.js
index 987229b2b..d976866ed 100644
--- a/notebook/static/notebook/js/menubar.js
+++ b/notebook/static/notebook/js/menubar.js
@@ -194,7 +194,7 @@ define([
         });
              
         var id_actions_dict = {
-            '#search_and_replace' : 'ipython.search-and-replace-dialog',
+            '#find_and_replace' : 'ipython.find-and-replace-dialog',
             '#save_checkpoint': 'ipython.save-notebook',
             '#restart_kernel': 'ipython.restart-kernel',
             '#int_kernel': 'ipython.interrupt-kernel',
diff --git a/notebook/static/notebook/js/searchandreplace.js b/notebook/static/notebook/js/searchandreplace.js
index 51c8c9724..d458102df 100644
--- a/notebook/static/notebook/js/searchandreplace.js
+++ b/notebook/static/notebook/js/searchandreplace.js
@@ -150,7 +150,7 @@ define(function(require){
   var snr = function(env, event) {
     var search  = $("<input/>")
       .addClass('form-control')
-      .attr('placeholder','Search');
+      .attr('placeholder','Find');
     var isRegExpButton = $('<button/>')
       .attr('type', 'button')
       .attr('id', 'isreg')
@@ -346,7 +346,7 @@ define(function(require){
 
     var mod = dialog.modal({
       show: false,
-      title: "Search and Replace",
+      title: "Find and Replace",
       body:form,
       keyboard_manager: env.notebook.keyboard_manager,
       buttons:{
@@ -371,16 +371,16 @@ define(function(require){
 
   var load = function(keyboard_manager){
     var action_all = {
-        help: 'search and replace',
+        help: 'find and replace',
         handler: function(env, event){
           snr(env, event);
         }
     };
 
-    var act_all = keyboard_manager.actions.register(action_all, 'search-and-replace-dialog', 'ipython');
+    var act_all = keyboard_manager.actions.register(action_all, 'find-and-replace-dialog', 'ipython');
 
     keyboard_manager.command_shortcuts.add_shortcuts({
-        'f': 'ipython.search-and-replace-dialog'
+        'f': 'ipython.find-and-replace-dialog'
     });
   };
 
diff --git a/notebook/templates/notebook.html b/notebook/templates/notebook.html
index 94ba43411..568cab27e 100644
--- a/notebook/templates/notebook.html
+++ b/notebook/templates/notebook.html
@@ -143,7 +143,7 @@ data-notebook-path="{{notebook_path}}"
                         <li class="divider"></li>
                         <li id="edit_nb_metadata"><a href="#">Edit Notebook Metadata</a></li>
                         <li class="divider"></li>
-                        <li id="search_and_replace"><a href="#"> Search and Replace </a></li>
+                        <li id="find_and_replace"><a href="#"> Find and Replace </a></li>
                     </ul>
                 </li>
                 <li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">View</a>