diff --git a/.gitignore b/.gitignore
index ce6b82a5..a8eee82b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@ build/*
 build-stamp
 melange.egg-info
 .melange-venv
+.venv
 *.sqlite
 *.log
 tags
diff --git a/.mailmap b/.mailmap
index c56b9f8a..765d4b6a 100644
--- a/.mailmap
+++ b/.mailmap
@@ -21,6 +21,7 @@
 <itoumsn@nttdata.co.jp> <itoumsn@shayol>
 <jake@ansolabs.com> <jake@markupisart.com>
 <jake@ansolabs.com> <admin@jakedahn.com>
+<jeblair@hp.com> <james.blair@rackspace.com>
 <jaypipes@gmail.com> <jpipes@serialcoder>
 <jmckenty@gmail.com> <jmckenty@joshua-mckentys-macbook-pro.local>
 <jmckenty@gmail.com> <jmckenty@yyj-dhcp171.corp.flock.com>
diff --git a/Authors b/Authors
index 45f1d76f..0de60275 100644
--- a/Authors
+++ b/Authors
@@ -48,7 +48,7 @@ Hisaki Ohara <hisaki.ohara@intel.com>
 Ilya Alekseyev <ilyaalekseyev@acm.org>
 Isaku Yamahata <yamahata@valinux.co.jp>
 Jake Dahn <jake@ansolabs.com>
-James E. Blair <james.blair@rackspace.com>
+James E. Blair <jeblair@hp.com>
 Jason Cannavale <jason.cannavale@rackspace.com>
 Jason Koelker <jason@koelker.net>
 Jay Pipes <jaypipes@gmail.com>
diff --git a/run_tests.sh b/run_tests.sh
index 81711f88..45378d35 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -40,7 +40,7 @@ function process_option {
   esac
 }
 
-venv=.melange-venv
+venv=.venv
 with_venv=tools/with_venv.sh
 always_venv=0
 never_venv=0
diff --git a/tools/install_venv.py b/tools/install_venv.py
index a7e561ca..62fc6dc0 100644
--- a/tools/install_venv.py
+++ b/tools/install_venv.py
@@ -29,7 +29,7 @@ import sys
 
 
 ROOT = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
-VENV = os.path.join(ROOT, '.melange-venv')
+VENV = os.path.join(ROOT, '.venv')
 PIP_REQUIRES = os.path.join(ROOT, 'tools', 'pip-requires')
 PY_VERSION = "python%s.%s" % (sys.version_info[0], sys.version_info[1])
 
@@ -123,7 +123,7 @@ def print_help():
     To activate the Melange virtualenv for the extent of your current shell
     session you can run:
 
-    $ source .melange-venv/bin/activate
+    $ source .venv/bin/activate
 
     Or, if you prefer, you can run commands in the virtualenv on a case by case
     basis by running:
diff --git a/tools/with_venv.sh b/tools/with_venv.sh
index 85001de8..c8d2940f 100755
--- a/tools/with_venv.sh
+++ b/tools/with_venv.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 TOOLS=`dirname $0`
-VENV=$TOOLS/../.melange-venv
+VENV=$TOOLS/../.venv
 source $VENV/bin/activate && $@