diff --git a/VirtoCommerce.Storefront.Model/Order/Events/OrderPlacedEvent.cs b/VirtoCommerce.Storefront.Model/Order/Events/OrderPlacedEvent.cs
index c8297dd5..932707b7 100644
--- a/VirtoCommerce.Storefront.Model/Order/Events/OrderPlacedEvent.cs
+++ b/VirtoCommerce.Storefront.Model/Order/Events/OrderPlacedEvent.cs
@@ -13,14 +13,14 @@ namespace VirtoCommerce.Storefront.Model.Order.Events
     /// </summary>
     public class OrderPlacedEvent : DomainEvent
     {
-        public OrderPlacedEvent(WorkContext workContext, CustomerOrder order, Cart.ShoppingCart cart)
+        public OrderPlacedEvent(WorkContext workContext, CustomerOrder order, ShoppingCart cart)
         {
             WorkContext = workContext;
             Cart = cart;
             Order = order;
         }
         public WorkContext WorkContext { get; set; }
-        public Cart.ShoppingCart Cart { get; set; }
+        public ShoppingCart Cart { get; set; }
         public CustomerOrder Order { get; set; }
         
     }
diff --git a/VirtoCommerce.Storefront.Model/WorkContext.cs b/VirtoCommerce.Storefront.Model/WorkContext.cs
index 0fc78522..6c98d1d5 100644
--- a/VirtoCommerce.Storefront.Model/WorkContext.cs
+++ b/VirtoCommerce.Storefront.Model/WorkContext.cs
@@ -90,8 +90,8 @@ public WorkContext()
         /// <summary>
         /// Gets or sets the current shopping cart
         /// </summary>
-        public Lazy<Cart.ShoppingCart> CurrentCart { get; set; }
-        public Cart.ShoppingCart Cart => (CurrentCart?.IsValueCreated ?? false) ? CurrentCart.Value : null;
+        public Lazy<ShoppingCart> CurrentCart { get; set; }
+        public ShoppingCart Cart => (CurrentCart?.IsValueCreated ?? false) ? CurrentCart.Value : null;
 
 
         /// <summary>
@@ -228,8 +228,8 @@ public DateTime StorefrontUtcNow
 
         public IList<Country> AllCountries { get; set; }
 
-        public Order.CustomerOrder CurrentOrder { get; set; }
-        public Order.CustomerOrder Order => CurrentOrder;
+        public CustomerOrder CurrentOrder { get; set; }
+        public CustomerOrder Order => CurrentOrder;
 
 
         public StorefrontNotification StorefrontNotification { get; set; }
diff --git a/VirtoCommerce.Storefront/Domain/Cart/CartConverter.cs b/VirtoCommerce.Storefront/Domain/Cart/CartConverter.cs
index a62ec176..ab54671f 100644
--- a/VirtoCommerce.Storefront/Domain/Cart/CartConverter.cs
+++ b/VirtoCommerce.Storefront/Domain/Cart/CartConverter.cs
@@ -18,7 +18,7 @@
 namespace VirtoCommerce.Storefront.Domain
 {
 
-    public static partial class OrderConverter
+    public static partial class CartConverter
     {
         public static cartDto.ShoppingCartSearchCriteria ToSearchCriteriaDto(this CartSearchCriteria criteria)
         {