diff --git a/src/Sales/Features/PlaceOrder.cs b/src/Sales/Features/PlaceOrder.cs
index cc64430..40f1b55 100644
--- a/src/Sales/Features/PlaceOrder.cs
+++ b/src/Sales/Features/PlaceOrder.cs
@@ -71,7 +71,7 @@
         Saga<PlaceOrderSagaData>,
         IAmStartedByMessages<OrderPlaced>,
         IHandleMessages<OrderBilled>,
-        IHandleMessages<ShippingLabelCreated>,
+        IHandleMessages<ShippingLabelCreatedEvent>,
         IHandleMessages<Backordered>,
         IHandleMessages<OrderRefunded>
     {
@@ -80,7 +80,7 @@
         {
             mapper.ConfigureMapping<OrderPlaced>(message => message.OrderId).ToSaga(sagaData => sagaData.OrderId);
             mapper.ConfigureMapping<OrderBilled>(message => message.OrderId).ToSaga(sagaData => sagaData.OrderId);
-            mapper.ConfigureMapping<ShippingLabelCreated>(message => message.OrderId).ToSaga(sagaData => sagaData.OrderId);
+            mapper.ConfigureMapping<ShippingLabelCreatedEvent>(message => message.OrderId).ToSaga(sagaData => sagaData.OrderId);
             mapper.ConfigureMapping<Backordered>(message => message.OrderId).ToSaga(sagaData => sagaData.OrderId);
             mapper.ConfigureMapping<OrderRefunded>(message => message.OrderId).ToSaga(sagaData => sagaData.OrderId);
         }
@@ -103,7 +103,7 @@
             });
         }
 
-        public async Task Handle(ShippingLabelCreated message, IMessageHandlerContext context)
+        public async Task Handle(ShippingLabelCreatedEvent message, IMessageHandlerContext context)
         {
             await context.SendLocal(new ReadyToShipOrderCommand
             {

diff --git a/src/Sales/Features/PlaceOrder.cs b/src/Sales/Features/PlaceOrder.cs
index cc64430..40f1b55 100644
--- a/src/Sales/Features/PlaceOrder.cs
+++ b/src/Sales/Features/PlaceOrder.cs
@@ -71,7 +71,7 @@
         Saga<PlaceOrderSagaData>,
         IAmStartedByMessages<OrderPlaced>,
         IHandleMessages<OrderBilled>,
-        IHandleMessages<ShippingLabelCreated>,
+        IHandleMessages<ShippingLabelCreatedEvent>,
         IHandleMessages<Backordered>,
         IHandleMessages<OrderRefunded>
     {
@@ -80,7 +80,7 @@
         {
             mapper.ConfigureMapping<OrderPlaced>(message => message.OrderId).ToSaga(sagaData => sagaData.OrderId);
             mapper.ConfigureMapping<OrderBilled>(message => message.OrderId).ToSaga(sagaData => sagaData.OrderId);
-            mapper.ConfigureMapping<ShippingLabelCreated>(message => message.OrderId).ToSaga(sagaData => sagaData.OrderId);
+            mapper.ConfigureMapping<ShippingLabelCreatedEvent>(message => message.OrderId).ToSaga(sagaData => sagaData.OrderId);
             mapper.ConfigureMapping<Backordered>(message => message.OrderId).ToSaga(sagaData => sagaData.OrderId);
             mapper.ConfigureMapping<OrderRefunded>(message => message.OrderId).ToSaga(sagaData => sagaData.OrderId);
         }
@@ -103,7 +103,7 @@
             });
         }
 
-        public async Task Handle(ShippingLabelCreated message, IMessageHandlerContext context)
+        public async Task Handle(ShippingLabelCreatedEvent message, IMessageHandlerContext context)
         {
             await context.SendLocal(new ReadyToShipOrderCommand
             {
diff --git a/src/Sales/Features/ReadyToShip/ReadyToShipHandler.cs b/src/Sales/Features/ReadyToShip/ReadyToShipHandler.cs
deleted file mode 100644
index 8b98042..0000000
--- a/src/Sales/Features/ReadyToShip/ReadyToShipHandler.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System.Threading.Tasks;
-using Microsoft.EntityFrameworkCore;
-using NServiceBus;
-
-namespace Sales.Features.ReadyToShip
-{
-    public class ReadyToShipHandler : IHandleMessages<ReadyToShipOrderCommand>
-    {
-        private readonly SalesDbContext _dbContext;
-
-        public ReadyToShipHandler(SalesDbContext dbContext)
-        {
-            _dbContext = dbContext;
-        }
-
-        public async Task Handle(ReadyToShipOrderCommand message, IMessageHandlerContext context)
-        {
-            var order = await _dbContext.Orders.SingleAsync(x => x.OrderId == message.OrderId);
-            order.Status = OrderStatus.ReadyToShip;
-            await _dbContext.SaveChangesAsync();
-        }
-    }
-}
\ No newline at end of file

diff --git a/src/Sales/Features/PlaceOrder.cs b/src/Sales/Features/PlaceOrder.cs
index cc64430..40f1b55 100644
--- a/src/Sales/Features/PlaceOrder.cs
+++ b/src/Sales/Features/PlaceOrder.cs
@@ -71,7 +71,7 @@
         Saga<PlaceOrderSagaData>,
         IAmStartedByMessages<OrderPlaced>,
         IHandleMessages<OrderBilled>,
-        IHandleMessages<ShippingLabelCreated>,
+        IHandleMessages<ShippingLabelCreatedEvent>,
         IHandleMessages<Backordered>,
         IHandleMessages<OrderRefunded>
     {
@@ -80,7 +80,7 @@
         {
             mapper.ConfigureMapping<OrderPlaced>(message => message.OrderId).ToSaga(sagaData => sagaData.OrderId);
             mapper.ConfigureMapping<OrderBilled>(message => message.OrderId).ToSaga(sagaData => sagaData.OrderId);
-            mapper.ConfigureMapping<ShippingLabelCreated>(message => message.OrderId).ToSaga(sagaData => sagaData.OrderId);
+            mapper.ConfigureMapping<ShippingLabelCreatedEvent>(message => message.OrderId).ToSaga(sagaData => sagaData.OrderId);
             mapper.ConfigureMapping<Backordered>(message => message.OrderId).ToSaga(sagaData => sagaData.OrderId);
             mapper.ConfigureMapping<OrderRefunded>(message => message.OrderId).ToSaga(sagaData => sagaData.OrderId);
         }
@@ -103,7 +103,7 @@
             });
         }
 
-        public async Task Handle(ShippingLabelCreated message, IMessageHandlerContext context)
+        public async Task Handle(ShippingLabelCreatedEvent message, IMessageHandlerContext context)
         {
             await context.SendLocal(new ReadyToShipOrderCommand
             {
diff --git a/src/Sales/Features/ReadyToShip/ReadyToShipHandler.cs b/src/Sales/Features/ReadyToShip/ReadyToShipHandler.cs
deleted file mode 100644
index 8b98042..0000000
--- a/src/Sales/Features/ReadyToShip/ReadyToShipHandler.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System.Threading.Tasks;
-using Microsoft.EntityFrameworkCore;
-using NServiceBus;
-
-namespace Sales.Features.ReadyToShip
-{
-    public class ReadyToShipHandler : IHandleMessages<ReadyToShipOrderCommand>
-    {
-        private readonly SalesDbContext _dbContext;
-
-        public ReadyToShipHandler(SalesDbContext dbContext)
-        {
-            _dbContext = dbContext;
-        }
-
-        public async Task Handle(ReadyToShipOrderCommand message, IMessageHandlerContext context)
-        {
-            var order = await _dbContext.Orders.SingleAsync(x => x.OrderId == message.OrderId);
-            order.Status = OrderStatus.ReadyToShip;
-            await _dbContext.SaveChangesAsync();
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Sales/Features/ReadyToShip/ReadyToShipOrderHandler.cs b/src/Sales/Features/ReadyToShip/ReadyToShipOrderHandler.cs
new file mode 100644
index 0000000..b54459c
--- /dev/null
+++ b/src/Sales/Features/ReadyToShip/ReadyToShipOrderHandler.cs
@@ -0,0 +1,23 @@
+using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore;
+using NServiceBus;
+
+namespace Sales.Features.ReadyToShip
+{
+    public class ReadyToShipOrderHandler : IHandleMessages<ReadyToShipOrderCommand>
+    {
+        private readonly SalesDbContext _dbContext;
+
+        public ReadyToShipOrderHandler(SalesDbContext dbContext)
+        {
+            _dbContext = dbContext;
+        }
+
+        public async Task Handle(ReadyToShipOrderCommand message, IMessageHandlerContext context)
+        {
+            var order = await _dbContext.Orders.SingleAsync(x => x.OrderId == message.OrderId);
+            order.Status = OrderStatus.ReadyToShip;
+            await _dbContext.SaveChangesAsync();
+        }
+    }
+}
\ No newline at end of file

diff --git a/src/Sales/Features/PlaceOrder.cs b/src/Sales/Features/PlaceOrder.cs
index cc64430..40f1b55 100644
--- a/src/Sales/Features/PlaceOrder.cs
+++ b/src/Sales/Features/PlaceOrder.cs
@@ -71,7 +71,7 @@
         Saga<PlaceOrderSagaData>,
         IAmStartedByMessages<OrderPlaced>,
         IHandleMessages<OrderBilled>,
-        IHandleMessages<ShippingLabelCreated>,
+        IHandleMessages<ShippingLabelCreatedEvent>,
         IHandleMessages<Backordered>,
         IHandleMessages<OrderRefunded>
     {
@@ -80,7 +80,7 @@
         {
             mapper.ConfigureMapping<OrderPlaced>(message => message.OrderId).ToSaga(sagaData => sagaData.OrderId);
             mapper.ConfigureMapping<OrderBilled>(message => message.OrderId).ToSaga(sagaData => sagaData.OrderId);
-            mapper.ConfigureMapping<ShippingLabelCreated>(message => message.OrderId).ToSaga(sagaData => sagaData.OrderId);
+            mapper.ConfigureMapping<ShippingLabelCreatedEvent>(message => message.OrderId).ToSaga(sagaData => sagaData.OrderId);
             mapper.ConfigureMapping<Backordered>(message => message.OrderId).ToSaga(sagaData => sagaData.OrderId);
             mapper.ConfigureMapping<OrderRefunded>(message => message.OrderId).ToSaga(sagaData => sagaData.OrderId);
         }
@@ -103,7 +103,7 @@
             });
         }
 
-        public async Task Handle(ShippingLabelCreated message, IMessageHandlerContext context)
+        public async Task Handle(ShippingLabelCreatedEvent message, IMessageHandlerContext context)
         {
             await context.SendLocal(new ReadyToShipOrderCommand
             {
diff --git a/src/Sales/Features/ReadyToShip/ReadyToShipHandler.cs b/src/Sales/Features/ReadyToShip/ReadyToShipHandler.cs
deleted file mode 100644
index 8b98042..0000000
--- a/src/Sales/Features/ReadyToShip/ReadyToShipHandler.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System.Threading.Tasks;
-using Microsoft.EntityFrameworkCore;
-using NServiceBus;
-
-namespace Sales.Features.ReadyToShip
-{
-    public class ReadyToShipHandler : IHandleMessages<ReadyToShipOrderCommand>
-    {
-        private readonly SalesDbContext _dbContext;
-
-        public ReadyToShipHandler(SalesDbContext dbContext)
-        {
-            _dbContext = dbContext;
-        }
-
-        public async Task Handle(ReadyToShipOrderCommand message, IMessageHandlerContext context)
-        {
-            var order = await _dbContext.Orders.SingleAsync(x => x.OrderId == message.OrderId);
-            order.Status = OrderStatus.ReadyToShip;
-            await _dbContext.SaveChangesAsync();
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Sales/Features/ReadyToShip/ReadyToShipOrderHandler.cs b/src/Sales/Features/ReadyToShip/ReadyToShipOrderHandler.cs
new file mode 100644
index 0000000..b54459c
--- /dev/null
+++ b/src/Sales/Features/ReadyToShip/ReadyToShipOrderHandler.cs
@@ -0,0 +1,23 @@
+using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore;
+using NServiceBus;
+
+namespace Sales.Features.ReadyToShip
+{
+    public class ReadyToShipOrderHandler : IHandleMessages<ReadyToShipOrderCommand>
+    {
+        private readonly SalesDbContext _dbContext;
+
+        public ReadyToShipOrderHandler(SalesDbContext dbContext)
+        {
+            _dbContext = dbContext;
+        }
+
+        public async Task Handle(ReadyToShipOrderCommand message, IMessageHandlerContext context)
+        {
+            var order = await _dbContext.Orders.SingleAsync(x => x.OrderId == message.OrderId);
+            order.Status = OrderStatus.ReadyToShip;
+            await _dbContext.SaveChangesAsync();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Sales/Features/ReadyToShip/ShippingLabelCreatedHandler.cs b/src/Sales/Features/ReadyToShip/ShippingLabelCreatedHandler.cs
index 72c57b9..1172ccc 100644
--- a/src/Sales/Features/ReadyToShip/ShippingLabelCreatedHandler.cs
+++ b/src/Sales/Features/ReadyToShip/ShippingLabelCreatedHandler.cs
@@ -4,9 +4,9 @@
 
 namespace Sales.Features.ReadyToShip
 {
-    public class ShippingLabelCreatedHandler : IHandleMessages<ShippingLabelCreated>
+    public class ShippingLabelCreatedHandler : IHandleMessages<ShippingLabelCreatedEvent>
     {
-        public async Task Handle(ShippingLabelCreated message, IMessageHandlerContext context)
+        public async Task Handle(ShippingLabelCreatedEvent message, IMessageHandlerContext context)
         {
             await context.SendLocal(new ReadyToShipOrderCommand
             {

diff --git a/src/Sales/Features/PlaceOrder.cs b/src/Sales/Features/PlaceOrder.cs
index cc64430..40f1b55 100644
--- a/src/Sales/Features/PlaceOrder.cs
+++ b/src/Sales/Features/PlaceOrder.cs
@@ -71,7 +71,7 @@
         Saga<PlaceOrderSagaData>,
         IAmStartedByMessages<OrderPlaced>,
         IHandleMessages<OrderBilled>,
-        IHandleMessages<ShippingLabelCreated>,
+        IHandleMessages<ShippingLabelCreatedEvent>,
         IHandleMessages<Backordered>,
         IHandleMessages<OrderRefunded>
     {
@@ -80,7 +80,7 @@
         {
             mapper.ConfigureMapping<OrderPlaced>(message => message.OrderId).ToSaga(sagaData => sagaData.OrderId);
             mapper.ConfigureMapping<OrderBilled>(message => message.OrderId).ToSaga(sagaData => sagaData.OrderId);
-            mapper.ConfigureMapping<ShippingLabelCreated>(message => message.OrderId).ToSaga(sagaData => sagaData.OrderId);
+            mapper.ConfigureMapping<ShippingLabelCreatedEvent>(message => message.OrderId).ToSaga(sagaData => sagaData.OrderId);
             mapper.ConfigureMapping<Backordered>(message => message.OrderId).ToSaga(sagaData => sagaData.OrderId);
             mapper.ConfigureMapping<OrderRefunded>(message => message.OrderId).ToSaga(sagaData => sagaData.OrderId);
         }
@@ -103,7 +103,7 @@
             });
         }
 
-        public async Task Handle(ShippingLabelCreated message, IMessageHandlerContext context)
+        public async Task Handle(ShippingLabelCreatedEvent message, IMessageHandlerContext context)
         {
             await context.SendLocal(new ReadyToShipOrderCommand
             {
diff --git a/src/Sales/Features/ReadyToShip/ReadyToShipHandler.cs b/src/Sales/Features/ReadyToShip/ReadyToShipHandler.cs
deleted file mode 100644
index 8b98042..0000000
--- a/src/Sales/Features/ReadyToShip/ReadyToShipHandler.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System.Threading.Tasks;
-using Microsoft.EntityFrameworkCore;
-using NServiceBus;
-
-namespace Sales.Features.ReadyToShip
-{
-    public class ReadyToShipHandler : IHandleMessages<ReadyToShipOrderCommand>
-    {
-        private readonly SalesDbContext _dbContext;
-
-        public ReadyToShipHandler(SalesDbContext dbContext)
-        {
-            _dbContext = dbContext;
-        }
-
-        public async Task Handle(ReadyToShipOrderCommand message, IMessageHandlerContext context)
-        {
-            var order = await _dbContext.Orders.SingleAsync(x => x.OrderId == message.OrderId);
-            order.Status = OrderStatus.ReadyToShip;
-            await _dbContext.SaveChangesAsync();
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Sales/Features/ReadyToShip/ReadyToShipOrderHandler.cs b/src/Sales/Features/ReadyToShip/ReadyToShipOrderHandler.cs
new file mode 100644
index 0000000..b54459c
--- /dev/null
+++ b/src/Sales/Features/ReadyToShip/ReadyToShipOrderHandler.cs
@@ -0,0 +1,23 @@
+using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore;
+using NServiceBus;
+
+namespace Sales.Features.ReadyToShip
+{
+    public class ReadyToShipOrderHandler : IHandleMessages<ReadyToShipOrderCommand>
+    {
+        private readonly SalesDbContext _dbContext;
+
+        public ReadyToShipOrderHandler(SalesDbContext dbContext)
+        {
+            _dbContext = dbContext;
+        }
+
+        public async Task Handle(ReadyToShipOrderCommand message, IMessageHandlerContext context)
+        {
+            var order = await _dbContext.Orders.SingleAsync(x => x.OrderId == message.OrderId);
+            order.Status = OrderStatus.ReadyToShip;
+            await _dbContext.SaveChangesAsync();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Sales/Features/ReadyToShip/ShippingLabelCreatedHandler.cs b/src/Sales/Features/ReadyToShip/ShippingLabelCreatedHandler.cs
index 72c57b9..1172ccc 100644
--- a/src/Sales/Features/ReadyToShip/ShippingLabelCreatedHandler.cs
+++ b/src/Sales/Features/ReadyToShip/ShippingLabelCreatedHandler.cs
@@ -4,9 +4,9 @@
 
 namespace Sales.Features.ReadyToShip
 {
-    public class ShippingLabelCreatedHandler : IHandleMessages<ShippingLabelCreated>
+    public class ShippingLabelCreatedHandler : IHandleMessages<ShippingLabelCreatedEvent>
     {
-        public async Task Handle(ShippingLabelCreated message, IMessageHandlerContext context)
+        public async Task Handle(ShippingLabelCreatedEvent message, IMessageHandlerContext context)
         {
             await context.SendLocal(new ReadyToShipOrderCommand
             {
diff --git a/src/Shipping.Contracts/ShippingLabelCreated.cs b/src/Shipping.Contracts/ShippingLabelCreated.cs
deleted file mode 100644
index 4b8d720..0000000
--- a/src/Shipping.Contracts/ShippingLabelCreated.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System;
-using NServiceBus;
-
-namespace Shipping.Contracts
-{
-    public class ShippingLabelCreated : IEvent
-    {
-        public Guid OrderId { get; set; }
-    }
-}
\ No newline at end of file

diff --git a/src/Sales/Features/PlaceOrder.cs b/src/Sales/Features/PlaceOrder.cs
index cc64430..40f1b55 100644
--- a/src/Sales/Features/PlaceOrder.cs
+++ b/src/Sales/Features/PlaceOrder.cs
@@ -71,7 +71,7 @@
         Saga<PlaceOrderSagaData>,
         IAmStartedByMessages<OrderPlaced>,
         IHandleMessages<OrderBilled>,
-        IHandleMessages<ShippingLabelCreated>,
+        IHandleMessages<ShippingLabelCreatedEvent>,
         IHandleMessages<Backordered>,
         IHandleMessages<OrderRefunded>
     {
@@ -80,7 +80,7 @@
         {
             mapper.ConfigureMapping<OrderPlaced>(message => message.OrderId).ToSaga(sagaData => sagaData.OrderId);
             mapper.ConfigureMapping<OrderBilled>(message => message.OrderId).ToSaga(sagaData => sagaData.OrderId);
-            mapper.ConfigureMapping<ShippingLabelCreated>(message => message.OrderId).ToSaga(sagaData => sagaData.OrderId);
+            mapper.ConfigureMapping<ShippingLabelCreatedEvent>(message => message.OrderId).ToSaga(sagaData => sagaData.OrderId);
             mapper.ConfigureMapping<Backordered>(message => message.OrderId).ToSaga(sagaData => sagaData.OrderId);
             mapper.ConfigureMapping<OrderRefunded>(message => message.OrderId).ToSaga(sagaData => sagaData.OrderId);
         }
@@ -103,7 +103,7 @@
             });
         }
 
-        public async Task Handle(ShippingLabelCreated message, IMessageHandlerContext context)
+        public async Task Handle(ShippingLabelCreatedEvent message, IMessageHandlerContext context)
         {
             await context.SendLocal(new ReadyToShipOrderCommand
             {
diff --git a/src/Sales/Features/ReadyToShip/ReadyToShipHandler.cs b/src/Sales/Features/ReadyToShip/ReadyToShipHandler.cs
deleted file mode 100644
index 8b98042..0000000
--- a/src/Sales/Features/ReadyToShip/ReadyToShipHandler.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System.Threading.Tasks;
-using Microsoft.EntityFrameworkCore;
-using NServiceBus;
-
-namespace Sales.Features.ReadyToShip
-{
-    public class ReadyToShipHandler : IHandleMessages<ReadyToShipOrderCommand>
-    {
-        private readonly SalesDbContext _dbContext;
-
-        public ReadyToShipHandler(SalesDbContext dbContext)
-        {
-            _dbContext = dbContext;
-        }
-
-        public async Task Handle(ReadyToShipOrderCommand message, IMessageHandlerContext context)
-        {
-            var order = await _dbContext.Orders.SingleAsync(x => x.OrderId == message.OrderId);
-            order.Status = OrderStatus.ReadyToShip;
-            await _dbContext.SaveChangesAsync();
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Sales/Features/ReadyToShip/ReadyToShipOrderHandler.cs b/src/Sales/Features/ReadyToShip/ReadyToShipOrderHandler.cs
new file mode 100644
index 0000000..b54459c
--- /dev/null
+++ b/src/Sales/Features/ReadyToShip/ReadyToShipOrderHandler.cs
@@ -0,0 +1,23 @@
+using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore;
+using NServiceBus;
+
+namespace Sales.Features.ReadyToShip
+{
+    public class ReadyToShipOrderHandler : IHandleMessages<ReadyToShipOrderCommand>
+    {
+        private readonly SalesDbContext _dbContext;
+
+        public ReadyToShipOrderHandler(SalesDbContext dbContext)
+        {
+            _dbContext = dbContext;
+        }
+
+        public async Task Handle(ReadyToShipOrderCommand message, IMessageHandlerContext context)
+        {
+            var order = await _dbContext.Orders.SingleAsync(x => x.OrderId == message.OrderId);
+            order.Status = OrderStatus.ReadyToShip;
+            await _dbContext.SaveChangesAsync();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Sales/Features/ReadyToShip/ShippingLabelCreatedHandler.cs b/src/Sales/Features/ReadyToShip/ShippingLabelCreatedHandler.cs
index 72c57b9..1172ccc 100644
--- a/src/Sales/Features/ReadyToShip/ShippingLabelCreatedHandler.cs
+++ b/src/Sales/Features/ReadyToShip/ShippingLabelCreatedHandler.cs
@@ -4,9 +4,9 @@
 
 namespace Sales.Features.ReadyToShip
 {
-    public class ShippingLabelCreatedHandler : IHandleMessages<ShippingLabelCreated>
+    public class ShippingLabelCreatedHandler : IHandleMessages<ShippingLabelCreatedEvent>
     {
-        public async Task Handle(ShippingLabelCreated message, IMessageHandlerContext context)
+        public async Task Handle(ShippingLabelCreatedEvent message, IMessageHandlerContext context)
         {
             await context.SendLocal(new ReadyToShipOrderCommand
             {
diff --git a/src/Shipping.Contracts/ShippingLabelCreated.cs b/src/Shipping.Contracts/ShippingLabelCreated.cs
deleted file mode 100644
index 4b8d720..0000000
--- a/src/Shipping.Contracts/ShippingLabelCreated.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System;
-using NServiceBus;
-
-namespace Shipping.Contracts
-{
-    public class ShippingLabelCreated : IEvent
-    {
-        public Guid OrderId { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/src/Shipping.Contracts/ShippingLabelCreatedEvent.cs b/src/Shipping.Contracts/ShippingLabelCreatedEvent.cs
new file mode 100644
index 0000000..c9daa50
--- /dev/null
+++ b/src/Shipping.Contracts/ShippingLabelCreatedEvent.cs
@@ -0,0 +1,10 @@
+using System;
+using NServiceBus;
+
+namespace Shipping.Contracts
+{
+    public class ShippingLabelCreatedEvent : IEvent
+    {
+        public Guid OrderId { get; set; }
+    }
+}
\ No newline at end of file

diff --git a/src/Sales/Features/PlaceOrder.cs b/src/Sales/Features/PlaceOrder.cs
index cc64430..40f1b55 100644
--- a/src/Sales/Features/PlaceOrder.cs
+++ b/src/Sales/Features/PlaceOrder.cs
@@ -71,7 +71,7 @@
         Saga<PlaceOrderSagaData>,
         IAmStartedByMessages<OrderPlaced>,
         IHandleMessages<OrderBilled>,
-        IHandleMessages<ShippingLabelCreated>,
+        IHandleMessages<ShippingLabelCreatedEvent>,
         IHandleMessages<Backordered>,
         IHandleMessages<OrderRefunded>
     {
@@ -80,7 +80,7 @@
         {
             mapper.ConfigureMapping<OrderPlaced>(message => message.OrderId).ToSaga(sagaData => sagaData.OrderId);
             mapper.ConfigureMapping<OrderBilled>(message => message.OrderId).ToSaga(sagaData => sagaData.OrderId);
-            mapper.ConfigureMapping<ShippingLabelCreated>(message => message.OrderId).ToSaga(sagaData => sagaData.OrderId);
+            mapper.ConfigureMapping<ShippingLabelCreatedEvent>(message => message.OrderId).ToSaga(sagaData => sagaData.OrderId);
             mapper.ConfigureMapping<Backordered>(message => message.OrderId).ToSaga(sagaData => sagaData.OrderId);
             mapper.ConfigureMapping<OrderRefunded>(message => message.OrderId).ToSaga(sagaData => sagaData.OrderId);
         }
@@ -103,7 +103,7 @@
             });
         }
 
-        public async Task Handle(ShippingLabelCreated message, IMessageHandlerContext context)
+        public async Task Handle(ShippingLabelCreatedEvent message, IMessageHandlerContext context)
         {
             await context.SendLocal(new ReadyToShipOrderCommand
             {
diff --git a/src/Sales/Features/ReadyToShip/ReadyToShipHandler.cs b/src/Sales/Features/ReadyToShip/ReadyToShipHandler.cs
deleted file mode 100644
index 8b98042..0000000
--- a/src/Sales/Features/ReadyToShip/ReadyToShipHandler.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System.Threading.Tasks;
-using Microsoft.EntityFrameworkCore;
-using NServiceBus;
-
-namespace Sales.Features.ReadyToShip
-{
-    public class ReadyToShipHandler : IHandleMessages<ReadyToShipOrderCommand>
-    {
-        private readonly SalesDbContext _dbContext;
-
-        public ReadyToShipHandler(SalesDbContext dbContext)
-        {
-            _dbContext = dbContext;
-        }
-
-        public async Task Handle(ReadyToShipOrderCommand message, IMessageHandlerContext context)
-        {
-            var order = await _dbContext.Orders.SingleAsync(x => x.OrderId == message.OrderId);
-            order.Status = OrderStatus.ReadyToShip;
-            await _dbContext.SaveChangesAsync();
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Sales/Features/ReadyToShip/ReadyToShipOrderHandler.cs b/src/Sales/Features/ReadyToShip/ReadyToShipOrderHandler.cs
new file mode 100644
index 0000000..b54459c
--- /dev/null
+++ b/src/Sales/Features/ReadyToShip/ReadyToShipOrderHandler.cs
@@ -0,0 +1,23 @@
+using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore;
+using NServiceBus;
+
+namespace Sales.Features.ReadyToShip
+{
+    public class ReadyToShipOrderHandler : IHandleMessages<ReadyToShipOrderCommand>
+    {
+        private readonly SalesDbContext _dbContext;
+
+        public ReadyToShipOrderHandler(SalesDbContext dbContext)
+        {
+            _dbContext = dbContext;
+        }
+
+        public async Task Handle(ReadyToShipOrderCommand message, IMessageHandlerContext context)
+        {
+            var order = await _dbContext.Orders.SingleAsync(x => x.OrderId == message.OrderId);
+            order.Status = OrderStatus.ReadyToShip;
+            await _dbContext.SaveChangesAsync();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Sales/Features/ReadyToShip/ShippingLabelCreatedHandler.cs b/src/Sales/Features/ReadyToShip/ShippingLabelCreatedHandler.cs
index 72c57b9..1172ccc 100644
--- a/src/Sales/Features/ReadyToShip/ShippingLabelCreatedHandler.cs
+++ b/src/Sales/Features/ReadyToShip/ShippingLabelCreatedHandler.cs
@@ -4,9 +4,9 @@
 
 namespace Sales.Features.ReadyToShip
 {
-    public class ShippingLabelCreatedHandler : IHandleMessages<ShippingLabelCreated>
+    public class ShippingLabelCreatedHandler : IHandleMessages<ShippingLabelCreatedEvent>
     {
-        public async Task Handle(ShippingLabelCreated message, IMessageHandlerContext context)
+        public async Task Handle(ShippingLabelCreatedEvent message, IMessageHandlerContext context)
         {
             await context.SendLocal(new ReadyToShipOrderCommand
             {
diff --git a/src/Shipping.Contracts/ShippingLabelCreated.cs b/src/Shipping.Contracts/ShippingLabelCreated.cs
deleted file mode 100644
index 4b8d720..0000000
--- a/src/Shipping.Contracts/ShippingLabelCreated.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System;
-using NServiceBus;
-
-namespace Shipping.Contracts
-{
-    public class ShippingLabelCreated : IEvent
-    {
-        public Guid OrderId { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/src/Shipping.Contracts/ShippingLabelCreatedEvent.cs b/src/Shipping.Contracts/ShippingLabelCreatedEvent.cs
new file mode 100644
index 0000000..c9daa50
--- /dev/null
+++ b/src/Shipping.Contracts/ShippingLabelCreatedEvent.cs
@@ -0,0 +1,10 @@
+using System;
+using NServiceBus;
+
+namespace Shipping.Contracts
+{
+    public class ShippingLabelCreatedEvent : IEvent
+    {
+        public Guid OrderId { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Shipping/Endpoints.cs b/src/Shipping/Endpoints.cs
index 720eb39..c88c957 100644
--- a/src/Shipping/Endpoints.cs
+++ b/src/Shipping/Endpoints.cs
@@ -19,7 +19,7 @@
         public static void MapShipping(this RoutingSettings<LearningTransport> routing)
         {
             routing.RouteToEndpoint(
-                assembly: typeof(ShippingLabelCreated).Assembly,
+                assembly: typeof(ShippingLabelCreatedEvent).Assembly,
                 destination: "LooselyCoupledMonolith");
         }
     }

diff --git a/src/Sales/Features/PlaceOrder.cs b/src/Sales/Features/PlaceOrder.cs
index cc64430..40f1b55 100644
--- a/src/Sales/Features/PlaceOrder.cs
+++ b/src/Sales/Features/PlaceOrder.cs
@@ -71,7 +71,7 @@
         Saga<PlaceOrderSagaData>,
         IAmStartedByMessages<OrderPlaced>,
         IHandleMessages<OrderBilled>,
-        IHandleMessages<ShippingLabelCreated>,
+        IHandleMessages<ShippingLabelCreatedEvent>,
         IHandleMessages<Backordered>,
         IHandleMessages<OrderRefunded>
     {
@@ -80,7 +80,7 @@
         {
             mapper.ConfigureMapping<OrderPlaced>(message => message.OrderId).ToSaga(sagaData => sagaData.OrderId);
             mapper.ConfigureMapping<OrderBilled>(message => message.OrderId).ToSaga(sagaData => sagaData.OrderId);
-            mapper.ConfigureMapping<ShippingLabelCreated>(message => message.OrderId).ToSaga(sagaData => sagaData.OrderId);
+            mapper.ConfigureMapping<ShippingLabelCreatedEvent>(message => message.OrderId).ToSaga(sagaData => sagaData.OrderId);
             mapper.ConfigureMapping<Backordered>(message => message.OrderId).ToSaga(sagaData => sagaData.OrderId);
             mapper.ConfigureMapping<OrderRefunded>(message => message.OrderId).ToSaga(sagaData => sagaData.OrderId);
         }
@@ -103,7 +103,7 @@
             });
         }
 
-        public async Task Handle(ShippingLabelCreated message, IMessageHandlerContext context)
+        public async Task Handle(ShippingLabelCreatedEvent message, IMessageHandlerContext context)
         {
             await context.SendLocal(new ReadyToShipOrderCommand
             {
diff --git a/src/Sales/Features/ReadyToShip/ReadyToShipHandler.cs b/src/Sales/Features/ReadyToShip/ReadyToShipHandler.cs
deleted file mode 100644
index 8b98042..0000000
--- a/src/Sales/Features/ReadyToShip/ReadyToShipHandler.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System.Threading.Tasks;
-using Microsoft.EntityFrameworkCore;
-using NServiceBus;
-
-namespace Sales.Features.ReadyToShip
-{
-    public class ReadyToShipHandler : IHandleMessages<ReadyToShipOrderCommand>
-    {
-        private readonly SalesDbContext _dbContext;
-
-        public ReadyToShipHandler(SalesDbContext dbContext)
-        {
-            _dbContext = dbContext;
-        }
-
-        public async Task Handle(ReadyToShipOrderCommand message, IMessageHandlerContext context)
-        {
-            var order = await _dbContext.Orders.SingleAsync(x => x.OrderId == message.OrderId);
-            order.Status = OrderStatus.ReadyToShip;
-            await _dbContext.SaveChangesAsync();
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Sales/Features/ReadyToShip/ReadyToShipOrderHandler.cs b/src/Sales/Features/ReadyToShip/ReadyToShipOrderHandler.cs
new file mode 100644
index 0000000..b54459c
--- /dev/null
+++ b/src/Sales/Features/ReadyToShip/ReadyToShipOrderHandler.cs
@@ -0,0 +1,23 @@
+using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore;
+using NServiceBus;
+
+namespace Sales.Features.ReadyToShip
+{
+    public class ReadyToShipOrderHandler : IHandleMessages<ReadyToShipOrderCommand>
+    {
+        private readonly SalesDbContext _dbContext;
+
+        public ReadyToShipOrderHandler(SalesDbContext dbContext)
+        {
+            _dbContext = dbContext;
+        }
+
+        public async Task Handle(ReadyToShipOrderCommand message, IMessageHandlerContext context)
+        {
+            var order = await _dbContext.Orders.SingleAsync(x => x.OrderId == message.OrderId);
+            order.Status = OrderStatus.ReadyToShip;
+            await _dbContext.SaveChangesAsync();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Sales/Features/ReadyToShip/ShippingLabelCreatedHandler.cs b/src/Sales/Features/ReadyToShip/ShippingLabelCreatedHandler.cs
index 72c57b9..1172ccc 100644
--- a/src/Sales/Features/ReadyToShip/ShippingLabelCreatedHandler.cs
+++ b/src/Sales/Features/ReadyToShip/ShippingLabelCreatedHandler.cs
@@ -4,9 +4,9 @@
 
 namespace Sales.Features.ReadyToShip
 {
-    public class ShippingLabelCreatedHandler : IHandleMessages<ShippingLabelCreated>
+    public class ShippingLabelCreatedHandler : IHandleMessages<ShippingLabelCreatedEvent>
     {
-        public async Task Handle(ShippingLabelCreated message, IMessageHandlerContext context)
+        public async Task Handle(ShippingLabelCreatedEvent message, IMessageHandlerContext context)
         {
             await context.SendLocal(new ReadyToShipOrderCommand
             {
diff --git a/src/Shipping.Contracts/ShippingLabelCreated.cs b/src/Shipping.Contracts/ShippingLabelCreated.cs
deleted file mode 100644
index 4b8d720..0000000
--- a/src/Shipping.Contracts/ShippingLabelCreated.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System;
-using NServiceBus;
-
-namespace Shipping.Contracts
-{
-    public class ShippingLabelCreated : IEvent
-    {
-        public Guid OrderId { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/src/Shipping.Contracts/ShippingLabelCreatedEvent.cs b/src/Shipping.Contracts/ShippingLabelCreatedEvent.cs
new file mode 100644
index 0000000..c9daa50
--- /dev/null
+++ b/src/Shipping.Contracts/ShippingLabelCreatedEvent.cs
@@ -0,0 +1,10 @@
+using System;
+using NServiceBus;
+
+namespace Shipping.Contracts
+{
+    public class ShippingLabelCreatedEvent : IEvent
+    {
+        public Guid OrderId { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Shipping/Endpoints.cs b/src/Shipping/Endpoints.cs
index 720eb39..c88c957 100644
--- a/src/Shipping/Endpoints.cs
+++ b/src/Shipping/Endpoints.cs
@@ -19,7 +19,7 @@
         public static void MapShipping(this RoutingSettings<LearningTransport> routing)
         {
             routing.RouteToEndpoint(
-                assembly: typeof(ShippingLabelCreated).Assembly,
+                assembly: typeof(ShippingLabelCreatedEvent).Assembly,
                 destination: "LooselyCoupledMonolith");
         }
     }
diff --git a/src/Shipping/Features/CreateShippingLabel.cs b/src/Shipping/Features/CreateShippingLabel.cs
index 9860392..d934cbf 100644
--- a/src/Shipping/Features/CreateShippingLabel.cs
+++ b/src/Shipping/Features/CreateShippingLabel.cs
@@ -25,7 +25,7 @@
             });
             await _dbContext.SaveChangesAsync();
 
-            await context.Publish<ShippingLabelCreated>(created =>
+            await context.Publish<ShippingLabelCreatedEvent>(created =>
             {
                 created.OrderId = message.OrderId;
             });
@@ -40,7 +40,7 @@
             });
             await _dbContext.SaveChangesAsync();
 
-            await context.Publish<ShippingLabelCreated>(created =>
+            await context.Publish<ShippingLabelCreatedEvent>(created =>
             {
                 created.OrderId = message.OrderId;
             });