diff --git a/controller/Html_cleaner.py b/controller/Html_cleaner.py
index ac0fee6..d2eed21 100644
--- a/controller/Html_cleaner.py
+++ b/controller/Html_cleaner.py
@@ -133,7 +133,7 @@ class Html_cleaner(HTMLParser):
     return parsed[0] in self.allowed_schemes
 
   def strip(self, rawstring):
-    """Returns the argument stripped of potentially harmful HTML or Javascript code"""
+    """Returns the argument stripped of potentially harmful HTML or JavaScript code"""
     self.reset()
     self.result = []
     self.feed(rawstring)
diff --git a/controller/Notebooks.py b/controller/Notebooks.py
index 705a6ef..26c61e8 100644
--- a/controller/Notebooks.py
+++ b/controller/Notebooks.py
@@ -729,7 +729,7 @@ class Notebooks( object ):
   )
   def download_html( self, notebook_id, user_id ):
     """
-    Download the entire contents of the given notebook as a stand-alone HTML page (no Javascript).
+    Download the entire contents of the given notebook as a stand-alone HTML page (no JavaScript).
 
     @type notebook_id: unicode
     @param notebook_id: id of notebook to download
diff --git a/static/html/no javascript.html b/static/html/no javascript.html
index 20e29f4..bb92bc4 100644
--- a/static/html/no javascript.html	
+++ b/static/html/no javascript.html	
@@ -1,4 +1,4 @@
-<h3>Luminotes requires Javascript</h3>
+<h3>Luminotes requires JavaScript</h3>
 
-So if you'd like to check out this site any further, please enable Javascript
+So if you'd like to check out this site any further, please enable JavaScript
 in your web browser, and then reload this page. Sorry for the inconvenience.
diff --git a/view/Error_page.py b/view/Error_page.py
index ac0b3e0..e841934 100644
--- a/view/Error_page.py
+++ b/view/Error_page.py
@@ -28,7 +28,7 @@ class Error_page( Page ):
         P(
           Strong( u"P.S." ),
           u"""
-          If Javascript isn't enabled in your browser, please enable it.
+          If JavaScript isn't enabled in your browser, please enable it.
           """,
         ),
         class_ = u"error_box",