diff --git a/erpnext/config/hr.py b/erpnext/config/hr.py
index 2e60061..72fe8dd 100644
--- a/erpnext/config/hr.py
+++ b/erpnext/config/hr.py
@@ -60,7 +60,7 @@
 			"items": [
 				{
 					"type": "doctype",
-					"name": "Salary Manager",
+					"name": "Process Payroll",
 					"label": _("Process Payroll"),
 					"description":_("Generate Salary Slips"),
 					"hide_count": True
diff --git a/erpnext/hr/doctype/process_payroll/__init__.py b/erpnext/hr/doctype/process_payroll/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/erpnext/hr/doctype/process_payroll/__init__.py
diff --git a/erpnext/hr/doctype/salary_manager/salary_manager.js b/erpnext/hr/doctype/process_payroll/process_payroll.js
similarity index 95%
rename from erpnext/hr/doctype/salary_manager/salary_manager.js
rename to erpnext/hr/doctype/process_payroll/process_payroll.js
index ca70226..d882349 100644
--- a/erpnext/hr/doctype/salary_manager/salary_manager.js
+++ b/erpnext/hr/doctype/process_payroll/process_payroll.js
@@ -59,6 +59,6 @@
 }
 
 
-frappe.ui.form.on("Salary Manager", "refresh", function(frm) {
+frappe.ui.form.on("Process Payroll", "refresh", function(frm) {
 	frm.disable_save();
 });
diff --git a/erpnext/hr/doctype/salary_manager/salary_manager.json b/erpnext/hr/doctype/process_payroll/process_payroll.json
similarity index 97%
rename from erpnext/hr/doctype/salary_manager/salary_manager.json
rename to erpnext/hr/doctype/process_payroll/process_payroll.json
index 93ee138..36e858c 100644
--- a/erpnext/hr/doctype/salary_manager/salary_manager.json
+++ b/erpnext/hr/doctype/process_payroll/process_payroll.json
@@ -154,10 +154,10 @@
  "icon": "icon-cog", 
  "idx": 1, 
  "issingle": 1, 
- "modified": "2015-06-05 11:33:00.152362", 
+ "modified": "2015-07-07 07:16:02.380839", 
  "modified_by": "Administrator", 
  "module": "HR", 
- "name": "Salary Manager", 
+ "name": "Process Payroll", 
  "owner": "Administrator", 
  "permissions": [
   {
diff --git a/erpnext/hr/doctype/salary_manager/salary_manager.py b/erpnext/hr/doctype/process_payroll/process_payroll.py
similarity index 98%
rename from erpnext/hr/doctype/salary_manager/salary_manager.py
rename to erpnext/hr/doctype/process_payroll/process_payroll.py
index 3e0b53e..4900bd0 100644
--- a/erpnext/hr/doctype/salary_manager/salary_manager.py
+++ b/erpnext/hr/doctype/process_payroll/process_payroll.py
@@ -8,7 +8,7 @@
 
 from frappe.model.document import Document
 
-class SalaryManager(Document):
+class ProcessPayroll(Document):
 
 	def get_emp_list(self):
 		"""
diff --git a/erpnext/hr/doctype/salary_manager/README.md b/erpnext/hr/doctype/salary_manager/README.md
deleted file mode 100644
index 040d038..0000000
--- a/erpnext/hr/doctype/salary_manager/README.md
+++ /dev/null
@@ -1 +0,0 @@
-Tool to issue monthly Salary Slips to all Employees.
\ No newline at end of file
diff --git a/erpnext/hr/doctype/salary_manager/__init__.py b/erpnext/hr/doctype/salary_manager/__init__.py
deleted file mode 100644
index f24df48..0000000
--- a/erpnext/hr/doctype/salary_manager/__init__.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# ERPNext - web based ERP (http://erpnext.com)
-# Copyright (C) 2012 Frappe Technologies Pvt Ltd
-# 
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-from __future__ import unicode_literals
-from frappe import ValidationError
-
-class SalarySlipExistsError(ValidationError): pass
-
diff --git a/erpnext/hr/doctype/salary_slip/salary_slip.py b/erpnext/hr/doctype/salary_slip/salary_slip.py
index dd54490..24079c1 100644
--- a/erpnext/hr/doctype/salary_slip/salary_slip.py
+++ b/erpnext/hr/doctype/salary_slip/salary_slip.py
@@ -49,7 +49,7 @@
 		if not self.month:
 			self.month = "%02d" % getdate(nowdate()).month
 
-		m = frappe.get_doc('Salary Manager').get_month_details(self.fiscal_year, self.month)
+		m = frappe.get_doc('Process Payroll').get_month_details(self.fiscal_year, self.month)
 		holidays = self.get_holidays_for_employee(m)
 
 		if not cint(frappe.db.get_value("HR Settings", "HR Settings",
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 2b430a0..26c1d7b 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -174,3 +174,4 @@
 erpnext.patches.v5_1.fix_credit_days_based_on
 erpnext.patches.v5_1.track_operations
 erpnext.patches.v5_1.sales_bom_rename
+execute:frappe.rename_doc("DocType", "Salary Manager", "Process Payroll", force=True)