diff --git a/erpnext/change_log/v8/v8_0_0.md b/erpnext/change_log/v8/v8_0_0.md
index 1c6d155..58dd31b 100644
--- a/erpnext/change_log/v8/v8_0_0.md
+++ b/erpnext/change_log/v8/v8_0_0.md
@@ -18,7 +18,7 @@
 
 #### Customer Feedback
 - This feature will allow you to ask a customer to rate your service.
-- You can configure Feedback Trigger, just like we setup an Email Alert. It will send an email to customer asking for feedback. Customer's Feedback will be updated in the relevant.
+- You can configure Feedback Trigger, just like we setup an Notification. It will send an email to customer asking for feedback. Customer's Feedback will be updated in the relevant.
 - You can also check Feedback Rating report for daily average rating and trend.
 
 #### School Assessment Module
diff --git a/erpnext/public/js/help_links.js b/erpnext/public/js/help_links.js
index fa843bc..b8d0019 100644
--- a/erpnext/public/js/help_links.js
+++ b/erpnext/public/js/help_links.js
@@ -69,12 +69,12 @@
 	{ label: 'Email Account', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/email/email-account' },
 ]
 
-frappe.help.help_links['List/Email Alert'] = [
-	{ label: 'Email Alert', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/email/email-alerts' },
+frappe.help.help_links['List/Notification'] = [
+	{ label: 'Notification', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/email/notifications' },
 ]
 
-frappe.help.help_links['Form/Email Alert'] = [
-	{ label: 'Email Alert', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/email/email-alerts' },
+frappe.help.help_links['Form/Notification'] = [
+	{ label: 'Notification', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/email/notifications' },
 ]
 
 frappe.help.help_links['List/Email Digest'] = [
diff --git a/erpnext/setup/setup_wizard/operations/sample_data.py b/erpnext/setup/setup_wizard/operations/sample_data.py
index 6f07640..f5cc446 100644
--- a/erpnext/setup/setup_wizard/operations/sample_data.py
+++ b/erpnext/setup/setup_wizard/operations/sample_data.py
@@ -29,7 +29,7 @@
 			make_material_request(frappe.get_all("Item"))
 
 	make_projects(domains)
-	import_email_alert()
+	import_notification()
 
 def make_opportunity(items, customer):
 	b = frappe.get_doc({
@@ -159,11 +159,11 @@
 
 	project.insert(ignore_permissions=True)
 
-def import_email_alert():
-	'''Import email alert for task start'''
+def import_notification():
+	'''Import notification for task start'''
 	with open (os.path.join(os.path.dirname(__file__), "tasks/task_alert.json")) as f:
-		email_alert = frappe.get_doc(json.loads(f.read())[0])
-		email_alert.insert()
+		notification = frappe.get_doc(json.loads(f.read())[0])
+		notification.insert()
 
 	# trigger the first message!
 	from frappe.email.doctype.notification.notification import trigger_daily_alerts
@@ -174,4 +174,4 @@
 	frappe.db.sql('delete from tabProject')
 	frappe.db.sql('delete from tabTask')
 	make_projects('Education')
-	import_email_alert()
\ No newline at end of file
+	import_notification()
\ No newline at end of file
diff --git a/erpnext/setup/setup_wizard/tasks/task_alert.json b/erpnext/setup/setup_wizard/tasks/task_alert.json
index dca6845..cac868a 100644
--- a/erpnext/setup/setup_wizard/tasks/task_alert.json
+++ b/erpnext/setup/setup_wizard/tasks/task_alert.json
@@ -5,12 +5,12 @@
   "date_changed": "exp_end_date",
   "days_in_advance": 0,
   "docstatus": 0,
-  "doctype": "Email Alert",
+  "doctype": "Notification",
   "document_type": "Task",
   "enabled": 1,
   "event": "Days After",
   "is_standard": 0,
-  "message": "<p>Task due today:</p>\n\n<div>\n{{ doc.description }}\n</div>\n\n<hr>\n<p style=\"font-size: 85%\">\nThis is a notification for a task that is due today, and a sample <b>Email Alert</b>. In ERPNext you can setup email alerts on anything, Invoices, Orders, Leads, Opportunities, so you never miss a thing.\n<br>To edit this, and setup other alerts, just type <b>Email Alert</b> in the search bar.</p>",
+  "message": "<p>Task due today:</p>\n\n<div>\n{{ doc.description }}\n</div>\n\n<hr>\n<p style=\"font-size: 85%\">\nThis is a notification for a task that is due today, and a sample <b>Notification</b>. In ERPNext you can setup notifications on anything, Invoices, Orders, Leads, Opportunities, so you never miss a thing.\n<br>To edit this, and setup other alerts, just type <b>Notification</b> in the search bar.</p>",
   "method": null,
   "modified": "2017-03-09 07:34:58.168370",
   "module": null,