diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf171eb8fb3..07d2c499dcd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,6 @@
-vNext
+# vNext
+
+#### New features or improvements
 - New Y-axis formater for metric values that represent seconds (Issue #427) - thx @jippi
 - Allow special characters in serie names (influxdb datasource), PR #390 - thx  @majst01
 - Refactoring of filterSrv (Issue #428), thx @Tetha
@@ -12,7 +14,10 @@ vNext
 - Improvement to InfluxDB query editor and function/value column selection (Issue #473)
 - Initial support for filtering (templated queries) for InfluxDB (PR #375) - thx @mavimo
 
-# Fixes
+#### Changes
+- Graphite panel is now renamed graph (Existing dashboards will still work)
+
+#### Fixes
 - Filter option loading when having muliple nested filters now works better.
   Options are now reloaded correctly and there are no multiple renders/refresh inbetween (#447),
   After an option is changed and a nested template param is also reloaded, if the current value
diff --git a/src/app/panels/graphite/axisEditor.html b/src/app/panels/graph/axisEditor.html
similarity index 100%
rename from src/app/panels/graphite/axisEditor.html
rename to src/app/panels/graph/axisEditor.html
diff --git a/src/app/panels/graphite/legend.html b/src/app/panels/graph/legend.html
similarity index 100%
rename from src/app/panels/graphite/legend.html
rename to src/app/panels/graph/legend.html
diff --git a/src/app/panels/graphite/module.html b/src/app/panels/graph/module.html
similarity index 91%
rename from src/app/panels/graphite/module.html
rename to src/app/panels/graph/module.html
index 3848e0df691..1139d88a236 100644
--- a/src/app/panels/graphite/module.html
+++ b/src/app/panels/graph/module.html
@@ -1,4 +1,4 @@
-<div  ng-controller='graphite'
+<div  ng-controller='graph'
       ng-init="init()"
       style="min-height:{{panel.height || row.height}}"
       ng-class="{'panel-fullscreen': fullscreen}">
@@ -16,7 +16,7 @@
   </div>
 
   <div ng-if="panel.legend" class="grafana-legend-container">
-    <div ng-include="'app/panels/graphite/legend.html'"></div>
+    <div ng-include="'app/panels/graph/legend.html'"></div>
   </div>
   <div class="clearfix"></div>
 
diff --git a/src/app/panels/graphite/module.js b/src/app/panels/graph/module.js
similarity index 97%
rename from src/app/panels/graphite/module.js
rename to src/app/panels/graph/module.js
index 15c9aa61a6b..53368ddafdc 100644
--- a/src/app/panels/graphite/module.js
+++ b/src/app/panels/graph/module.js
@@ -33,10 +33,10 @@ function (angular, app, $, _, kbn, moment, timeSeries) {
 
   'use strict';
 
-  var module = angular.module('kibana.panels.graphite', []);
+  var module = angular.module('kibana.panels.graph', []);
   app.useModule(module);
 
-  module.controller('graphite', function($scope, $rootScope, datasourceSrv, $timeout, annotationsSrv) {
+  module.controller('graph', function($scope, $rootScope, datasourceSrv, $timeout, annotationsSrv) {
 
     $scope.panelMeta = {
       modals : [],
@@ -52,11 +52,11 @@ function (angular, app, $, _, kbn, moment, timeSeries) {
         },
         {
           title:'Axes & Grid',
-          src:'app/panels/graphite/axisEditor.html'
+          src:'app/panels/graph/axisEditor.html'
         },
         {
           title:'Display Styles',
-          src:'app/panels/graphite/styleEditor.html'
+          src:'app/panels/graph/styleEditor.html'
         }
       ],
       fullscreenEdit: true,
diff --git a/src/app/panels/graphite/styleEditor.html b/src/app/panels/graph/styleEditor.html
similarity index 100%
rename from src/app/panels/graphite/styleEditor.html
rename to src/app/panels/graph/styleEditor.html
diff --git a/src/app/panels/graphite/timeSeries.js b/src/app/panels/graph/timeSeries.js
similarity index 100%
rename from src/app/panels/graphite/timeSeries.js
rename to src/app/panels/graph/timeSeries.js
diff --git a/src/app/services/dashboard.js b/src/app/services/dashboard.js
index 72c80840005..810082e17fe 100644
--- a/src/app/services/dashboard.js
+++ b/src/app/services/dashboard.js
@@ -138,6 +138,14 @@ function (angular, $, kbn, _, config, moment, Modernizr) {
         });
       }
 
+      _.each(dashboard.rows, function(row) {
+        _.each(row.panels, function(panel) {
+          if (panel.type === 'graphite') {
+            panel.type = 'graph';
+          }
+        });
+      });
+
       return dashboard;
     };
 
diff --git a/src/config.sample.js b/src/config.sample.js
index 874cd999411..530a610db18 100644
--- a/src/config.sample.js
+++ b/src/config.sample.js
@@ -76,7 +76,7 @@ function (Settings) {
 
     panel_names: [
       'text',
-      'graphite'
+      'graph'
     ]
   });
 });