diff --git a/basket/entity/basket.go b/basket/entity/basket.go
index 8ffc96a..52e58a5 100644
--- a/basket/entity/basket.go
+++ b/basket/entity/basket.go
@@ -2,14 +2,14 @@ package basket
 
 import "time"
 
-type BasketEntity struct {
+type Basket struct {
 	ID        string     `db:"id" json:"id"`
 	State     string     `db:"state" json:"state"`
 	CreatedAt time.Time  `db:"created_at" json:"created_at"`
 	UpdatedAt *time.Time `db:"updated_at" json:"updated_at,omitempty"`
 }
 
-type BasketItemEntity struct {
+type BasketItem struct {
 	ID        string     `db:"id" json:"id"`
 	BasketID  string     `db:"basket_id" json:"basket_id"`
 	ProductID string     `db:"product_id" json:"product_id"`
diff --git a/order/entity/order.go b/order/entity/order.go
index 83bb22a..b2ba3f9 100644
--- a/order/entity/order.go
+++ b/order/entity/order.go
@@ -4,14 +4,14 @@ import (
 	"time"
 )
 
-type OrderEntity struct {
+type Order struct {
 	ID        string     `db:"id" json:"id"`
 	State     string     `db:"state" json:"state"`
 	CreatedAt time.Time  `db:"created_at" json:"created_at"`
 	UpdatedAt *time.Time `db:"updated_at" json:"updated_at,omitempty"`
 }
 
-type OrderItemEntity struct {
+type OrderItem struct {
 	ID        string     `db:"id" json:"id"`
 	OrderID   string     `db:"order_id" json:"order_id"`
 	ProductID int        `db:"product_id" json:"product_id"`
diff --git a/pricing/entity/product_price.go b/pricing/entity/product_price.go
index b34aafa..2bfa49e 100644
--- a/pricing/entity/product_price.go
+++ b/pricing/entity/product_price.go
@@ -1,6 +1,6 @@
 package pricing
 
-type ProductPriceEntity struct {
+type ProductPrice struct {
 	ID    int    `db:"id"`
 	PID   string `db:"pid"`
 	Price int    `db:"price"`