diff --git a/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json b/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
index dff04a4..46d7bb8 100644
--- a/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
+++ b/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
@@ -43,10 +43,10 @@
   }, 
   {
    "default": "BOM", 
-   "fieldname": "update_fg_based_on", 
+   "fieldname": "backflush_raw_materials_based_on", 
    "fieldtype": "Select", 
-   "label": "Update FG Based On", 
-   "options": "BOM\nMaterial Transfer for Manufacture", 
+   "label": "Backflush Raw Materials Based On", 
+   "options": "BOM\nMaterial Transferred for Manufacture", 
    "permlevel": 0, 
    "precision": ""
   }, 
@@ -87,7 +87,7 @@
  "in_create": 0, 
  "in_dialog": 0, 
  "is_submittable": 0, 
- "issingle": 1, 
+ "issingle": 1,
  "istable": 0,
  "modified": "2015-07-23 08:12:33.889753", 
  "modified_by": "Administrator", 
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py
index 2308727..65f9ef0 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.py
@@ -554,7 +554,7 @@
 					self.add_to_stock_entry_detail(item_dict)
 					
 				elif self.production_order and self.purpose == "Manufacture" and \
-					frappe.db.get_single_value("Manufacturing Settings", "update_fg_based_on")== "Material Transfer for Manufacture":
+					frappe.db.get_single_value("Manufacturing Settings", "backflush_raw_materials_based_on")== "Material Transferred for Manufacture":
 					self.get_transfered_raw_materials()
 
 				else: