diff --git a/notebook/templates/edit.html b/notebook/templates/edit.html
index d471f8c6d..14892b7c5 100644
--- a/notebook/templates/edit.html
+++ b/notebook/templates/edit.html
@@ -65,7 +65,7 @@ data-file-path="{{file_path}}"
             </li>
             <li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">View</a>
               <ul id="view-menu" class="dropdown-menu">
-              <li id="toggle_header" title="Show/Hide the IPython Notebook logo and notebook title (above menu bar)">
+              <li id="toggle_header" title="Show/Hide the logo and notebook title (above menu bar)">
               <a href="#">Toggle Header</a></li>
               <li id="menu-line-numbers"><a href="#">Toggle Line Numbers</a></li>
               </ul>
diff --git a/notebook/templates/notebook.html b/notebook/templates/notebook.html
index c14d38ab1..56f5c5599 100644
--- a/notebook/templates/notebook.html
+++ b/notebook/templates/notebook.html
@@ -105,7 +105,7 @@ data-notebook-path="{{notebook_path | urlencode}}"
                         <li id="print_preview"><a href="#">Print Preview</a></li>
                         <li class="dropdown-submenu"><a href="#">Download as</a>
                             <ul class="dropdown-menu">
-                                <li id="download_ipynb"><a href="#">IPython Notebook (.ipynb)</a></li>
+                                <li id="download_ipynb"><a href="#">Notebook (.ipynb)</a></li>
                                 <li id="download_script"><a href="#">Script</a></li>
                                 <li id="download_html"><a href="#">HTML (.html)</a></li>
                                 <li id="download_markdown"><a href="#">Markdown (.md)</a></li>
@@ -154,7 +154,7 @@ data-notebook-path="{{notebook_path | urlencode}}"
                 <li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">View</a>
                     <ul id="view_menu" class="dropdown-menu">
                         <li id="toggle_header"
-                            title="Show/Hide the IPython Notebook logo and notebook title (above menu bar)">
+                            title="Show/Hide the logo and notebook title (above menu bar)">
                             <a href="#">Toggle Header</a></li>
                         <li id="toggle_toolbar"
                             title="Show/Hide the action icons (below menu bar)">
@@ -299,7 +299,7 @@ data-notebook-path="{{notebook_path | urlencode}}"
                             {% endif %}
                         {% endfor %}
                         <li class="divider"></li>
-                        <li title="About IPython Notebook"><a id="notebook_about" href="#">About</a></li>
+                        <li title="About Jupyter Notebook"><a id="notebook_about" href="#">About</a></li>
                         {% endblock %}
                     </ul>
                 </li>
diff --git a/notebook/templates/page.html b/notebook/templates/page.html
index 188287e4e..1f367fef9 100644
--- a/notebook/templates/page.html
+++ b/notebook/templates/page.html
@@ -4,7 +4,7 @@
 <head>
     <meta charset="utf-8">
 
-    <title>{% block title %}IPython Notebook{% endblock %}</title>
+    <title>{% block title %}Jupyter Notebook{% endblock %}</title>
     {% block favicon %}<link rel="shortcut icon" type="image/x-icon" href="{{static_url("base/images/favicon.ico") }}">{% endblock %}
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <link rel="stylesheet" href="{{static_url("components/jquery-ui/themes/smoothness/jquery-ui.min.css") }}" type="text/css" />
@@ -174,7 +174,7 @@
 
 <noscript>
     <div id='noscript'>
-      IPython Notebook requires JavaScript.<br>
+      Jupyter Notebook requires JavaScript.<br>
       Please enable it to proceed.
   </div>
 </noscript>
