diff --git a/gerrit-gwtui/pom.xml b/gerrit-gwtui/pom.xml
index f31d6f1d87..e5496ba1b2 100644
--- a/gerrit-gwtui/pom.xml
+++ b/gerrit-gwtui/pom.xml
@@ -232,7 +232,7 @@ limitations under the License.
             <configuration>
               <target>
                 <property name="dst" location="${project.build.directory}/${project.build.finalName}"/>
-                <property name="app" location="${dst}/gerrit"/>
+                <property name="app" location="${dst}/gerrit_ui"/>
 
                 <mkdir dir="${app}"/>
                 <apply executable="gzip" addsourcefile="false">
@@ -257,7 +257,7 @@ limitations under the License.
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-war-plugin</artifactId>
         <configuration>
-          <packagingExcludes>WEB-INF/classes/**,WEB-INF/lib/**</packagingExcludes>
+          <packagingExcludes>WEB-INF/classes/**,WEB-INF/deploy/**,WEB-INF/lib/**</packagingExcludes>
           <attachClasses>true</attachClasses>
           <archive>
             <addMavenDescriptor>false</addMavenDescriptor>
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/GerritGwtUI.gwt.xml b/gerrit-gwtui/src/main/java/com/google/gerrit/GerritGwtUI.gwt.xml
index 8555c75d66..5fdc5bb3bd 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/GerritGwtUI.gwt.xml
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/GerritGwtUI.gwt.xml
@@ -13,7 +13,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<module rename-to="gerrit">
+<module rename-to="gerrit_ui">
   <inherits name='com.google.gwt.editor.Editor'/>
   <inherits name='com.google.gwt.user.User'/>
   <inherits name='com.google.gwt.resources.Resources'/>
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/GerritGwtUIgecko1_8.gwt.xml b/gerrit-gwtui/src/main/java/com/google/gerrit/GerritGwtUIgecko1_8.gwt.xml
index d1a9fe4a5e..d7e835f77c 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/GerritGwtUIgecko1_8.gwt.xml
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/GerritGwtUIgecko1_8.gwt.xml
@@ -13,7 +13,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<module rename-to="gerrit">
+<module rename-to="gerrit_ui">
   <inherits name='com.google.gerrit.GerritGwtUI'/>
   <set-property name="user.agent" value="gecko1_8" />
   <set-property name="locale" value="default" />
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/GerritGwtUIsafari.gwt.xml b/gerrit-gwtui/src/main/java/com/google/gerrit/GerritGwtUIsafari.gwt.xml
index 7655c1fca1..88bea842c4 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/GerritGwtUIsafari.gwt.xml
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/GerritGwtUIsafari.gwt.xml
@@ -13,7 +13,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<module rename-to="gerrit">
+<module rename-to="gerrit_ui">
   <inherits name='com.google.gerrit.GerritGwtUI'/>
   <set-property name="user.agent" value="safari" />
   <set-property name="locale" value="default" />
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/HostPageServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/HostPageServlet.java
index d8700b85b5..28673c56ad 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/HostPageServlet.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/HostPageServlet.java
@@ -102,7 +102,7 @@ public class HostPageServlet extends HttpServlet {
       throw new ServletException("No " + HPD_ID + " in " + pageName);
     }
 
-    String src = "gerrit/gerrit.nocache.js";
+    String src = "gerrit_ui/gerrit_ui.nocache.js";
     if (!IS_DEV) {
       Element devmode = HtmlDomUtil.find(template, "gwtdevmode");
       if (devmode != null) {
@@ -132,7 +132,7 @@ public class HostPageServlet extends HttpServlet {
     }
 
     noCacheName = src;
-    selector = new PermutationSelector("gerrit");
+    selector = new PermutationSelector("gerrit_ui");
     if (checkUserAgent && !IS_DEV) {
       selector.init(servletContext);
     }
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/JettyServer.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/JettyServer.java
index 582394009e..dded71ba3e 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/JettyServer.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/JettyServer.java
@@ -491,7 +491,7 @@ public class JettyServer {
     for (File e : entries) {
       if (e.isDirectory() /* must be a directory */
           && e.getName().startsWith("gerrit-gwtui-")
-          && new File(e, "gerrit/gerrit.nocache.js").isFile()) {
+          && new File(e, "gerrit_ui/gerrit_ui.nocache.js").isFile()) {
         return Resource.newResource(e.toURI());
       }
     }