diff --git a/MANIFEST.in b/MANIFEST.in
index 5451ace4..b2563ef8 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,45 +1,11 @@
 include HACKING LICENSE run_tests.py run_tests.sh
-include README builddeb.sh exercise_rsapi.py
+include README builddeb.sh
 include ChangeLog MANIFEST.in pylintrc Authors
-graft nova/CA
+include melange/db/sqlalchemy/migrate_repo/migrate.cfg
+include melange/db/sqlalchemy/migrate_repo/README
+include melange/db/sqlalchemy/migrate_repo/versions/*.sql
 graft doc
-graft smoketests
 graft tools
 graft etc
-graft bzrplugins
-graft contrib
 graft po
-graft plugins
-graft nova/api/openstack/schemas
-include nova/api/openstack/notes.txt
-include nova/auth/*.schema
-include nova/auth/novarc.template
-include nova/auth/opendj.sh
-include nova/auth/slap.sh
-include nova/cloudpipe/bootscript.sh
-include nova/cloudpipe/client.ovpn.template
-include nova/cloudpipe/bootscript.template
-include nova/compute/fakevirtinstance.xml
-include nova/compute/interfaces.template
-include nova/console/xvp.conf.template
-include nova/db/sqlalchemy/migrate_repo/migrate.cfg
-include nova/db/sqlalchemy/migrate_repo/README
-include nova/db/sqlalchemy/migrate_repo/versions/*.sql
-include nova/virt/interfaces.template
-include nova/virt/libvirt*.xml.template
-include nova/virt/cpuinfo.xml.template
-include nova/tests/CA/
-include nova/tests/CA/cacert.pem
-include nova/tests/CA/private/
-include nova/tests/CA/private/cakey.pem
-include nova/tests/bundle/
-include nova/tests/bundle/1mb.manifest.xml
-include nova/tests/bundle/1mb.no_kernel_or_ramdisk.manifest.xml
-include nova/tests/bundle/1mb.part.0
-include nova/tests/bundle/1mb.part.1
-include nova/tests/api/ec2/public_key/*
-include nova/tests/db/nova.austin.sqlite
-include plugins/xenapi/README
-include plugins/xenapi/etc/xapi.d/plugins/objectstore
-include plugins/xenapi/etc/xapi.d/plugins/pluginlib_nova.py
 global-exclude *.pyc
diff --git a/README b/README
index 470e0824..3f681658 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 # Running Melange App
->cd <nova_root>
+>cd <melange_root>
 >cp etc/melange/melange.conf.sample  ~/melange.conf
 >bin/melange-manage db_sync
 >bin/melange
diff --git a/doc/Makefile b/doc/Makefile
index 251a008e..b63e3003 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -32,7 +32,6 @@ help:
 
 clean:
 	-rm -rf $(BUILDDIR)/*
-	-rm -rf nova.sqlite
 	if [ -f .autogenerated ] ; then \
         cat .autogenerated | xargs rm ; \
         rm .autogenerated ; \
diff --git a/pylintrc b/pylintrc
index 135eea4d..c60faccb 100644
--- a/pylintrc
+++ b/pylintrc
@@ -19,8 +19,8 @@ argument-rgx=[a-z_][a-z0-9_]{1,30}$
 # and be lowecased with underscores
 method-rgx=([a-z_][a-z0-9_]{2,50}|setUp|tearDown)$
 
-# Module names matching nova-* are ok (files in bin/)
-module-rgx=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+)|(nova-[a-z0-9_-]+))$
+# Module names matching melange-* are ok (files in bin/)
+module-rgx=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+)|(melange-[a-z0-9_-]+))$
 
 # Don't require docstrings on tests.
 no-docstring-rgx=((__.*__)|([tT]est.*)|setUp|tearDown)$
diff --git a/setup.cfg b/setup.cfg
index 9c0a331e..e79c5595 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -10,15 +10,15 @@ tag_svn_revision = 0
 
 [compile_catalog]
 directory = locale
-domain = nova
+domain = melange
 
 [update_catalog]
-domain = nova
+domain = melange
 output_dir = locale
-input_file = locale/nova.pot
+input_file = locale/melange.pot
 
 [extract_messages]
 keywords = _ l_ lazy_gettext
 mapping_file = babel.cfg
-output_file = locale/nova.pot
+output_file = locale/melange.pot