diff --git a/buying/doctype/supplier/supplier.py b/buying/doctype/supplier/supplier.py
index b2873c5..48bb9c2 100644
--- a/buying/doctype/supplier/supplier.py
+++ b/buying/doctype/supplier/supplier.py
@@ -151,6 +151,16 @@
 	def before_rename(self, olddn, newdn, merge=False):
 		from accounts.utils import rename_account_for
 		rename_account_for("Supplier", olddn, newdn, merge)
+		self.rename_address(olddn, newdn)
+		self.rename_contact(olddn, newdn)
+
+	def rename_address(self, olddn, newdn):
+		webnotes.conn.sql("""update `tabAddress` set supplier_name=%s, 
+			address_title=%s where supplier=%s""", (newdn, newdn, olddn))
+
+	def rename_contact(self,olddn, newdn):
+		webnotes.conn.sql("""update `tabContact` set supplier_name=%s 
+			where supplier=%s""", (newdn, olddn))
 		
 	def after_rename(self, olddn, newdn, merge=False):
 		if webnotes.defaults.get_global_default('supp_master_name') == 'Supplier Name':
diff --git a/manufacturing/doctype/bom/bom.txt b/manufacturing/doctype/bom/bom.txt
index a5ff125..023473a 100644
--- a/manufacturing/doctype/bom/bom.txt
+++ b/manufacturing/doctype/bom/bom.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-01-22 15:11:38", 
   "docstatus": 0, 
-  "modified": "2013-12-09 16:25:50", 
+  "modified": "2013-12-09 16:56:41", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -102,6 +102,7 @@
   "doctype": "DocField", 
   "fieldname": "with_operations", 
   "fieldtype": "Check", 
+  "hidden": 0, 
   "label": "With Operations"
  }, 
  {
@@ -125,6 +126,7 @@
   "doctype": "DocField", 
   "fieldname": "operations", 
   "fieldtype": "Section Break", 
+  "hidden": 0, 
   "label": "Operations", 
   "oldfieldtype": "Section Break"
  }, 
diff --git a/selling/doctype/customer/customer.py b/selling/doctype/customer/customer.py
index d00926f..356628a 100644
--- a/selling/doctype/customer/customer.py
+++ b/selling/doctype/customer/customer.py
@@ -146,7 +146,17 @@
 	def before_rename(self, olddn, newdn, merge=False):
 		from accounts.utils import rename_account_for
 		rename_account_for("Customer", olddn, newdn, merge)
-			
+		self.rename_address(olddn, newdn)
+		self.rename_contact(olddn, newdn)
+
+	def rename_address(self, olddn, newdn):
+		webnotes.conn.sql("""update `tabAddress` set customer_name=%s, 
+			address_title=%s where customer=%s""", (newdn, newdn, olddn))
+
+	def rename_contact(self,olddn, newdn):
+		webnotes.conn.sql("""update `tabContact` set customer_name=%s 
+			where customer=%s""", (newdn, olddn))
+
 	def after_rename(self, olddn, newdn, merge=False):
 		if webnotes.defaults.get_global_default('cust_master_name') == 'Customer Name':
 			webnotes.conn.set(self.doc, "customer_name", newdn)