diff --git a/build.gradle b/build.gradle
index 53e179e65a..2c74fa2f43 100644
--- a/build.gradle
+++ b/build.gradle
@@ -119,7 +119,7 @@ dependencies {
     compile project(':node')
     compile "com.google.guava:guava:$guava_version"
     runtime project(path: ":node:capsule", configuration: 'runtimeArtifacts')
-    runtime project(path: ":node:webserver:capsule", configuration: 'runtimeArtifacts')
+    runtime project(path: ":node:webserver:webcapsule", configuration: 'runtimeArtifacts')
 }
 
 task jacocoRootReport(type: org.gradle.testing.jacoco.tasks.JacocoReport) {
diff --git a/docs/source/example-code/build.gradle b/docs/source/example-code/build.gradle
index f0534edc17..49c2069d4c 100644
--- a/docs/source/example-code/build.gradle
+++ b/docs/source/example-code/build.gradle
@@ -49,7 +49,7 @@ dependencies {
     }
 
     runtime project(path: ":node:capsule", configuration: 'runtimeArtifacts')
-    runtime project(path: ":node:webserver:capsule", configuration: 'runtimeArtifacts')
+    runtime project(path: ":node:webserver:webcapsule", configuration: 'runtimeArtifacts')
 }
 
 mainClassName = "net.corda.docs.ClientRpcTutorialKt"
diff --git a/node-schemas/build/generated/source/kapt/main/net/corda/node/services/vault/schemas/Models.java b/node-schemas/build/generated/source/kapt/main/net/corda/node/services/vault/schemas/Models.java
index 199b5265ac..663119bef1 100644
--- a/node-schemas/build/generated/source/kapt/main/net/corda/node/services/vault/schemas/Models.java
+++ b/node-schemas/build/generated/source/kapt/main/net/corda/node/services/vault/schemas/Models.java
@@ -8,9 +8,9 @@ import javax.annotation.Generated;
 @Generated("io.requery.processor.EntityProcessor")
 public class Models {
     public static final EntityModel VAULT = new EntityModelBuilder("vault")
+    .addType(VaultStatesEntity.$TYPE)
     .addType(VaultTxnNoteEntity.$TYPE)
     .addType(VaultCashBalancesEntity.$TYPE)
-    .addType(VaultStatesEntity.$TYPE)
     .build();
 
     private Models() {
diff --git a/node/webserver/capsule/build.gradle b/node/webserver/webcapsule/build.gradle
similarity index 100%
rename from node/webserver/capsule/build.gradle
rename to node/webserver/webcapsule/build.gradle
diff --git a/samples/attachment-demo/build.gradle b/samples/attachment-demo/build.gradle
index 2f794d1e64..19f0a05a3a 100644
--- a/samples/attachment-demo/build.gradle
+++ b/samples/attachment-demo/build.gradle
@@ -46,7 +46,7 @@ dependencies {
 
     // Corda integration dependencies
     runtime project(path: ":node:capsule", configuration: 'runtimeArtifacts')
-    runtime project(path: ":node:webserver:capsule", configuration: 'runtimeArtifacts')
+    runtime project(path: ":node:webserver:webcapsule", configuration: 'runtimeArtifacts')
     compile project(':core')
     compile project(':test-utils')
 
diff --git a/samples/bank-of-corda-demo/build.gradle b/samples/bank-of-corda-demo/build.gradle
index 54e28af97f..b6dbfdfbbb 100644
--- a/samples/bank-of-corda-demo/build.gradle
+++ b/samples/bank-of-corda-demo/build.gradle
@@ -46,7 +46,7 @@ dependencies {
 
     // Corda integration dependencies
     runtime project(path: ":node:capsule", configuration: 'runtimeArtifacts')
-    runtime project(path: ":node:webserver:capsule", configuration: 'runtimeArtifacts')
+    runtime project(path: ":node:webserver:webcapsule", configuration: 'runtimeArtifacts')
     compile project(':core')
     compile project(':client')
     compile project(':node')
diff --git a/samples/irs-demo/build.gradle b/samples/irs-demo/build.gradle
index 5c067cdef5..11222e2f76 100644
--- a/samples/irs-demo/build.gradle
+++ b/samples/irs-demo/build.gradle
@@ -49,7 +49,7 @@ dependencies {
 
     // Corda integration dependencies
     runtime project(path: ":node:capsule", configuration: 'runtimeArtifacts')
-    runtime project(path: ":node:webserver:capsule", configuration: 'runtimeArtifacts')
+    runtime project(path: ":node:webserver:webcapsule", configuration: 'runtimeArtifacts')
     compile project(':core')
     compile project(':finance')
     compile project(':node:webserver')
diff --git a/samples/network-visualiser/build.gradle b/samples/network-visualiser/build.gradle
index 95cb0aaf7a..97bbda8538 100644
--- a/samples/network-visualiser/build.gradle
+++ b/samples/network-visualiser/build.gradle
@@ -22,7 +22,7 @@ dependencies {
 
     // Corda integration dependencies
     runtime project(path: ":node:capsule", configuration: 'runtimeArtifacts')
-    runtime project(path: ":node:webserver:capsule", configuration: 'runtimeArtifacts')
+    runtime project(path: ":node:webserver:webcapsule", configuration: 'runtimeArtifacts')
     compile project(':core')
     compile project(':finance')
     testCompile project(':test-utils')
diff --git a/samples/raft-notary-demo/build.gradle b/samples/raft-notary-demo/build.gradle
index 364c01744d..7e043643a7 100644
--- a/samples/raft-notary-demo/build.gradle
+++ b/samples/raft-notary-demo/build.gradle
@@ -46,7 +46,7 @@ dependencies {
 
     // Corda integration dependencies
     runtime project(path: ":node:capsule", configuration: 'runtimeArtifacts')
-    runtime project(path: ":node:webserver:capsule", configuration: 'runtimeArtifacts')
+    runtime project(path: ":node:webserver:webcapsule", configuration: 'runtimeArtifacts')
     compile project(':core')
     compile project(':client')
     compile project(':node')
diff --git a/samples/simm-valuation-demo/build.gradle b/samples/simm-valuation-demo/build.gradle
index d22a291e3a..6712d91ef5 100644
--- a/samples/simm-valuation-demo/build.gradle
+++ b/samples/simm-valuation-demo/build.gradle
@@ -54,7 +54,7 @@ dependencies {
 
     // Corda integration dependencies
     runtime project(path: ":node:capsule", configuration: 'runtimeArtifacts')
-    runtime project(path: ":node:webserver:capsule", configuration: 'runtimeArtifacts')
+    runtime project(path: ":node:webserver:webcapsule", configuration: 'runtimeArtifacts')
     compile project(':core')
     compile project(':node')
     compile project(':node:webserver')
diff --git a/samples/trader-demo/build.gradle b/samples/trader-demo/build.gradle
index ef9f0e58de..ea3cb45ec9 100644
--- a/samples/trader-demo/build.gradle
+++ b/samples/trader-demo/build.gradle
@@ -46,7 +46,7 @@ dependencies {
 
     // Corda integration dependencies
     runtime project(path: ":node:capsule", configuration: 'runtimeArtifacts')
-    runtime project(path: ":node:webserver:capsule", configuration: 'runtimeArtifacts')
+    runtime project(path: ":node:webserver:webcapsule", configuration: 'runtimeArtifacts')
     compile project(':core')
     compile project(':finance')
     compile project(':test-utils')
diff --git a/settings.gradle b/settings.gradle
index 4c4c35d1ff..8055c23454 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -8,7 +8,7 @@ include 'node-schemas'
 include 'node'
 include 'node:capsule'
 include 'node:webserver'
-include 'node:webserver:capsule'
+include 'node:webserver:webcapsule'
 include 'client'
 include 'client:jackson'
 include 'experimental'