diff --git a/frappe/__init__.py b/frappe/__init__.py
index 9cb0aeb2ce..178b4540f4 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -474,6 +474,7 @@ def setup_module_map():
 			if app=="webnotes": app="frappe"
 			local.app_modules.setdefault(app, [])
 			for module in get_module_list(app):
+				module = scrub(module)
 				local.module_app[module] = app
 				local.app_modules[app].append(module)
 
diff --git a/frappe/installer.py b/frappe/installer.py
index a9c8c7c2e4..7e94db953e 100755
--- a/frappe/installer.py
+++ b/frappe/installer.py
@@ -190,5 +190,5 @@ def add_module_defs(app):
 	for module in modules:
 		d = frappe.new_doc("Module Def")
 		d.app_name = app
-		d.module_name = frappe.unscrub(module)
+		d.module_name = module
 		d.save()
diff --git a/frappe/model/rename_doc.py b/frappe/model/rename_doc.py
index fe17c4aa8c..5201158d3b 100644
--- a/frappe/model/rename_doc.py
+++ b/frappe/model/rename_doc.py
@@ -73,12 +73,12 @@ def rename_parent_and_child(doctype, old, new, meta):
 	update_child_docs(old, new, meta)
 
 def validate_rename(doctype, new, meta, merge, force, ignore_permissions):
-	exists = frappe.db.exists(doctype, new)
+	exists = frappe.db.get_value(doctype, new)
 
 	if merge and not exists:
 		frappe.msgprint(_("{0} {1} does not exist, select a new target to merge").format(doctype, new), raise_exception=1)
 
-	if (not merge) and exists:
+	if (not merge) and exists == new:
 		frappe.msgprint(_("Another {0} with name {1} exists, select another name").format(doctype, new), raise_exception=1)
 
 	if not (ignore_permissions or frappe.has_permission(doctype, "write")):
diff --git a/frappe/modules.txt b/frappe/modules.txt
index 2287e7c2d4..8fe4b686dd 100644
--- a/frappe/modules.txt
+++ b/frappe/modules.txt
@@ -1,2 +1,2 @@
-core
-website
\ No newline at end of file
+Core
+Website