diff --git a/erpnext/patches/v12_0/set_priority_for_support.py b/erpnext/patches/v12_0/set_priority_for_support.py
index e61fbab..21bb400 100644
--- a/erpnext/patches/v12_0/set_priority_for_support.py
+++ b/erpnext/patches/v12_0/set_priority_for_support.py
@@ -54,7 +54,7 @@
 			doc = frappe.get_doc("Service Level Agreement", service_level_agreement.name)
 
 			if doc.customer:
-				doc.apply_to = "Customer"
+				doc.entity_type = "Customer"
 				doc.entity = doc.customer
 
 			doc.append("priorities", {
diff --git a/erpnext/support/doctype/service_level_agreement/service_level_agreement.json b/erpnext/support/doctype/service_level_agreement/service_level_agreement.json
index f7505d6..17ccb5c 100644
--- a/erpnext/support/doctype/service_level_agreement/service_level_agreement.json
+++ b/erpnext/support/doctype/service_level_agreement/service_level_agreement.json
@@ -11,8 +11,8 @@
   "column_break_2",
   "employee_group",
   "default_priority",
-  "apply_to_section",
-  "apply_to",
+  "entity_section",
+  "entity_type",
   "column_break_10",
   "entity",
   "agreement_details_section",
@@ -128,19 +128,6 @@
    "read_only": 1
   },
   {
-   "depends_on": "eval: !doc.default_service_level_agreement",
-   "fieldname": "apply_to_section",
-   "fieldtype": "Section Break",
-   "label": "Apply To"
-  },
-  {
-   "fieldname": "apply_to",
-   "fieldtype": "Select",
-   "in_standard_filter": 1,
-   "label": "Apply To",
-   "options": "\nCustomer\nCustomer Group\nTerritory"
-  },
-  {
    "fieldname": "column_break_10",
    "fieldtype": "Column Break"
   },
@@ -150,10 +137,23 @@
    "in_list_view": 1,
    "in_standard_filter": 1,
    "label": "Entity",
-   "options": "apply_to"
+   "options": "entity_type"
+  },
+  {
+   "depends_on": "eval: !doc.default_service_level_agreement",
+   "fieldname": "entity_section",
+   "fieldtype": "Section Break",
+   "label": "Entity"
+  },
+  {
+   "fieldname": "entity_type",
+   "fieldtype": "Select",
+   "in_standard_filter": 1,
+   "label": "Entity Type",
+   "options": "\nCustomer\nCustomer Group\nTerritory"
   }
  ],
- "modified": "2019-06-10 11:32:47.778830",
+ "modified": "2019-06-20 10:34:58.634693",
  "modified_by": "Administrator",
  "module": "Support",
  "name": "Service Level Agreement",
diff --git a/erpnext/support/doctype/service_level_agreement/test_service_level_agreement.py b/erpnext/support/doctype/service_level_agreement/test_service_level_agreement.py
index e04265f..6aa5394 100644
--- a/erpnext/support/doctype/service_level_agreement/test_service_level_agreement.py
+++ b/erpnext/support/doctype/service_level_agreement/test_service_level_agreement.py
@@ -15,11 +15,11 @@
 		# Default Service Level Agreement
 		create_default_service_level_agreement = create_service_level_agreement(default_service_level_agreement=1,
 			service_level="__Test Service Level", holiday_list="__Test Holiday List", employee_group="_Test Employee Group",
-			apply_to=None, entity=None, response_time=4, resolution_time=6)
+			entity_type=None, entity=None, response_time=4, resolution_time=6)
 		get_default_service_level_agreement = get_service_level_agreement(default_service_level_agreement=1)
 
 		self.assertEqual(create_default_service_level_agreement.name, get_default_service_level_agreement.name)
-		self.assertEqual(create_default_service_level_agreement.apply_to, get_default_service_level_agreement.apply_to)
+		self.assertEqual(create_default_service_level_agreement.entity_type, get_default_service_level_agreement.entity_type)
 		self.assertEqual(create_default_service_level_agreement.entity, get_default_service_level_agreement.entity)
 		self.assertEqual(create_default_service_level_agreement.default_service_level_agreement, get_default_service_level_agreement.default_service_level_agreement)
 
@@ -27,11 +27,11 @@
 		customer = create_customer()
 		create_customer_service_level_agreement = create_service_level_agreement(default_service_level_agreement=0,
 			service_level="_Test Service Level", holiday_list="__Test Holiday List", employee_group="_Test Employee Group",
-			apply_to="Customer", entity=customer, response_time=2, resolution_time=3)
-		get_customer_service_level_agreement = get_service_level_agreement(apply_to="Customer", entity=customer)
+			entity_type="Customer", entity=customer, response_time=2, resolution_time=3)
+		get_customer_service_level_agreement = get_service_level_agreement(entity_type="Customer", entity=customer)
 
 		self.assertEqual(create_customer_service_level_agreement.name, get_customer_service_level_agreement.name)
-		self.assertEqual(create_customer_service_level_agreement.apply_to, get_customer_service_level_agreement.apply_to)
+		self.assertEqual(create_customer_service_level_agreement.entity_type, get_customer_service_level_agreement.entity_type)
 		self.assertEqual(create_customer_service_level_agreement.entity, get_customer_service_level_agreement.entity)
 		self.assertEqual(create_customer_service_level_agreement.default_service_level_agreement, get_customer_service_level_agreement.default_service_level_agreement)
 
@@ -39,11 +39,11 @@
 		customer_group = create_customer_group()
 		create_customer_group_service_level_agreement = create_service_level_agreement(default_service_level_agreement=0,
 			service_level="_Test Service Level", holiday_list="__Test Holiday List", employee_group="_Test Employee Group",
-			apply_to="Customer Group", entity=customer_group, response_time=2, resolution_time=3)
-		get_customer_group_service_level_agreement = get_service_level_agreement(apply_to="Customer Group", entity=customer_group)
+			entity_type="Customer Group", entity=customer_group, response_time=2, resolution_time=3)
+		get_customer_group_service_level_agreement = get_service_level_agreement(entity_type="Customer Group", entity=customer_group)
 
 		self.assertEqual(create_customer_group_service_level_agreement.name, get_customer_group_service_level_agreement.name)
-		self.assertEqual(create_customer_group_service_level_agreement.apply_to, get_customer_group_service_level_agreement.apply_to)
+		self.assertEqual(create_customer_group_service_level_agreement.entity_type, get_customer_group_service_level_agreement.entity_type)
 		self.assertEqual(create_customer_group_service_level_agreement.entity, get_customer_group_service_level_agreement.entity)
 		self.assertEqual(create_customer_group_service_level_agreement.default_service_level_agreement, get_customer_group_service_level_agreement.default_service_level_agreement)
 
@@ -51,26 +51,26 @@
 		territory = create_territory()
 		create_territory_service_level_agreement = create_service_level_agreement(default_service_level_agreement=0,
 			service_level="_Test Service Level", holiday_list="__Test Holiday List", employee_group="_Test Employee Group",
-			apply_to="Territory", entity=territory, response_time=2, resolution_time=3)
-		get_territory_service_level_agreement = get_service_level_agreement(apply_to="Territory", entity=territory)
+			entity_type="Territory", entity=territory, response_time=2, resolution_time=3)
+		get_territory_service_level_agreement = get_service_level_agreement(entity_type="Territory", entity=territory)
 
 		self.assertEqual(create_territory_service_level_agreement.name, get_territory_service_level_agreement.name)
-		self.assertEqual(create_territory_service_level_agreement.apply_to, get_territory_service_level_agreement.apply_to)
+		self.assertEqual(create_territory_service_level_agreement.entity_type, get_territory_service_level_agreement.entity_type)
 		self.assertEqual(create_territory_service_level_agreement.entity, get_territory_service_level_agreement.entity)
 		self.assertEqual(create_territory_service_level_agreement.default_service_level_agreement, get_territory_service_level_agreement.default_service_level_agreement)
 
 
-def get_service_level_agreement(default_service_level_agreement=None, apply_to=None, entity=None):
+def get_service_level_agreement(default_service_level_agreement=None, entity_type=None, entity=None):
 	if default_service_level_agreement:
 		filters = {"default_service_level_agreement": default_service_level_agreement}
 	else:
-		filters = {"apply_to": apply_to, "entity": entity}
+		filters = {"entity_type": entity_type, "entity": entity}
 
 	service_level_agreement = frappe.get_doc("Service Level Agreement", filters)
 	return service_level_agreement
 
 def create_service_level_agreement(default_service_level_agreement, service_level, holiday_list, employee_group,
-	response_time, apply_to, entity, resolution_time):
+	response_time, entity_type, entity, resolution_time):
 
 	service_level_agreement = frappe.get_doc({
 		"doctype": "Service Level Agreement",
@@ -78,7 +78,7 @@
 		"service_level": service_level,
 		"holiday_list": holiday_list,
 		"employee_group": employee_group,
-		"apply_to": apply_to,
+		"entity_type": entity_type,
 		"entity": entity,
 		"start_date": frappe.utils.getdate(),
 		"end_date": frappe.utils.add_to_date(frappe.utils.getdate(), days=100),
@@ -152,7 +152,7 @@
 
 	if not default_service_level_agreement:
 		filters.update({
-			"apply_to": apply_to,
+			"entity_type": entity_type,
 			"entity": entity
 		})
 
@@ -207,19 +207,19 @@
 
 	create_service_level_agreement(default_service_level_agreement=1,
 		service_level="__Test Service Level", holiday_list="__Test Holiday List", employee_group="_Test Employee Group",
-		apply_to=None, entity=None, response_time=4, resolution_time=6)
+		entity_type=None, entity=None, response_time=4, resolution_time=6)
 
 	create_customer()
 	create_service_level_agreement(default_service_level_agreement=0,
 		service_level="_Test Service Level", holiday_list="__Test Holiday List", employee_group="_Test Employee Group",
-		apply_to="Customer", entity="_Test Customer", response_time=2, resolution_time=3)
+		entity_type="Customer", entity="_Test Customer", response_time=2, resolution_time=3)
 
 	create_customer_group()
 	create_service_level_agreement(default_service_level_agreement=0,
 		service_level="_Test Service Level", holiday_list="__Test Holiday List", employee_group="_Test Employee Group",
-		apply_to="Customer Group", entity="_Test SLA Customer Group", response_time=2, resolution_time=3)
+		entity_type="Customer Group", entity="_Test SLA Customer Group", response_time=2, resolution_time=3)
 
 	create_territory()
 	create_service_level_agreement(default_service_level_agreement=0,
 		service_level="_Test Service Level", holiday_list="__Test Holiday List", employee_group="_Test Employee Group",
-		apply_to="Territory", entity="_Test SLA Territory", response_time=2, resolution_time=3)
+		entity_type="Territory", entity="_Test SLA Territory", response_time=2, resolution_time=3)