diff --git a/end-to-end-tests/build.gradle b/end-to-end-tests/build.gradle
index 762f298f..34f6d0ef 100644
--- a/end-to-end-tests/build.gradle
+++ b/end-to-end-tests/build.gradle
@@ -1,7 +1,7 @@
 dependencies {
     compile project(":order-history-service-api-web")
     compile project(":customer-service-api-web")
-    compile project(":order-service-web-api")
+    compile project(":order-service-api-web")
 
     testCompile "io.eventuate.util:eventuate-util-test:$eventuateUtilVersion"
     testCompile "org.springframework.boot:spring-boot-starter-test:$springBootVersion"
diff --git a/end-to-end-tests/pom.xml b/end-to-end-tests/pom.xml
index 2d9da09e..5ade61e8 100644
--- a/end-to-end-tests/pom.xml
+++ b/end-to-end-tests/pom.xml
@@ -23,7 +23,7 @@
         </dependency>
         <dependency>
             <groupId>io.eventuate.tram.examples.customers.and.orders</groupId>
-            <artifactId>order-service-web-api</artifactId>
+            <artifactId>order-service-api-web</artifactId>
             <version>0.1.0-SNAPSHOT</version>
         </dependency>
 
diff --git a/order-service-web-api/build.gradle b/order-service-api-web/build.gradle
similarity index 100%
rename from order-service-web-api/build.gradle
rename to order-service-api-web/build.gradle
diff --git a/order-service-web-api/pom.xml b/order-service-api-web/pom.xml
similarity index 92%
rename from order-service-web-api/pom.xml
rename to order-service-api-web/pom.xml
index f9c6fc9c..ca11617a 100644
--- a/order-service-web-api/pom.xml
+++ b/order-service-api-web/pom.xml
@@ -6,9 +6,9 @@
         <version>0.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>order-service-web-api</artifactId>
+    <artifactId>order-service-api-web</artifactId>
     <packaging>jar</packaging>
-    <name>order-service-web-api</name>
+    <name>order-service-api-web</name>
 
     <dependencies>
         <dependency>
diff --git a/order-service-web-api/src/main/java/io/eventuate/examples/tram/ordersandcustomers/orders/webapi/CreateOrderRequest.java b/order-service-api-web/src/main/java/io/eventuate/examples/tram/ordersandcustomers/orders/webapi/CreateOrderRequest.java
similarity index 100%
rename from order-service-web-api/src/main/java/io/eventuate/examples/tram/ordersandcustomers/orders/webapi/CreateOrderRequest.java
rename to order-service-api-web/src/main/java/io/eventuate/examples/tram/ordersandcustomers/orders/webapi/CreateOrderRequest.java
diff --git a/order-service-web-api/src/main/java/io/eventuate/examples/tram/ordersandcustomers/orders/webapi/CreateOrderResponse.java b/order-service-api-web/src/main/java/io/eventuate/examples/tram/ordersandcustomers/orders/webapi/CreateOrderResponse.java
similarity index 100%
rename from order-service-web-api/src/main/java/io/eventuate/examples/tram/ordersandcustomers/orders/webapi/CreateOrderResponse.java
rename to order-service-api-web/src/main/java/io/eventuate/examples/tram/ordersandcustomers/orders/webapi/CreateOrderResponse.java
diff --git a/order-service-web-api/src/main/java/io/eventuate/examples/tram/ordersandcustomers/orders/webapi/GetOrderResponse.java b/order-service-api-web/src/main/java/io/eventuate/examples/tram/ordersandcustomers/orders/webapi/GetOrderResponse.java
similarity index 100%
rename from order-service-web-api/src/main/java/io/eventuate/examples/tram/ordersandcustomers/orders/webapi/GetOrderResponse.java
rename to order-service-api-web/src/main/java/io/eventuate/examples/tram/ordersandcustomers/orders/webapi/GetOrderResponse.java
diff --git a/order-service/build.gradle b/order-service/build.gradle
index 0e9614bc..4eef98bb 100644
--- a/order-service/build.gradle
+++ b/order-service/build.gradle
@@ -2,7 +2,7 @@ apply plugin: ServicePlugin
 
 dependencies {
     compile project(":common-swagger")
-    compile project(":order-service-web-api")
+    compile project(":order-service-api-web")
     compile project(":order-service-api-messaging")
 
     compile project(":customer-service-api-messaging")
diff --git a/order-service/pom.xml b/order-service/pom.xml
index 7c8d7641..e7b1b4c5 100644
--- a/order-service/pom.xml
+++ b/order-service/pom.xml
@@ -112,7 +112,7 @@
 
         <dependency>
             <groupId>io.eventuate.tram.examples.customers.and.orders</groupId>
-            <artifactId>order-service-web-api</artifactId>
+            <artifactId>order-service-api-web</artifactId>
             <version>0.1.0-SNAPSHOT</version>
         </dependency>
 
diff --git a/pom.xml b/pom.xml
index ae3dc8a8..4b319388 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
         <module>customer-service-api-web</module>
         <module>customer-service-api-messaging</module>
         <module>customer-service</module>
-        <module>order-service-web-api</module>
+        <module>order-service-api-web</module>
         <module>order-service-api-messaging</module>
         <module>order-service</module>
         <module>order-history-service-api-web</module>
diff --git a/settings.gradle b/settings.gradle
index 7b2d5258..166ef924 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -5,7 +5,7 @@ include 'customer-service-api-web'
 include 'customer-service-api-messaging'
 include 'customer-service'
 
-include 'order-service-web-api'
+include 'order-service-api-web'
 include 'order-service-api-messaging'
 include 'order-service'
 
diff --git a/snapshot-tests/build.gradle b/snapshot-tests/build.gradle
index 442daa3c..9b787a57 100644
--- a/snapshot-tests/build.gradle
+++ b/snapshot-tests/build.gradle
@@ -2,8 +2,8 @@ dependencies {
     compile project(":order-history-service-api-web")
     compile project(":order-history-text-search-service-api-web")
     compile project(":customer-service-api-web")
-    compile project(":order-service-web-api")
-    compile project(":order-service-web-api")
+    compile project(":order-service-api-web")
+    compile project(":order-service-api-web")
     compile "io.eventuate.tram.view.support:eventuate-tram-view-support-rebuild:$eventuateTramViewVersion"
 
     testCompile "io.eventuate.util:eventuate-util-test:$eventuateUtilVersion"