diff --git a/erpnext/config/schools.py b/erpnext/config/schools.py
index a4c5744..e95b734 100644
--- a/erpnext/config/schools.py
+++ b/erpnext/config/schools.py
@@ -128,7 +128,11 @@
 				},
 				{
 					"type": "doctype",
-					"name": "Evaluation Criteria"
+					"name": "Assessment Criteria"
+				},
+				{
+					"type": "doctype",
+					"name": "Assessment Criteria Group"
 				},
 				{
 					"type": "doctype",
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 9494fbd..e041a2b 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -369,4 +369,5 @@
 erpnext.patches.v7_2.set_null_value_to_fields
 erpnext.patches.v7_2.update_guardian_name_in_student_master
 erpnext.patches.v7_2.update_abbr_in_salary_slips
-erpnext.patches.v7_2.update_party_type
+erpnext.patches.v7_2.rename_evaluation_criteria
+erpnext.patches.v7_2.update_party_type
\ No newline at end of file
diff --git a/erpnext/patches/v7_2/rename_evaluation_criteria.py b/erpnext/patches/v7_2/rename_evaluation_criteria.py
new file mode 100644
index 0000000..4239232
--- /dev/null
+++ b/erpnext/patches/v7_2/rename_evaluation_criteria.py
@@ -0,0 +1,24 @@
+import frappe
+from frappe.model.utils.rename_field import rename_field
+
+def execute():
+    frappe.rename_doc("DocType", "Evaluation Criteria", "Assessment Criteria", force=True)
+    frappe.reload_doc("schools", "doctype", "assessment_criteria")
+    rename_field("Assessment Criteria", "evaluation_criteria", "assessment_criteria")
+
+    frappe.rename_doc("DocType", "Assessment Evaluation Criteria", "Assessment Plan Criteria", force=True)
+    frappe.reload_doc("schools", "doctype", "assessment_plan_criteria")
+    rename_field("Assessment Plan Criteria", "evaluation_criteria", "assessment_criteria")
+
+    frappe.reload_doc("schools", "doctype", "assessment_plan")
+    rename_field("Assessment Plan", "evaluation_criterias", "assessment_criteria")
+        
+    frappe.reload_doc("schools", "doctype", "assessment_result_detail")
+    rename_field("Assessment Result Detail", "evaluation_criteria", "assessment_criteria")
+
+    frappe.rename_doc("DocType", "Course Evaluation Criteria", "Course Assessment Criteria", force=True)
+    frappe.reload_doc("schools", "doctype", "course_assessment_criteria")
+    rename_field("Course Assessment Criteria", "evaluation_criteria", "assessment_criteria")
+
+    frappe.reload_doc("schools", "doctype", "course")
+    rename_field("Course", "evaluation_criterias", "assessment_criteria")
diff --git a/erpnext/patches/v7_2/update_assessment_modules.py b/erpnext/patches/v7_2/update_assessment_modules.py
index ac04294..9c00902 100644
--- a/erpnext/patches/v7_2/update_assessment_modules.py
+++ b/erpnext/patches/v7_2/update_assessment_modules.py
@@ -17,7 +17,7 @@
 
 	frappe.reload_doc("schools", "doctype", "assessment_result")
 	frappe.reload_doc("schools", "doctype", "assessment_result_detail")
-	frappe.reload_doc("schools", "doctype", "evaluation_criteria")
+	frappe.reload_doc("schools", "doctype", "assessment_criteria")
 
 
 	for assessment in frappe.get_all("Assessment Plan", fields=["name", "grading_scale"], filters = [["docstatus", "!=", 2 ]]):
diff --git a/erpnext/public/js/schools/assessment_result_tool.html b/erpnext/public/js/schools/assessment_result_tool.html
index 6f9e256..3c09ccd 100644
--- a/erpnext/public/js/schools/assessment_result_tool.html
+++ b/erpnext/public/js/schools/assessment_result_tool.html
@@ -3,14 +3,14 @@
         <tr>
             <th style="width: 100px" rowspan="2">Student</th>
             <th style="width: 200px" rowspan="2">Student Name</th>
-            {% for c in criterias %}
-            <th class="score" style="width: 100px">{{ c.evaluation_criteria }}</th>
+            {% for c in criteria %}
+            <th class="score" style="width: 100px">{{ c.assessment_criteria }}</th>
             {% endfor %}
             <th class="score" style="width: 100px">Total Marks</th>
             <!--criteria-->
         </tr>
         <tr>
-            {% for c in criterias %}
+            {% for c in criteria %}
             <th class="score" style="width: 100px">{{ c.maximum_score }}</th>
             {% endfor %}
             <th class="score" style="width: 100px">{{max_total_score}}</th>
@@ -23,15 +23,15 @@
             data-student="{{s.student}}">
             <td>{{ s.student }}</td>
             <td>{{ s.student_name }}</td>
-            {% for c in criterias %}
+            {% for c in criteria %}
             <td>
                 <input type="text"
                     data-max-score="{{c.maximum_score}}"
-                    data-criteria="{{c.evaluation_criteria}}"
+                    data-criteria="{{c.assessment_criteria}}"
                     data-student="{{s.student}}"
                     {% if(s.assessment_details) { %}
                         disabled
-                        value="{{s.assessment_details[c.evaluation_criteria]}}"
+                        value="{{s.assessment_details[c.assessment_criteria]}}"
                     {% } %}/>
             </td>
             {% endfor %}
diff --git a/erpnext/schools/api.py b/erpnext/schools/api.py
index 81ae9c4..313b5ff 100644
--- a/erpnext/schools/api.py
+++ b/erpnext/schools/api.py
@@ -167,13 +167,13 @@
 	return data
 
 @frappe.whitelist()
-def get_evaluation_criterias(course):
-	"""Returns Evaluation Criterias and their Weightage from Course Master.
+def get_assessment_criteria(course):
+	"""Returns Assessmemt Criteria and their Weightage from Course Master.
 
 	:param Course: Course
 	"""
-	return frappe.get_list("Course Evaluation Criteria", \
-		fields=["evaluation_criteria", "weightage"], filters={"parent": course}, order_by= "idx")
+	return frappe.get_list("Course Assessment Criteria", \
+		fields=["assessment_criteria", "weightage"], filters={"parent": course}, order_by= "idx")
 
 @frappe.whitelist()
 def get_assessment_students(assessment_plan, student_group=None, student_batch=None):
@@ -187,7 +187,7 @@
 		if result:
 			student_result = {}
 			for d in result.details:
-				student_result.update({d.evaluation_criteria: cstr(d.score) + " ("+ d.grade + ")"})
+				student_result.update({d.assessment_criteria: cstr(d.score) + " ("+ d.grade + ")"})
 			student_result.update({"total_score": cstr(result.total_score) + " (" + result.grade + ")"})
 			student.update({'assessment_details': student_result})
 		else:
@@ -196,12 +196,12 @@
 
 @frappe.whitelist()
 def get_assessment_details(assessment_plan):
-	"""Returns Evaluation Criteria  and Maximum Score from Assessment Plan Master.
+	"""Returns Assessment Criteria  and Maximum Score from Assessment Plan Master.
 
 	:param Assessment Plan: Assessment Plan
 	"""
-	return frappe.get_list("Assessment Evaluation Criteria", \
-		fields=["evaluation_criteria", "maximum_score"], filters={"parent": assessment_plan}, order_by= "idx")
+	return frappe.get_list("Assessment Plan Criteria", \
+		fields=["assessment_criteria", "maximum_score"], filters={"parent": assessment_plan}, order_by= "idx")
 
 @frappe.whitelist()
 def get_result(student, assessment_plan):
@@ -241,7 +241,7 @@
 	details = []
 	for s in student_score.keys():
 		details.append({
-			"evaluation_criteria": s,
+			"assessment_criteria": s,
 			"score": flt(student_score[s])
 		})
 	assessment_result = frappe.new_doc("Assessment Result")
diff --git a/erpnext/schools/doctype/assessment_evaluation_criteria/__init__.py b/erpnext/schools/doctype/assessment_criteria/__init__.py
similarity index 100%
rename from erpnext/schools/doctype/assessment_evaluation_criteria/__init__.py
rename to erpnext/schools/doctype/assessment_criteria/__init__.py
diff --git a/erpnext/schools/doctype/evaluation_criteria/evaluation_criteria.js b/erpnext/schools/doctype/assessment_criteria/assessment_criteria.js
similarity index 78%
rename from erpnext/schools/doctype/evaluation_criteria/evaluation_criteria.js
rename to erpnext/schools/doctype/assessment_criteria/assessment_criteria.js
index 5e0269b..44b9ca3 100644
--- a/erpnext/schools/doctype/evaluation_criteria/evaluation_criteria.js
+++ b/erpnext/schools/doctype/assessment_criteria/assessment_criteria.js
@@ -1,7 +1,7 @@
 // Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
 
-frappe.ui.form.on('Evaluation Criteria', {
+frappe.ui.form.on('Assessment Criteria', {
 	refresh: function(frm) {
 
 	}
diff --git a/erpnext/schools/doctype/evaluation_criteria/evaluation_criteria.json b/erpnext/schools/doctype/assessment_criteria/assessment_criteria.json
similarity index 63%
copy from erpnext/schools/doctype/evaluation_criteria/evaluation_criteria.json
copy to erpnext/schools/doctype/assessment_criteria/assessment_criteria.json
index f830abe..dd6d5dd 100644
--- a/erpnext/schools/doctype/evaluation_criteria/evaluation_criteria.json
+++ b/erpnext/schools/doctype/assessment_criteria/assessment_criteria.json
@@ -2,7 +2,7 @@
  "allow_copy": 0, 
  "allow_import": 1, 
  "allow_rename": 0, 
- "autoname": "field:evaluation_criteria", 
+ "autoname": "field:assessment_criteria", 
  "beta": 0, 
  "creation": "2016-12-14 16:40:15.144115", 
  "custom": 0, 
@@ -17,7 +17,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "evaluation_criteria", 
+   "fieldname": "assessment_criteria", 
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
@@ -25,7 +25,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Evaluation Criteria", 
+   "label": "Assessment Criteria", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -39,6 +39,35 @@
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "assessment_criteria_group", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Assessment Criteria Group", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Assessment Criteria Group", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
   }
  ], 
  "hide_heading": 0, 
@@ -51,10 +80,10 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-12-14 16:40:36.351183", 
+ "modified": "2017-02-01 17:41:48.994388", 
  "modified_by": "Administrator", 
  "module": "Schools", 
- "name": "Evaluation Criteria", 
+ "name": "Assessment Criteria", 
  "name_case": "", 
  "owner": "Administrator", 
  "permissions": [
@@ -68,7 +97,6 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -85,5 +113,6 @@
  "read_only_onload": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/schools/doctype/evaluation_criteria/evaluation_criteria.py b/erpnext/schools/doctype/assessment_criteria/assessment_criteria.py
similarity index 86%
rename from erpnext/schools/doctype/evaluation_criteria/evaluation_criteria.py
rename to erpnext/schools/doctype/assessment_criteria/assessment_criteria.py
index 85c1b32..e666a74 100644
--- a/erpnext/schools/doctype/evaluation_criteria/evaluation_criteria.py
+++ b/erpnext/schools/doctype/assessment_criteria/assessment_criteria.py
@@ -6,5 +6,5 @@
 import frappe
 from frappe.model.document import Document
 
-class EvaluationCriteria(Document):
+class AssessmentCriteria(Document):
 	pass
diff --git a/erpnext/schools/doctype/evaluation_criteria/test_evaluation_criteria.py b/erpnext/schools/doctype/assessment_criteria/test_assessment_criteria.py
similarity index 62%
rename from erpnext/schools/doctype/evaluation_criteria/test_evaluation_criteria.py
rename to erpnext/schools/doctype/assessment_criteria/test_assessment_criteria.py
index 0182db6..fc0d745 100644
--- a/erpnext/schools/doctype/evaluation_criteria/test_evaluation_criteria.py
+++ b/erpnext/schools/doctype/assessment_criteria/test_assessment_criteria.py
@@ -6,7 +6,7 @@
 import frappe
 import unittest
 
-# test_records = frappe.get_test_records('Evaluation Criteria')
+# test_records = frappe.get_test_records('Assessment Criteria')
 
-class TestEvaluationCriteria(unittest.TestCase):
+class TestAssessmentCriteria(unittest.TestCase):
 	pass
diff --git a/erpnext/schools/doctype/assessment_criteria/test_records.json b/erpnext/schools/doctype/assessment_criteria/test_records.json
new file mode 100644
index 0000000..7af63b3
--- /dev/null
+++ b/erpnext/schools/doctype/assessment_criteria/test_records.json
@@ -0,0 +1,8 @@
+[
+ {
+  "assessment_criteria": "_Test Assessment Criteria"
+ }, 
+ {
+  "assessment_criteria": "_Test Assessment Criteria 1"
+ }
+]
\ No newline at end of file
diff --git a/erpnext/schools/doctype/assessment_evaluation_criteria/__init__.py b/erpnext/schools/doctype/assessment_criteria_group/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/assessment_evaluation_criteria/__init__.py
copy to erpnext/schools/doctype/assessment_criteria_group/__init__.py
diff --git a/erpnext/schools/doctype/evaluation_criteria/evaluation_criteria.js b/erpnext/schools/doctype/assessment_criteria_group/assessment_criteria_group.js
similarity index 75%
copy from erpnext/schools/doctype/evaluation_criteria/evaluation_criteria.js
copy to erpnext/schools/doctype/assessment_criteria_group/assessment_criteria_group.js
index 5e0269b..89358d2 100644
--- a/erpnext/schools/doctype/evaluation_criteria/evaluation_criteria.js
+++ b/erpnext/schools/doctype/assessment_criteria_group/assessment_criteria_group.js
@@ -1,7 +1,7 @@
 // Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
 
-frappe.ui.form.on('Evaluation Criteria', {
+frappe.ui.form.on('Assessment Criteria Group', {
 	refresh: function(frm) {
 
 	}
diff --git a/erpnext/schools/doctype/evaluation_criteria/evaluation_criteria.json b/erpnext/schools/doctype/assessment_criteria_group/assessment_criteria_group.json
similarity index 82%
rename from erpnext/schools/doctype/evaluation_criteria/evaluation_criteria.json
rename to erpnext/schools/doctype/assessment_criteria_group/assessment_criteria_group.json
index f830abe..0319868 100644
--- a/erpnext/schools/doctype/evaluation_criteria/evaluation_criteria.json
+++ b/erpnext/schools/doctype/assessment_criteria_group/assessment_criteria_group.json
@@ -1,10 +1,10 @@
 {
  "allow_copy": 0, 
  "allow_import": 1, 
- "allow_rename": 0, 
- "autoname": "field:evaluation_criteria", 
+ "allow_rename": 1, 
+ "autoname": "field:assessment_criteria_group", 
  "beta": 0, 
- "creation": "2016-12-14 16:40:15.144115", 
+ "creation": "2017-01-27 15:17:38.855910", 
  "custom": 0, 
  "docstatus": 0, 
  "doctype": "DocType", 
@@ -17,7 +17,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "evaluation_criteria", 
+   "fieldname": "assessment_criteria_group", 
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
@@ -25,7 +25,7 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Evaluation Criteria", 
+   "label": "Assessment Criteria Group", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -51,10 +51,10 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-12-14 16:40:36.351183", 
+ "modified": "2017-02-01 17:39:12.453618", 
  "modified_by": "Administrator", 
  "module": "Schools", 
- "name": "Evaluation Criteria", 
+ "name": "Assessment Criteria Group", 
  "name_case": "", 
  "owner": "Administrator", 
  "permissions": [
@@ -68,7 +68,6 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -85,5 +84,6 @@
  "read_only_onload": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/schools/doctype/evaluation_criteria/evaluation_criteria.py b/erpnext/schools/doctype/assessment_criteria_group/assessment_criteria_group.py
similarity index 85%
copy from erpnext/schools/doctype/evaluation_criteria/evaluation_criteria.py
copy to erpnext/schools/doctype/assessment_criteria_group/assessment_criteria_group.py
index 85c1b32..75381e1 100644
--- a/erpnext/schools/doctype/evaluation_criteria/evaluation_criteria.py
+++ b/erpnext/schools/doctype/assessment_criteria_group/assessment_criteria_group.py
@@ -6,5 +6,5 @@
 import frappe
 from frappe.model.document import Document
 
-class EvaluationCriteria(Document):
+class AssessmentCriteriaGroup(Document):
 	pass
diff --git a/erpnext/schools/doctype/evaluation_criteria/test_evaluation_criteria.py b/erpnext/schools/doctype/assessment_criteria_group/test_assessment_criteria_group.py
similarity index 60%
copy from erpnext/schools/doctype/evaluation_criteria/test_evaluation_criteria.py
copy to erpnext/schools/doctype/assessment_criteria_group/test_assessment_criteria_group.py
index 0182db6..5b29337 100644
--- a/erpnext/schools/doctype/evaluation_criteria/test_evaluation_criteria.py
+++ b/erpnext/schools/doctype/assessment_criteria_group/test_assessment_criteria_group.py
@@ -6,7 +6,7 @@
 import frappe
 import unittest
 
-# test_records = frappe.get_test_records('Evaluation Criteria')
+# test_records = frappe.get_test_records('Assessment Criteria Group')
 
-class TestEvaluationCriteria(unittest.TestCase):
+class TestAssessmentCriteriaGroup(unittest.TestCase):
 	pass
diff --git a/erpnext/schools/doctype/assessment_evaluation_criteria/assessment_evaluation_criteria.py b/erpnext/schools/doctype/assessment_evaluation_criteria/assessment_evaluation_criteria.py
deleted file mode 100644
index 08f6fd4..0000000
--- a/erpnext/schools/doctype/assessment_evaluation_criteria/assessment_evaluation_criteria.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-
-from __future__ import unicode_literals
-import frappe
-from frappe.model.document import Document
-
-class AssessmentEvaluationCriteria(Document):
-	pass
diff --git a/erpnext/schools/doctype/assessment_plan/assessment_plan.js b/erpnext/schools/doctype/assessment_plan/assessment_plan.js
index f11c10b..9685e0e 100644
--- a/erpnext/schools/doctype/assessment_plan/assessment_plan.js
+++ b/erpnext/schools/doctype/assessment_plan/assessment_plan.js
@@ -21,20 +21,20 @@
     course: function(frm) {
         if (frm.doc.course && frm.doc.maximum_assessment_score) {
             frappe.call({
-                method: "erpnext.schools.api.get_evaluation_criterias",
+                method: "erpnext.schools.api.get_assessment_criteria",
                 args: {
                     course: frm.doc.course
                 },
                 callback: function(r) {
                     if (r.message) {
-                        frm.doc.evaluation_criterias = [];
+                        frm.doc.assessment_criteria = [];
                         $.each(r.message, function(i, d) {
-                            var row = frappe.model.add_child(frm.doc, "Assessment Evaluation Criteria", "evaluation_criterias");
-                            row.evaluation_criteria = d.evaluation_criteria;
+                            var row = frappe.model.add_child(frm.doc, "Assessment Plan Criteria", "assessment_criteria");
+                            row.assessment_criteria = d.assessment_criteria;
                             row.maximum_score = d.weightage / 100 * frm.doc.maximum_assessment_score;
                         });
                     }
-                    refresh_field("evaluation_criterias");
+                    refresh_field("assessment_criteria");
 
                 }
             });
diff --git a/erpnext/schools/doctype/assessment_plan/assessment_plan.json b/erpnext/schools/doctype/assessment_plan/assessment_plan.json
index 967c689..64ff487 100644
--- a/erpnext/schools/doctype/assessment_plan/assessment_plan.json
+++ b/erpnext/schools/doctype/assessment_plan/assessment_plan.json
@@ -639,7 +639,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "evaluation_criterias", 
+   "fieldname": "assessment_criteria", 
    "fieldtype": "Table", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
@@ -647,10 +647,10 @@
    "in_filter": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Evaluation Criterias", 
+   "label": "Assessment Criteria", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "Assessment Evaluation Criteria", 
+   "options": "Assessment Plan Criteria", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -703,7 +703,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2017-01-05 12:15:33.183100", 
+ "modified": "2017-02-01 17:22:11.816270", 
  "modified_by": "Administrator", 
  "module": "Schools", 
  "name": "Assessment Plan", 
@@ -720,7 +720,6 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
diff --git a/erpnext/schools/doctype/assessment_plan/assessment_plan.py b/erpnext/schools/doctype/assessment_plan/assessment_plan.py
index 1b4b671..31e96aa 100644
--- a/erpnext/schools/doctype/assessment_plan/assessment_plan.py
+++ b/erpnext/schools/doctype/assessment_plan/assessment_plan.py
@@ -46,7 +46,7 @@
 
 	def validate_max_score(self):
 		max_score = 0
-		for d in self.evaluation_criterias:
+		for d in self.assessment_criteria:
 			max_score += d.maximum_score
 		if self.maximum_assessment_score != max_score:
-			frappe.throw(_("Sum of Scores of Evaluation Criterias needs to be {0}.".format(self.maximum_assessment_score)))
\ No newline at end of file
+			frappe.throw(_("Sum of Scores of Assessment Criteria needs to be {0}.".format(self.maximum_assessment_score)))
\ No newline at end of file
diff --git a/erpnext/schools/doctype/assessment_evaluation_criteria/__init__.py b/erpnext/schools/doctype/assessment_plan_criteria/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/assessment_evaluation_criteria/__init__.py
copy to erpnext/schools/doctype/assessment_plan_criteria/__init__.py
diff --git a/erpnext/schools/doctype/assessment_evaluation_criteria/assessment_evaluation_criteria.json b/erpnext/schools/doctype/assessment_plan_criteria/assessment_plan_criteria.json
similarity index 91%
rename from erpnext/schools/doctype/assessment_evaluation_criteria/assessment_evaluation_criteria.json
rename to erpnext/schools/doctype/assessment_plan_criteria/assessment_plan_criteria.json
index 870aaa0..2ba5ca7 100644
--- a/erpnext/schools/doctype/assessment_evaluation_criteria/assessment_evaluation_criteria.json
+++ b/erpnext/schools/doctype/assessment_plan_criteria/assessment_plan_criteria.json
@@ -17,7 +17,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "evaluation_criteria", 
+   "fieldname": "assessment_criteria", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
@@ -25,10 +25,10 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
-   "label": "Evaluation Criteria", 
+   "label": "Assessment Criteria", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "Evaluation Criteria", 
+   "options": "Assessment Criteria", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -108,10 +108,10 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-12-14 17:31:11.950549", 
+ "modified": "2017-02-01 17:11:47.164623", 
  "modified_by": "Administrator", 
  "module": "Schools", 
- "name": "Assessment Evaluation Criteria", 
+ "name": "Assessment Plan Criteria", 
  "name_case": "", 
  "owner": "Administrator", 
  "permissions": [], 
@@ -120,5 +120,6 @@
  "read_only_onload": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/schools/doctype/course_evaluation_criteria/course_evaluation_criteria.py b/erpnext/schools/doctype/assessment_plan_criteria/assessment_plan_criteria.py
similarity index 85%
rename from erpnext/schools/doctype/course_evaluation_criteria/course_evaluation_criteria.py
rename to erpnext/schools/doctype/assessment_plan_criteria/assessment_plan_criteria.py
index b8398a3..53b477f 100644
--- a/erpnext/schools/doctype/course_evaluation_criteria/course_evaluation_criteria.py
+++ b/erpnext/schools/doctype/assessment_plan_criteria/assessment_plan_criteria.py
@@ -6,5 +6,5 @@
 import frappe
 from frappe.model.document import Document
 
-class CourseEvaluationCriteria(Document):
+class AssessmentPlanCriteria(Document):
 	pass
diff --git a/erpnext/schools/doctype/assessment_result/assessment_result.js b/erpnext/schools/doctype/assessment_result/assessment_result.js
index 265a626..0af5adc 100644
--- a/erpnext/schools/doctype/assessment_result/assessment_result.js
+++ b/erpnext/schools/doctype/assessment_result/assessment_result.js
@@ -17,7 +17,7 @@
                     frm.doc.details = [];
                     $.each(r.message, function(i, d) {
                         var row = frappe.model.add_child(frm.doc, "Assessment Result Detail", "details");
-                        row.evaluation_criteria = d.evaluation_criteria;
+                        row.assessment_criteria = d.assessment_criteria;
                         row.maximum_score = d.maximum_score;
                     });
                 }
diff --git a/erpnext/schools/doctype/assessment_result/assessment_result.py b/erpnext/schools/doctype/assessment_result/assessment_result.py
index 860dcbd..c878ec3 100644
--- a/erpnext/schools/doctype/assessment_result/assessment_result.py
+++ b/erpnext/schools/doctype/assessment_result/assessment_result.py
@@ -21,10 +21,10 @@
 		assessment_details = get_assessment_details(self.assessment_plan)
 		max_scores = {}
 		for d in assessment_details:
-			max_scores.update({d.evaluation_criteria: d.maximum_score})
+			max_scores.update({d.assessment_criteria: d.maximum_score})
 
 		for d in self.details:
-			d.maximum_score = max_scores.get(d.evaluation_criteria)
+			d.maximum_score = max_scores.get(d.assessment_criteria)
 			if d.score > d.maximum_score:
 				frappe.throw(_("Score cannot be greater than Maximum Score"))
 		
diff --git a/erpnext/schools/doctype/assessment_result_detail/assessment_result_detail.json b/erpnext/schools/doctype/assessment_result_detail/assessment_result_detail.json
index 87ce120..7956a32 100644
--- a/erpnext/schools/doctype/assessment_result_detail/assessment_result_detail.json
+++ b/erpnext/schools/doctype/assessment_result_detail/assessment_result_detail.json
@@ -17,7 +17,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 4, 
-   "fieldname": "evaluation_criteria", 
+   "fieldname": "assessment_criteria", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
@@ -25,10 +25,10 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
-   "label": "Evaluation Criteria", 
+   "label": "Assessment Criteria", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "Evaluation Criteria", 
+   "options": "Assessment Criteria", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -164,7 +164,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-12-27 16:18:12.022257", 
+ "modified": "2017-02-01 18:33:06.006040", 
  "modified_by": "Administrator", 
  "module": "Schools", 
  "name": "Assessment Result Detail", 
@@ -176,5 +176,6 @@
  "read_only_onload": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js b/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js
index c58304b..8fd670e 100644
--- a/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js
+++ b/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js
@@ -39,15 +39,15 @@
 				assessment_plan: assessment_plan
 			},
 			callback: function(r) {
-				var criterias = r.message;
+				var criteria_list = r.message;
 				var max_total_score = 0;
-				criterias.forEach(function(c) {
+				criteria_list.forEach(function(c) {
 					max_total_score += c.maximum_score
 				});
 				var result_table = $(frappe.render_template('assessment_result_tool', {
 					frm: frm,
 					students: students,
-					criterias: criterias,
+					criteria: criteria_list,
 					max_total_score: max_total_score
 				}));
 				result_table.appendTo(frm.fields_dict.result_html.wrapper)
@@ -67,7 +67,8 @@
 						value = max_score;
 					}
 					student_scores[student][criteria] = value;
-					if(Object.keys(student_scores[student]).length == criterias.length) {
+					if(Object.keys(student_scores[student]).length == criteria_list.length) {
+						console.log("ok");
 						frappe.call(({
 							method: "erpnext.schools.api.mark_assessment_result",
 							args: {
@@ -87,7 +88,7 @@
 									var criteria = $input.data().criteria;
 									var value = $input.val();
 									var grade = details.find(function(d) {
-										return d.evaluation_criteria === criteria;
+										return d.assessment_criteria === criteria;
 									}).grade;
 									$input.val(`${value} (${grade})`);
 									$input.attr('disabled', true);
diff --git a/erpnext/schools/doctype/course/course.json b/erpnext/schools/doctype/course/course.json
index 3f16619..aab3bbb 100644
--- a/erpnext/schools/doctype/course/course.json
+++ b/erpnext/schools/doctype/course/course.json
@@ -1,362 +1,364 @@
 {
-    "allow_copy": 0,
-    "allow_import": 1,
-    "allow_rename": 1,
-    "autoname": "field:course_name",
-    "beta": 0,
-    "creation": "2015-09-07 12:39:55.181893",
-    "custom": 0,
-    "docstatus": 0,
-    "doctype": "DocType",
-    "document_type": "",
-    "editable_grid": 0,
-    "engine": "InnoDB",
-    "fields": [{
-            "allow_on_submit": 0,
-            "bold": 0,
-            "collapsible": 0,
-            "columns": 0,
-            "fieldname": "course_name",
-            "fieldtype": "Data",
-            "hidden": 0,
-            "ignore_user_permissions": 0,
-            "ignore_xss_filter": 0,
-            "in_filter": 0,
-            "in_list_view": 0,
-            "in_standard_filter": 0,
-            "label": "Course Name",
-            "length": 0,
-            "no_copy": 0,
-            "permlevel": 0,
-            "precision": "",
-            "print_hide": 0,
-            "print_hide_if_no_value": 0,
-            "read_only": 0,
-            "remember_last_selected_value": 0,
-            "report_hide": 0,
-            "reqd": 1,
-            "search_index": 0,
-            "set_only_once": 0,
-            "unique": 0
-        },
-        {
-            "allow_on_submit": 0,
-            "bold": 0,
-            "collapsible": 0,
-            "columns": 0,
-            "fieldname": "course_code",
-            "fieldtype": "Data",
-            "hidden": 0,
-            "ignore_user_permissions": 0,
-            "ignore_xss_filter": 0,
-            "in_filter": 0,
-            "in_list_view": 1,
-            "in_standard_filter": 0,
-            "label": "Course Code",
-            "length": 0,
-            "no_copy": 0,
-            "permlevel": 0,
-            "precision": "",
-            "print_hide": 0,
-            "print_hide_if_no_value": 0,
-            "read_only": 0,
-            "remember_last_selected_value": 0,
-            "report_hide": 0,
-            "reqd": 0,
-            "search_index": 0,
-            "set_only_once": 0,
-            "unique": 0
-        },
-        {
-            "allow_on_submit": 0,
-            "bold": 0,
-            "collapsible": 0,
-            "columns": 0,
-            "fieldname": "column_break_3",
-            "fieldtype": "Column Break",
-            "hidden": 0,
-            "ignore_user_permissions": 0,
-            "ignore_xss_filter": 0,
-            "in_filter": 0,
-            "in_list_view": 0,
-            "in_standard_filter": 0,
-            "length": 0,
-            "no_copy": 0,
-            "permlevel": 0,
-            "precision": "",
-            "print_hide": 0,
-            "print_hide_if_no_value": 0,
-            "read_only": 0,
-            "remember_last_selected_value": 0,
-            "report_hide": 0,
-            "reqd": 0,
-            "search_index": 0,
-            "set_only_once": 0,
-            "unique": 0
-        },
-        {
-            "allow_on_submit": 0,
-            "bold": 0,
-            "collapsible": 0,
-            "columns": 0,
-            "fieldname": "course_abbreviation",
-            "fieldtype": "Data",
-            "hidden": 0,
-            "ignore_user_permissions": 0,
-            "ignore_xss_filter": 0,
-            "in_filter": 0,
-            "in_list_view": 0,
-            "in_standard_filter": 0,
-            "label": "Course Abbreviation",
-            "length": 0,
-            "no_copy": 0,
-            "permlevel": 0,
-            "precision": "",
-            "print_hide": 0,
-            "print_hide_if_no_value": 0,
-            "read_only": 0,
-            "remember_last_selected_value": 0,
-            "report_hide": 0,
-            "reqd": 0,
-            "search_index": 0,
-            "set_only_once": 0,
-            "unique": 0
-        },
-        {
-            "allow_on_submit": 0,
-            "bold": 0,
-            "collapsible": 0,
-            "columns": 0,
-            "fieldname": "department",
-            "fieldtype": "Link",
-            "hidden": 0,
-            "ignore_user_permissions": 0,
-            "ignore_xss_filter": 0,
-            "in_filter": 0,
-            "in_list_view": 1,
-            "in_standard_filter": 1,
-            "label": "Department",
-            "length": 0,
-            "no_copy": 0,
-            "options": "Department",
-            "permlevel": 0,
-            "precision": "",
-            "print_hide": 0,
-            "print_hide_if_no_value": 0,
-            "read_only": 0,
-            "remember_last_selected_value": 0,
-            "report_hide": 0,
-            "reqd": 0,
-            "search_index": 0,
-            "set_only_once": 0,
-            "unique": 0
-        },
-        {
-            "allow_on_submit": 0,
-            "bold": 0,
-            "collapsible": 0,
-            "columns": 0,
-            "fieldname": "section_break_6",
-            "fieldtype": "Section Break",
-            "hidden": 0,
-            "ignore_user_permissions": 0,
-            "ignore_xss_filter": 0,
-            "in_filter": 0,
-            "in_list_view": 0,
-            "in_standard_filter": 0,
-            "length": 0,
-            "no_copy": 0,
-            "permlevel": 0,
-            "precision": "",
-            "print_hide": 0,
-            "print_hide_if_no_value": 0,
-            "read_only": 0,
-            "remember_last_selected_value": 0,
-            "report_hide": 0,
-            "reqd": 0,
-            "search_index": 0,
-            "set_only_once": 0,
-            "unique": 0
-        },
-        {
-            "allow_on_submit": 0,
-            "bold": 0,
-            "collapsible": 0,
-            "columns": 0,
-            "fieldname": "course_intro",
-            "fieldtype": "Text Editor",
-            "hidden": 0,
-            "ignore_user_permissions": 0,
-            "ignore_xss_filter": 0,
-            "in_filter": 0,
-            "in_list_view": 0,
-            "in_standard_filter": 0,
-            "label": "Course Intro",
-            "length": 0,
-            "no_copy": 0,
-            "permlevel": 0,
-            "precision": "",
-            "print_hide": 0,
-            "print_hide_if_no_value": 0,
-            "read_only": 0,
-            "remember_last_selected_value": 0,
-            "report_hide": 0,
-            "reqd": 0,
-            "search_index": 0,
-            "set_only_once": 0,
-            "unique": 0
-        },
-        {
-            "allow_on_submit": 0,
-            "bold": 0,
-            "collapsible": 0,
-            "columns": 0,
-            "fieldname": "assessment",
-            "fieldtype": "Section Break",
-            "hidden": 0,
-            "ignore_user_permissions": 0,
-            "ignore_xss_filter": 0,
-            "in_filter": 0,
-            "in_list_view": 0,
-            "in_standard_filter": 0,
-            "label": "Assessment",
-            "length": 0,
-            "no_copy": 0,
-            "permlevel": 0,
-            "precision": "",
-            "print_hide": 0,
-            "print_hide_if_no_value": 0,
-            "read_only": 0,
-            "remember_last_selected_value": 0,
-            "report_hide": 0,
-            "reqd": 0,
-            "search_index": 0,
-            "set_only_once": 0,
-            "unique": 0
-        },
-        {
-            "allow_on_submit": 0,
-            "bold": 0,
-            "collapsible": 0,
-            "columns": 0,
-            "fieldname": "default_grading_scale",
-            "fieldtype": "Link",
-            "hidden": 0,
-            "ignore_user_permissions": 0,
-            "ignore_xss_filter": 0,
-            "in_filter": 0,
-            "in_list_view": 0,
-            "in_standard_filter": 0,
-            "label": "Default Grading Scale",
-            "length": 0,
-            "no_copy": 0,
-            "options": "Grading Scale",
-            "permlevel": 0,
-            "precision": "",
-            "print_hide": 0,
-            "print_hide_if_no_value": 0,
-            "read_only": 0,
-            "remember_last_selected_value": 0,
-            "report_hide": 0,
-            "reqd": 0,
-            "search_index": 0,
-            "set_only_once": 0,
-            "unique": 0
-        },
-        {
-            "allow_on_submit": 0,
-            "bold": 0,
-            "collapsible": 0,
-            "columns": 0,
-            "fieldname": "evaluation_criterias",
-            "fieldtype": "Table",
-            "hidden": 0,
-            "ignore_user_permissions": 0,
-            "ignore_xss_filter": 0,
-            "in_filter": 0,
-            "in_list_view": 0,
-            "in_standard_filter": 0,
-            "label": "Evaluation Criterias",
-            "length": 0,
-            "no_copy": 0,
-            "options": "Course Evaluation Criteria",
-            "permlevel": 0,
-            "precision": "",
-            "print_hide": 0,
-            "print_hide_if_no_value": 0,
-            "read_only": 0,
-            "remember_last_selected_value": 0,
-            "report_hide": 0,
-            "reqd": 0,
-            "search_index": 0,
-            "set_only_once": 0,
-            "unique": 0
-        }
-    ],
-    "hide_heading": 0,
-    "hide_toolbar": 0,
-    "idx": 0,
-    "image_view": 0,
-    "in_create": 0,
-    "in_dialog": 0,
-    "is_submittable": 0,
-    "issingle": 0,
-    "istable": 0,
-    "max_attachments": 0,
-    "menu_index": 0,
-    "modified": "2016-12-14 16:48:16.642813",
-    "modified_by": "Administrator",
-    "module": "Schools",
-    "name": "Course",
-    "name_case": "",
-    "owner": "Administrator",
-    "permissions": [{
-            "amend": 0,
-            "apply_user_permissions": 0,
-            "cancel": 0,
-            "create": 1,
-            "delete": 1,
-            "email": 1,
-            "export": 1,
-            "if_owner": 0,
-            "import": 0,
-            "is_custom": 0,
-            "permlevel": 0,
-            "print": 1,
-            "read": 1,
-            "report": 1,
-            "role": "Academics User",
-            "set_user_permissions": 0,
-            "share": 1,
-            "submit": 0,
-            "write": 1
-        },
-        {
-            "amend": 0,
-            "apply_user_permissions": 0,
-            "cancel": 0,
-            "create": 1,
-            "delete": 1,
-            "email": 1,
-            "export": 1,
-            "if_owner": 0,
-            "import": 0,
-            "permlevel": 0,
-            "print": 1,
-            "read": 1,
-            "report": 1,
-            "role": "HR Manager",
-            "set_user_permissions": 0,
-            "share": 1,
-            "submit": 0,
-            "write": 1
-        }
-    ],
-    "quick_entry": 0,
-    "read_only": 0,
-    "read_only_onload": 0,
-    "search_fields": "department",
-    "sort_field": "modified",
-    "sort_order": "DESC",
-    "track_seen": 0
+ "allow_copy": 0, 
+ "allow_import": 1, 
+ "allow_rename": 1, 
+ "autoname": "field:course_name", 
+ "beta": 0, 
+ "creation": "2015-09-07 12:39:55.181893", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 0, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "course_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Course Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "course_code", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Course Code", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_3", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "course_abbreviation", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Course Abbreviation", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "department", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 1, 
+   "label": "Department", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Department", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_6", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "course_intro", 
+   "fieldtype": "Text Editor", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Course Intro", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "assessment", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Assessment", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "default_grading_scale", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Default Grading Scale", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Grading Scale", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "assessment_criteria", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Assessment Criteria", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Course Assessment Criteria", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }
+ ], 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "in_dialog": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "menu_index": 0, 
+ "modified": "2017-02-01 17:24:52.874364", 
+ "modified_by": "Administrator", 
+ "module": "Schools", 
+ "name": "Course", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Academics User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }, 
+  {
+   "amend": 0, 
+   "apply_user_permissions": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "HR Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "search_fields": "department", 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 0, 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/schools/doctype/course/course.py b/erpnext/schools/doctype/course/course.py
index 3baccdf..0ac11ec 100644
--- a/erpnext/schools/doctype/course/course.py
+++ b/erpnext/schools/doctype/course/course.py
@@ -9,12 +9,12 @@
 
 class Course(Document):
 	def validate(self):
-		self.validate_evaluation_criterias()
+		self.validate_assessment_criteria()
 	
-	def validate_evaluation_criterias(self):
-		if self.evaluation_criterias:
+	def validate_assessment_criteria(self):
+		if self.assessment_criteria:
 			total_weightage = 0
-			for criteria in self.evaluation_criterias:
+			for criteria in self.assessment_criteria:
 				total_weightage += criteria.weightage
 			if total_weightage != 100:
-				frappe.throw(_("Total Weightage of all Evaluation Criterias must be 100%"))
+				frappe.throw(_("Total Weightage of all Assessment Criteria must be 100%"))
diff --git a/erpnext/schools/doctype/course_evaluation_criteria/__init__.py b/erpnext/schools/doctype/course_assessment_criteria/__init__.py
similarity index 100%
rename from erpnext/schools/doctype/course_evaluation_criteria/__init__.py
rename to erpnext/schools/doctype/course_assessment_criteria/__init__.py
diff --git a/erpnext/schools/doctype/course_evaluation_criteria/course_evaluation_criteria.json b/erpnext/schools/doctype/course_assessment_criteria/course_assessment_criteria.json
similarity index 91%
rename from erpnext/schools/doctype/course_evaluation_criteria/course_evaluation_criteria.json
rename to erpnext/schools/doctype/course_assessment_criteria/course_assessment_criteria.json
index a4d3ce4..6646d20 100644
--- a/erpnext/schools/doctype/course_evaluation_criteria/course_evaluation_criteria.json
+++ b/erpnext/schools/doctype/course_assessment_criteria/course_assessment_criteria.json
@@ -17,7 +17,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "evaluation_criteria", 
+   "fieldname": "assessment_criteria", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
@@ -25,10 +25,10 @@
    "in_filter": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
-   "label": "Evaluation Criteria", 
+   "label": "Assessment Criteria", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "Evaluation Criteria", 
+   "options": "Assessment Criteria", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -108,10 +108,10 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-12-14 16:59:17.353023", 
+ "modified": "2017-02-01 18:01:40.682674", 
  "modified_by": "Administrator", 
  "module": "Schools", 
- "name": "Course Evaluation Criteria", 
+ "name": "Course Assessment Criteria", 
  "name_case": "", 
  "owner": "Administrator", 
  "permissions": [], 
@@ -120,5 +120,6 @@
  "read_only_onload": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/schools/doctype/course_evaluation_criteria/course_evaluation_criteria.py b/erpnext/schools/doctype/course_assessment_criteria/course_assessment_criteria.py
similarity index 85%
copy from erpnext/schools/doctype/course_evaluation_criteria/course_evaluation_criteria.py
copy to erpnext/schools/doctype/course_assessment_criteria/course_assessment_criteria.py
index b8398a3..ade2a39 100644
--- a/erpnext/schools/doctype/course_evaluation_criteria/course_evaluation_criteria.py
+++ b/erpnext/schools/doctype/course_assessment_criteria/course_assessment_criteria.py
@@ -6,5 +6,5 @@
 import frappe
 from frappe.model.document import Document
 
-class CourseEvaluationCriteria(Document):
+class CourseAssessmentCriteria(Document):
 	pass
diff --git a/erpnext/schools/doctype/evaluation_criteria/__init__.py b/erpnext/schools/doctype/evaluation_criteria/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/erpnext/schools/doctype/evaluation_criteria/__init__.py
+++ /dev/null
diff --git a/erpnext/schools/doctype/evaluation_criteria/test_records.json b/erpnext/schools/doctype/evaluation_criteria/test_records.json
deleted file mode 100644
index 64ff701..0000000
--- a/erpnext/schools/doctype/evaluation_criteria/test_records.json
+++ /dev/null
@@ -1,8 +0,0 @@
-[
- {
-  "evaluation_criteria": "_Test Evaluation Criteria"
- }, 
- {
-  "evaluation_criteria": "_Test Evaluation Criteria 1"
- }
-]
\ No newline at end of file