diff --git a/erpnext/demo/data/item_schools.json b/erpnext/demo/data/item_education.json
similarity index 100%
rename from erpnext/demo/data/item_schools.json
rename to erpnext/demo/data/item_education.json
diff --git a/erpnext/demo/demo.py b/erpnext/demo/demo.py
index 35256b5..42ef896 100644
--- a/erpnext/demo/demo.py
+++ b/erpnext/demo/demo.py
@@ -3,7 +3,7 @@
 import frappe, sys
 import erpnext
 import frappe.utils
-from erpnext.demo.user import hr, sales, purchase, manufacturing, stock, accounts, projects, fixed_asset, schools
+from erpnext.demo.user import hr, sales, purchase, manufacturing, stock, accounts, projects, fixed_asset, education
 from erpnext.demo.setup import education, manufacture, setup_data, healthcare
 """
 Make a demo
@@ -83,7 +83,7 @@
 				sales.work()
 				manufacturing.work()
 			elif domain=='Education':
-				schools.work()
+				education.work()
 
 		except:
 			frappe.db.set_global('demo_last_date', current_date)
diff --git a/erpnext/demo/setup/education.py b/erpnext/demo/setup/education.py
index a124ee7..2a894f7 100644
--- a/erpnext/demo/setup/education.py
+++ b/erpnext/demo/setup/education.py
@@ -31,7 +31,7 @@
 	frappe.db.commit()
 
 def setup_item():
-	items = json.loads(open(frappe.get_app_path('erpnext', 'demo', 'data', 'item_schools.json')).read())
+	items = json.loads(open(frappe.get_app_path('erpnext', 'demo', 'data', 'item_education.json')).read())
 	for i in items:
 		item = frappe.new_doc('Item')
 		item.update(i)
diff --git a/erpnext/demo/setup/setup_data.py b/erpnext/demo/setup/setup_data.py
index d395493..c7babc0 100644
--- a/erpnext/demo/setup/setup_data.py
+++ b/erpnext/demo/setup/setup_data.py
@@ -229,10 +229,10 @@
 		user.add_roles('HR User', 'Projects User')
 		frappe.db.set_global('demo_projects_user', user.name)
 
-	if not frappe.db.get_global('demo_schools_user'):
+	if not frappe.db.get_global('demo_education_user'):
 		user = frappe.get_doc('User', 'aromn@example.com')
 		user.add_roles('Academics User')
-		frappe.db.set_global('demo_schools_user', user.name)
+		frappe.db.set_global('demo_education_user', user.name)
 
 	#Add Expense Approver
 	user = frappe.get_doc('User', 'WanMai@example.com')
diff --git a/erpnext/demo/user/schools.py b/erpnext/demo/user/education.py
similarity index 92%
rename from erpnext/demo/user/schools.py
rename to erpnext/demo/user/education.py
index 422c31a..8c82f87 100644
--- a/erpnext/demo/user/schools.py
+++ b/erpnext/demo/user/education.py
@@ -1,3 +1,4 @@
+
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
 
@@ -8,13 +9,12 @@
 from frappe.utils import cstr
 from frappe.utils.make_random import get_random
 from datetime import timedelta
-from erpnext.schools.api import get_student_group_students, make_attendance_records, enroll_student, \
+from erpnext.education.api import get_student_group_students, make_attendance_records, enroll_student, \
 								get_fee_schedule, collect_fees, get_course
-from erpnext.schools.doctype.program_enrollment.program_enrollment import get_program_courses
-from erpnext.schools.doctype.student_group.student_group import get_students
+
 
 def work():
-	frappe.set_user(frappe.db.get_global('demo_schools_user'))
+	frappe.set_user(frappe.db.get_global('demo_education_user'))
 	for d in xrange(20):
 		approve_random_student_applicant()
 		enroll_random_student(frappe.flags.current_date)