--- a/java/org/apache/catalina/startup/Tomcat.java	
+++ a/java/org/apache/catalina/startup/Tomcat.java	
@@ -459,8 +459,13 @@ public class Tomcat {
     }
 
     public Context addContext(Host host, String contextPath, String dir) {
+        addContext(host, contextPath, contextPath, dir);
+    }
+
+    public Context addContext(Host host, String contextPath, String contextName, String dir) {
         silence(contextPath);
         Context ctx = new StandardContext();
+        ctx.setName( name );
         ctx.setPath( contextPath );
         ctx.setDocBase(dir);
         ctx.addLifecycleListener(new FixContextListener());
@@ -474,9 +479,14 @@ public class Tomcat {
     }
     
     public Context addWebapp(Host host, String url, String path) {
+        addWebapp(host, url, url, path);
+    }
+
+    public Context addWebapp(Host host, String url, String name, String path) {
         silence(url);
 
         Context ctx = new StandardContext();
+        ctx.setName( name );
         ctx.setPath( url );
         ctx.setDocBase(path);
         if (defaultRealm == null) {