diff --git a/app/index.html b/app/index.html
index b5c66400..fb2a1c56 100644
--- a/app/index.html
+++ b/app/index.html
@@ -45,7 +45,7 @@
   <script type="text/javascript" src="../src/backend/localcsv.js"></script>
   <script type="text/javascript" src="../src/view.js"></script>
   <script type="text/javascript" src="../src/view-grid.js"></script>
-  <script type="text/javascript" src="../src/view-flot-graph.js"></script>
+  <script type="text/javascript" src="../src/view-graph.js"></script>
   <script type="text/javascript" src="../src/view-map.js"></script>
   <script type="text/javascript" src="../src/view-transform-dialog.js"></script>
 
diff --git a/app/js/app.js b/app/js/app.js
index a7f63c72..bdf612f9 100755
--- a/app/js/app.js
+++ b/app/js/app.js
@@ -58,7 +58,7 @@ function standardViews(dataset) {
     {
       id: 'graph',
       label: 'Graph',
-      view: new recline.View.FlotGraph({
+      view: new recline.View.Graph({
         model: dataset
       })
     },
diff --git a/index.html b/index.html
index 1db10c36..7eb729cb 100644
--- a/index.html
+++ b/index.html
@@ -252,7 +252,7 @@ also easily write your own). Each view holds a pointer to a Dataset:</p>
   <li>DataExplorer: the parent view which manages the overall app and sets up
   sub views.</li>
   <li>DataGrid: the data grid view.</li>
-  <li>FlotGraph: a simple graphing view using <a
+  <li>Graph: a simple graphing view using <a
     href="http://code.google.com/p/flot/">Flot</a>.</li>
   <li>Map: a map view using <a href="http://leaflet.cloudmade.com/">Leaflet</a>.</li>
 </ul>
@@ -271,7 +271,7 @@ are useful:</p>
   <li><a href="docs/model.html">Models</a></li>
   <li><a href="docs/view.html">DataExplorer View (plus common view code)</a></li>
   <li><a href="docs/view-grid.html">DataGrid View</a></li>
-  <li><a href="docs/view-flot-graph.html">Graph View (based on Flot)</a></li>
+  <li><a href="docs/view-graph.html">Graph View (based on Flot)</a></li>
   <li><a href="docs/view-map.html">Map View (based on Leaflet)</a></li>
 </ul>
 
diff --git a/make b/make
index c4553597..97feeeaf 100755
--- a/make
+++ b/make
@@ -13,7 +13,7 @@ def docs():
     print("** Building docs")
 
     docco_executable = os.environ.get('DOCCO_EXECUTABLE','docco')
-    cmd = '%s src/model.js src/view.js src/view-grid.js src/view-flot-graph.js src/view-map.js' % (docco_executable)
+    cmd = '%s src/model.js src/view.js src/view-grid.js src/view-graph.js src/view-map.js' % (docco_executable)
     os.system(cmd)
     if os.path.exists('/tmp/recline-docs'):
       shutil.rmtree('/tmp/recline-docs')
diff --git a/src/view-flot-graph.js b/src/view-graph.js
similarity index 99%
rename from src/view-flot-graph.js
rename to src/view-graph.js
index ed3142f9..4b3a9d23 100644
--- a/src/view-flot-graph.js
+++ b/src/view-graph.js
@@ -20,7 +20,7 @@ this.recline.View = this.recline.View || {};
 //
 // NB: should *not* provide an el argument to the view but must let the view
 // generate the element itself (you can then append view.el to the DOM.
-my.FlotGraph = Backbone.View.extend({
+my.Graph = Backbone.View.extend({
 
   tagName:  "div",
   className: "data-graph-container",
diff --git a/src/view.js b/src/view.js
index 53b7a859..368bc95b 100644
--- a/src/view.js
+++ b/src/view.js
@@ -34,7 +34,7 @@ this.recline.View = this.recline.View || {};
 //
 // **el**: (required) DOM element to bind to. NB: the element already
 // being in the DOM is important for rendering of some subviews (e.g.
-// FlotGraph).
+// Graph).
 //
 // **views**: (optional) the dataset views (Grid, Graph etc) for
 // DataExplorer to show. This is an array of view hashes. If not provided
@@ -52,7 +52,7 @@ this.recline.View = this.recline.View || {};
 //   {
 //     id: 'graph',
 //     label: 'Graph',
-//     view: new recline.View.FlotGraph({
+//     view: new recline.View.Graph({
 //       model: dataset
 //     })
 //   }
diff --git a/test/index.html b/test/index.html
index 82751d57..a3c508d5 100644
--- a/test/index.html
+++ b/test/index.html
@@ -32,7 +32,7 @@
   <script type="text/javascript" src="../src/view.js"></script>
   <script type="text/javascript" src="../src/view-grid.js"></script>
   <script type="text/javascript" src="../src/view-transform-dialog.js"></script>
-  <script type="text/javascript" src="../src/view-flot-graph.js"></script>
+  <script type="text/javascript" src="../src/view-graph.js"></script>
   <script type="text/javascript" src="view-grid.test.js"></script>
   <script type="text/javascript" src="view-graph.test.js"></script>
   <script type="text/javascript" src="view.test.js"></script>
diff --git a/test/view-graph.test.js b/test/view-graph.test.js
index 122937f9..f7e6dae5 100644
--- a/test/view-graph.test.js
+++ b/test/view-graph.test.js
@@ -1,8 +1,8 @@
-module("View - FlotGraph");
+module("View - Graph");
 
 test('basics', function () {
   var dataset = Fixture.getDataset();
-  var view = new recline.View.FlotGraph({
+  var view = new recline.View.Graph({
     model: dataset
   });
   $('.fixtures').append(view.el);
diff --git a/test/view-grid.test.js b/test/view-grid.test.js
index 8a723c89..750cca2a 100644
--- a/test/view-grid.test.js
+++ b/test/view-grid.test.js
@@ -13,7 +13,7 @@ test('menu - hideColumn', function () {
   assertPresent('.column-header[data-field="x"]');
   var hideColumn = view.el.find('.column-header[data-field="x"] a[data-action="hideColumn"]');
   hideColumn.trigger('click');
-  assertNotPresent('.column-header[data-field="x"]');
+  assertNotPresent('.column-header[data-field="x"]', view.el);
 
   // also test a bit of state
   deepEqual(view.state.toJSON(), {hiddenFields: ['x']});