diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 09ff777..c1813dc 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -301,3 +301,4 @@
 erpnext.patches.v7_0.setup_account_table_for_expense_claim_type_if_exists
 erpnext.patches.v7_0.migrate_schools_to_erpnext
 erpnext.patches.v7_0.remove_administrator_role_in_doctypes
+erpnext.patches.v7_0.rename_fee_amount_to_fee_component
diff --git a/erpnext/patches/v7_0/rename_fee_amount_to_fee_component.py b/erpnext/patches/v7_0/rename_fee_amount_to_fee_component.py
new file mode 100644
index 0000000..662a260
--- /dev/null
+++ b/erpnext/patches/v7_0/rename_fee_amount_to_fee_component.py
@@ -0,0 +1,15 @@
+# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+
+from frappe.model.utils.rename_field import rename_field
+
+def execute():
+	frappe.rename_doc("DocType", "Fee Amount", "Fee Component")
+	for dt in ("Fees", "Fee Structure"):
+		frappe.reload_doctype(dt)
+		rename_field(dt, "amount", "components")
+		
+	
\ No newline at end of file
diff --git a/erpnext/schools/doctype/fee_category/fee_category.json b/erpnext/schools/doctype/fee_category/fee_category.json
index 0224629..4314aae 100644
--- a/erpnext/schools/doctype/fee_category/fee_category.json
+++ b/erpnext/schools/doctype/fee_category/fee_category.json
@@ -79,7 +79,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-07-25 05:24:22.972715", 
+ "modified": "2016-07-25 08:42:24.309236", 
  "modified_by": "Administrator", 
  "module": "Schools", 
  "name": "Fee Category", 
diff --git a/erpnext/schools/doctype/fee_amount/__init__.py b/erpnext/schools/doctype/fee_component/__init__.py
similarity index 100%
rename from erpnext/schools/doctype/fee_amount/__init__.py
rename to erpnext/schools/doctype/fee_component/__init__.py
diff --git a/erpnext/schools/doctype/fee_amount/fee_amount.json b/erpnext/schools/doctype/fee_component/fee_component.json
similarity index 95%
rename from erpnext/schools/doctype/fee_amount/fee_amount.json
rename to erpnext/schools/doctype/fee_component/fee_component.json
index 942b6ef..c0f7bd6 100644
--- a/erpnext/schools/doctype/fee_amount/fee_amount.json
+++ b/erpnext/schools/doctype/fee_component/fee_component.json
@@ -104,10 +104,10 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2016-07-21 12:25:44.368245", 
- "modified_by": "r@r.com", 
+ "modified": "2016-07-25 08:43:25.405166", 
+ "modified_by": "Administrator", 
  "module": "Schools", 
- "name": "Fee Amount", 
+ "name": "Fee Component", 
  "name_case": "", 
  "owner": "Administrator", 
  "permissions": [], 
diff --git a/erpnext/schools/doctype/fee_amount/fee_amount.py b/erpnext/schools/doctype/fee_component/fee_component.py
similarity index 64%
rename from erpnext/schools/doctype/fee_amount/fee_amount.py
rename to erpnext/schools/doctype/fee_component/fee_component.py
index a26e1d9..8694610 100644
--- a/erpnext/schools/doctype/fee_amount/fee_amount.py
+++ b/erpnext/schools/doctype/fee_component/fee_component.py
@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
-# Copyright (c) 2015, Frappe Technologies and contributors
+# 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 FeeAmount(Document):
+class FeeComponent(Document):
 	pass
diff --git a/erpnext/schools/doctype/fee_structure/fee_structure.json b/erpnext/schools/doctype/fee_structure/fee_structure.json
index 51e48d2..d6c5a7f 100644
--- a/erpnext/schools/doctype/fee_structure/fee_structure.json
+++ b/erpnext/schools/doctype/fee_structure/fee_structure.json
@@ -146,17 +146,17 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "amount", 
+   "fieldname": "components", 
    "fieldtype": "Table", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Amount", 
+   "label": "Components", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "Fee Amount", 
+   "options": "Fee Component", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -230,7 +230,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-07-25 01:25:22.796777", 
+ "modified": "2016-07-25 08:44:07.886467", 
  "modified_by": "Administrator", 
  "module": "Schools", 
  "name": "Fee Structure", 
diff --git a/erpnext/schools/doctype/fees/fees.json b/erpnext/schools/doctype/fees/fees.json
index 49ab8b9..75e3315 100644
--- a/erpnext/schools/doctype/fees/fees.json
+++ b/erpnext/schools/doctype/fees/fees.json
@@ -295,17 +295,17 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "fieldname": "amount", 
+   "fieldname": "components", 
    "fieldtype": "Table", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 0, 
-   "label": "Amount", 
+   "label": "Components", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "Fee Amount", 
+   "options": "Fee Component", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -478,7 +478,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-07-25 01:27:43.220809", 
+ "modified": "2016-07-25 08:44:33.595812", 
  "modified_by": "Administrator", 
  "module": "Schools", 
  "name": "Fees",