diff --git a/erpnext/domains/non_profit.py b/erpnext/domains/non_profit.py
index 3c669bd81d..8b8754a9b4 100644
--- a/erpnext/domains/non_profit.py
+++ b/erpnext/domains/non_profit.py
@@ -7,5 +7,5 @@ data = {
 	'modules': [
 		'Non Profit'
 	],
-	'default_portal_role': 'System Manager'
+	'default_portal_role': 'Non Profit Manager'
 }
\ No newline at end of file
diff --git a/erpnext/non_profit/doctype/chapter/chapter.json b/erpnext/non_profit/doctype/chapter/chapter.json
index 5fe88e26a8..af4b91b977 100644
--- a/erpnext/non_profit/doctype/chapter/chapter.json
+++ b/erpnext/non_profit/doctype/chapter/chapter.json
@@ -386,7 +386,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-12-05 05:05:59.510432", 
+ "modified": "2017-12-05 07:04:18.311063", 
  "modified_by": "Administrator", 
  "module": "Non Profit", 
  "name": "Chapter", 
@@ -407,7 +407,7 @@
    "print": 1, 
    "read": 1, 
    "report": 1, 
-   "role": "System Manager", 
+   "role": "Non Profit Manager", 
    "set_user_permissions": 0, 
    "share": 1, 
    "submit": 0, 
diff --git a/erpnext/non_profit/doctype/donor/donor.json b/erpnext/non_profit/doctype/donor/donor.json
index 2754ccefda..c940bda4af 100644
--- a/erpnext/non_profit/doctype/donor/donor.json
+++ b/erpnext/non_profit/doctype/donor/donor.json
@@ -295,7 +295,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-12-05 05:24:28.383278", 
+ "modified": "2017-12-05 07:02:06.690416", 
  "modified_by": "Administrator", 
  "module": "Non Profit", 
  "name": "Donor", 
@@ -316,7 +316,7 @@
    "print": 1, 
    "read": 1, 
    "report": 1, 
-   "role": "System Manager", 
+   "role": "Non Profit Manager", 
    "set_user_permissions": 0, 
    "share": 1, 
    "submit": 0, 
diff --git a/erpnext/non_profit/doctype/donor_type/donor_type.json b/erpnext/non_profit/doctype/donor_type/donor_type.json
index 509d904ee8..07118fdc82 100644
--- a/erpnext/non_profit/doctype/donor_type/donor_type.json
+++ b/erpnext/non_profit/doctype/donor_type/donor_type.json
@@ -54,7 +54,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-11-20 17:43:50.591577", 
+ "modified": "2017-12-05 07:04:36.757595", 
  "modified_by": "Administrator", 
  "module": "Non Profit", 
  "name": "Donor Type", 
@@ -75,7 +75,7 @@
    "print": 1, 
    "read": 1, 
    "report": 1, 
-   "role": "System Manager", 
+   "role": "Non Profit Manager", 
    "set_user_permissions": 0, 
    "share": 1, 
    "submit": 0, 
diff --git a/erpnext/non_profit/doctype/grant_application/grant_application.json b/erpnext/non_profit/doctype/grant_application/grant_application.json
index 714f00b5f6..cadbf13c2f 100644
--- a/erpnext/non_profit/doctype/grant_application/grant_application.json
+++ b/erpnext/non_profit/doctype/grant_application/grant_application.json
@@ -899,7 +899,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-12-05 06:48:14.804480", 
+ "modified": "2017-12-05 06:59:50.313267", 
  "modified_by": "Administrator", 
  "module": "Non Profit", 
  "name": "Grant Application", 
@@ -920,27 +920,7 @@
    "print": 1, 
    "read": 1, 
    "report": 1, 
-   "role": "System Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }, 
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 0, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Website Manager", 
+   "role": "Non Profit Manager", 
    "set_user_permissions": 0, 
    "share": 1, 
    "submit": 0, 
diff --git a/erpnext/non_profit/doctype/grant_application/grant_application_list.js b/erpnext/non_profit/doctype/grant_application/grant_application_list.js
index 366a93433a..ef06c7169f 100644
--- a/erpnext/non_profit/doctype/grant_application/grant_application_list.js
+++ b/erpnext/non_profit/doctype/grant_application/grant_application_list.js
@@ -1,3 +1,3 @@
 frappe.listview_settings['Grant Application'] = {
-	add_fields: ["grant_applicant_name", "image"],
+	add_fields: ["name", "image"],
 };
diff --git a/erpnext/non_profit/doctype/grant_application/test_grant_application.js b/erpnext/non_profit/doctype/grant_application/test_grant_application.js
index 78d48d3075..a5a94d1b7c 100644
--- a/erpnext/non_profit/doctype/grant_application/test_grant_application.js
+++ b/erpnext/non_profit/doctype/grant_application/test_grant_application.js
@@ -13,7 +13,7 @@ QUnit.test("test: Grant Application", function (assert) {
 		() => frappe.tests.make('Grant Application', [
 			// values to be set
 			{title: 'Test Organization'},
-			{grant_applicant_name:'Test Applicant'},
+			{name:'Test Applicant'},
 			{email: 'test@example.com'},
 			{grant_description:'Test message'},
 			{grant_purpose: 'Test Meesage'},
diff --git a/erpnext/non_profit/doctype/member/member.json b/erpnext/non_profit/doctype/member/member.json
index 377580e8b0..1c6b9fc656 100644
--- a/erpnext/non_profit/doctype/member/member.json
+++ b/erpnext/non_profit/doctype/member/member.json
@@ -325,7 +325,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-12-05 05:11:40.009104", 
+ "modified": "2017-12-05 07:03:21.606732", 
  "modified_by": "Administrator", 
  "module": "Non Profit", 
  "name": "Member", 
@@ -346,7 +346,27 @@
    "print": 1, 
    "read": 1, 
    "report": 1, 
-   "role": "System Manager", 
+   "role": "Non Profit Manager", 
+   "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": "Non Profit Member", 
    "set_user_permissions": 0, 
    "share": 1, 
    "submit": 0, 
diff --git a/erpnext/non_profit/doctype/membership/membership.json b/erpnext/non_profit/doctype/membership/membership.json
index 5a0c96f827..42e084d54f 100644
--- a/erpnext/non_profit/doctype/membership/membership.json
+++ b/erpnext/non_profit/doctype/membership/membership.json
@@ -416,7 +416,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-12-05 05:18:08.630315", 
+ "modified": "2017-12-05 07:02:56.859408", 
  "modified_by": "Administrator", 
  "module": "Non Profit", 
  "name": "Membership", 
@@ -437,7 +437,27 @@
    "print": 1, 
    "read": 1, 
    "report": 1, 
-   "role": "System Manager", 
+   "role": "Non Profit Manager", 
+   "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": "Non Profit Member", 
    "set_user_permissions": 0, 
    "share": 1, 
    "submit": 0, 
diff --git a/erpnext/non_profit/doctype/membership_type/membership_type.json b/erpnext/non_profit/doctype/membership_type/membership_type.json
index a762657161..35a7902c9f 100644
--- a/erpnext/non_profit/doctype/membership_type/membership_type.json
+++ b/erpnext/non_profit/doctype/membership_type/membership_type.json
@@ -84,7 +84,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-11-20 17:43:09.842510", 
+ "modified": "2017-12-05 07:03:45.860757", 
  "modified_by": "Administrator", 
  "module": "Non Profit", 
  "name": "Membership Type", 
@@ -105,7 +105,7 @@
    "print": 1, 
    "read": 1, 
    "report": 1, 
-   "role": "System Manager", 
+   "role": "Non Profit Manager", 
    "set_user_permissions": 0, 
    "share": 1, 
    "submit": 0, 
diff --git a/erpnext/non_profit/doctype/volunteer/volunteer.json b/erpnext/non_profit/doctype/volunteer/volunteer.json
index 53ae420508..93bb2bb454 100644
--- a/erpnext/non_profit/doctype/volunteer/volunteer.json
+++ b/erpnext/non_profit/doctype/volunteer/volunteer.json
@@ -475,7 +475,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-12-05 05:23:27.002410", 
+ "modified": "2017-12-05 07:02:20.794687", 
  "modified_by": "Administrator", 
  "module": "Non Profit", 
  "name": "Volunteer", 
@@ -496,7 +496,7 @@
    "print": 1, 
    "read": 1, 
    "report": 1, 
-   "role": "System Manager", 
+   "role": "Non Profit Manager", 
    "set_user_permissions": 0, 
    "share": 1, 
    "submit": 0, 
diff --git a/erpnext/non_profit/doctype/volunteer_type/volunteer_type.json b/erpnext/non_profit/doctype/volunteer_type/volunteer_type.json
index f3ece0fe49..f4407e2bfc 100644
--- a/erpnext/non_profit/doctype/volunteer_type/volunteer_type.json
+++ b/erpnext/non_profit/doctype/volunteer_type/volunteer_type.json
@@ -84,7 +84,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-11-20 17:43:18.565649", 
+ "modified": "2017-12-05 07:05:39.920865", 
  "modified_by": "Administrator", 
  "module": "Non Profit", 
  "name": "Volunteer Type", 
@@ -105,7 +105,7 @@
    "print": 1, 
    "read": 1, 
    "report": 1, 
-   "role": "System Manager", 
+   "role": "Non Profit Manager", 
    "set_user_permissions": 0, 
    "share": 1, 
    "submit": 0,