diff --git a/docs/00-Getting-Started.md b/docs/00-Getting-Started.md
index 7cb1097aa..8690197af 100644
--- a/docs/00-Getting-Started.md
+++ b/docs/00-Getting-Started.md
@@ -132,8 +132,8 @@ Chart.defaults.global = {
 	// Boolean - Determines whether to draw tooltips on the canvas or not
 	showTooltips: true,
 
-	// Function - Determines whether to execute the externalTooltips function instead of drawing the built in tooltips (See [Advanced - External Tooltips](#advanced-usage-external-tooltips))
-	externalTooltips: false,
+	// Function - Determines whether to execute the customTooltips function instead of drawing the built in tooltips (See [Advanced - External Tooltips](#advanced-usage-custom-tooltips))
+	customTooltips: false,
 
 	// Array - Array of string names to attach tooltip events
 	tooltipEvents: ["mousemove", "touchstart", "touchmove"],
diff --git a/docs/06-Advanced.md b/docs/06-Advanced.md
index d6cbf3a03..9911bedb4 100644
--- a/docs/06-Advanced.md
+++ b/docs/06-Advanced.md
@@ -72,11 +72,11 @@ myLineChart.generateLegend();
 
 ### External Tooltips
 
-You can enable external tooltips in the global or chart configuration like so:
+You can enable custom tooltips in the global or chart configuration like so:
 
 ```javascript
 var myPieChart = new Chart(ctx).Pie(data, {
-	externalTooltips: function(tooltip) {
+	customTooltips: function(tooltip) {
 
         // tooltip will be false if tooltip is not visible or should be hidden
         if (!tooltip) {
@@ -100,7 +100,7 @@ var myPieChart = new Chart(ctx).Pie(data, {
 });
 ```
 
-See files `sample/pie-externalTooltips.html` and `sample/line-externalTooltips.html` for examples on how to get started.
+See files `sample/pie-customTooltips.html` and `sample/line-customTooltips.html` for examples on how to get started.
 
 
 ### Writing new chart types
diff --git a/samples/line-externalTooltips.html b/samples/line-customTooltips.html
similarity index 98%
rename from samples/line-externalTooltips.html
rename to samples/line-customTooltips.html
index 67eab85ee..4dc46e1ab 100644
--- a/samples/line-externalTooltips.html
+++ b/samples/line-customTooltips.html
@@ -50,7 +50,7 @@
     <script>
 
     Chart.defaults.global.pointHitDetectionRadius = 1;
-    Chart.defaults.global.externalTooltips = function(tooltip) {
+    Chart.defaults.global.customTooltips = function(tooltip) {
 
         var tooltipEl = $('#chartjs-tooltip');
 
diff --git a/samples/pie-externalTooltips.html b/samples/pie-customTooltips.html
similarity index 98%
rename from samples/pie-externalTooltips.html
rename to samples/pie-customTooltips.html
index c126c640f..732317de4 100644
--- a/samples/pie-externalTooltips.html
+++ b/samples/pie-customTooltips.html
@@ -77,7 +77,7 @@
 
 
     <script>
-    Chart.defaults.global.externalTooltips = function(tooltip) {
+    Chart.defaults.global.customTooltips = function(tooltip) {
 
     	// Tooltip Element
         var tooltipEl = $('#chartjs-tooltip');
diff --git a/src/Chart.Core.js b/src/Chart.Core.js
index 07c63c4d5..845f01967 100755
--- a/src/Chart.Core.js
+++ b/src/Chart.Core.js
@@ -99,7 +99,7 @@
 			showTooltips: true,
 
 			// Boolean - Determines whether to draw built-in tooltip or call custom tooltip function
-			externalTooltips: false,
+			customTooltips: false,
 
 			// Array - Array of string names to attach tooltip events
 			tooltipEvents: ["mousemove", "touchstart", "touchmove", "mouseout"],
@@ -898,8 +898,8 @@
 				this.activeElements = ChartElements;
 			}
 			this.draw();
-			if(this.options.externalTooltips){
-				this.options.externalTooltips(false);
+			if(this.options.customTooltips){
+				this.options.customTooltips(false);
 			}
 			if (ChartElements.length > 0){
 				// If we have multiple datasets, show a MultiTooltip for all of the data points at that index
@@ -982,7 +982,7 @@
 						title: ChartElements[0].label,
 						chart: this.chart,
 						ctx: this.chart.ctx,
-						external: this.options.externalTooltips
+						custom: this.options.customTooltips
 					}).draw();
 
 				} else {
@@ -1002,7 +1002,7 @@
 							cornerRadius: this.options.tooltipCornerRadius,
 							text: template(this.options.tooltipTemplate, Element),
 							chart: this.chart,
-							external: this.options.externalTooltips
+							custom: this.options.customTooltips
 						}).draw();
 					}, this);
 				}
@@ -1281,8 +1281,8 @@
 			ctx.fillStyle = this.fillColor;
 
 			// Custom Tooltips
-			if(this.external){
-				this.external(this);
+			if(this.custom){
+				this.custom(this);
 			}
 			else{
 				switch(this.yAlign)
@@ -1381,8 +1381,8 @@
 		},
 		draw : function(){
 			// Custom Tooltips
-			if(this.external){
-				this.external(this);
+			if(this.custom){
+				this.custom(this);
 			}
 			else{
 				drawRoundedRectangle(this.ctx,this.x,this.y - this.height/2,this.width,this.height,this.cornerRadius);