Chore/rm main entity concept (#7709)

**What**
Update the `MedusaService` class, factory and types to remove the concept of main modules. The idea being that all method will be explicitly named and suffixes to represent the object you are trying to manipulate.
This pr also includes various fixes in different modules

Co-authored-by: Stevche Radevski <4820812+sradevski@users.noreply.github.com>
Co-authored-by: Oli Juhl <59018053+olivermrbl@users.noreply.github.com>

packages/core/core-flows/src/api-key/steps/create-api-keys.ts

@@ -13,7 +13,7 @@ export const createApiKeysStep = createStep(
     const service = container.resolve<IApiKeyModuleService>(
       ModuleRegistrationName.API_KEY
     )
-    const created = await service.create(data.api_keys)
+    const created = await service.createApiKeys(data.api_keys)
     return new StepResponse(
       created,
       created.map((apiKey) => apiKey.id)
@@ -28,6 +28,6 @@ export const createApiKeysStep = createStep(
       ModuleRegistrationName.API_KEY
     )
 
-    await service.delete(createdIds)
+    await service.deleteApiKeys(createdIds)
   }
 )

packages/core/core-flows/src/api-key/steps/delete-api-keys.ts

@@ -10,7 +10,7 @@ export const deleteApiKeysStep = createStep(
       ModuleRegistrationName.API_KEY
     )
 
-    await service.delete(ids)
+    await service.deleteApiKeys(ids)
     return new StepResponse(void 0)
   },
   async () => {}

packages/core/core-flows/src/api-key/steps/update-api-keys.ts

@@ -24,12 +24,12 @@ export const updateApiKeysStep = createStep(
       data.update,
     ])
 
-    const prevData = await service.list(data.selector, {
+    const prevData = await service.listApiKeys(data.selector, {
       select: selects,
       relations,
     })
 
-    const apiKeys = await service.update(data.selector, data.update)
+    const apiKeys = await service.updateApiKeys(data.selector, data.update)
     return new StepResponse(apiKeys, prevData)
   },
   async (prevData, { container }) => {
@@ -41,7 +41,7 @@ export const updateApiKeysStep = createStep(
       ModuleRegistrationName.API_KEY
     )
 
-    await service.upsert(
+    await service.upsertApiKeys(
       prevData.map((r) => ({
         id: r.id,
         title: r.title,

packages/core/core-flows/src/api-key/steps/validate-sales-channel-exists.ts

@@ -16,7 +16,7 @@ export const validateSalesChannelsExistStep = createStep(
         ModuleRegistrationName.SALES_CHANNEL
       )
 
-    const salesChannels = await salesChannelModuleService.list(
+    const salesChannels = await salesChannelModuleService.listSalesChannels(
       { id: data.sales_channel_ids },
       { select: ["id"] }
     )

packages/core/core-flows/src/auth/steps/set-auth-app-metadata.ts

@@ -19,7 +19,7 @@ export const setAuthAppMetadataStep = createStep(
     )
 
     const key = `${data.actorType}_id`
-    const authIdentity = await service.retrieve(data.authIdentityId)
+    const authIdentity = await service.retrieveAuthIdentity(data.authIdentityId)
 
     const appMetadata = authIdentity.app_metadata || {}
     if (isDefined(appMetadata[key])) {
@@ -28,7 +28,7 @@ export const setAuthAppMetadataStep = createStep(
 
     appMetadata[key] = data.value
 
-    await service.update({
+    await service.updateAuthIdentites({
       id: authIdentity.id,
       app_metadata: appMetadata,
     })
@@ -49,14 +49,14 @@ export const setAuthAppMetadataStep = createStep(
       ModuleRegistrationName.AUTH
     )
 
-    const authIdentity = await service.retrieve(id)
+    const authIdentity = await service.retrieveAuthIdentity(id)
 
     const appMetadata = authIdentity.app_metadata || {}
     if (isDefined(appMetadata[key])) {
       delete appMetadata[key]
     }
 
-    await service.update({
+    await service.updateAuthIdentites({
       id: authIdentity.id,
       app_metadata: appMetadata,
     })

packages/core/core-flows/src/customer-group/steps/create-customer-groups.ts

@@ -10,7 +10,7 @@ export const createCustomerGroupsStep = createStep(
       ModuleRegistrationName.CUSTOMER
     )
 
-    const createdCustomerGroups = await service.createCustomerGroup(data)
+    const createdCustomerGroups = await service.createCustomerGroups(data)
 
     return new StepResponse(
       createdCustomerGroups,
@@ -28,6 +28,6 @@ export const createCustomerGroupsStep = createStep(
       ModuleRegistrationName.CUSTOMER
     )
 
-    await service.delete(createdCustomerGroupIds)
+    await service.deleteCustomers(createdCustomerGroupIds)
   }
 )

packages/core/core-flows/src/customer/steps/create-addresses.ts

@@ -13,7 +13,7 @@ export const createCustomerAddressesStep = createStep(
       ModuleRegistrationName.CUSTOMER
     )
 
-    const addresses = await service.addAddresses(data)
+    const addresses = await service.createAddresses(data)
 
     return new StepResponse(
       addresses,

packages/core/core-flows/src/customer/steps/create-customers.ts

@@ -10,7 +10,7 @@ export const createCustomersStep = createStep(
       ModuleRegistrationName.CUSTOMER
     )
 
-    const createdCustomers = await service.create(data)
+    const createdCustomers = await service.createCustomers(data)
 
     return new StepResponse(
       createdCustomers,
@@ -26,6 +26,6 @@ export const createCustomersStep = createStep(
       ModuleRegistrationName.CUSTOMER
     )
 
-    await service.delete(createdCustomerIds)
+    await service.deleteCustomers(createdCustomerIds)
   }
 )

packages/core/core-flows/src/customer/steps/delete-addresses.ts

@@ -27,6 +27,6 @@ export const deleteCustomerAddressesStep = createStep(
       ModuleRegistrationName.CUSTOMER
     )
 
-    await service.addAddresses(prevAddresses)
+    await service.createAddresses(prevAddresses)
   }
 )

packages/core/core-flows/src/customer/steps/delete-customers.ts

@@ -12,7 +12,7 @@ export const deleteCustomersStep = createStep(
       ModuleRegistrationName.CUSTOMER
     )
 
-    await service.softDelete(ids)
+    await service.softDeleteCustomers(ids)
 
     return new StepResponse(void 0, ids)
   },
@@ -25,6 +25,6 @@ export const deleteCustomersStep = createStep(
       ModuleRegistrationName.CUSTOMER
     )
 
-    await service.restore(prevCustomerIds)
+    await service.restoreCustomers(prevCustomerIds)
   }
 )

packages/core/core-flows/src/customer/steps/update-customers.ts

@@ -26,12 +26,12 @@ export const updateCustomersStep = createStep(
     const { selects, relations } = getSelectsAndRelationsFromObjectArray([
       data.update,
     ])
-    const prevCustomers = await service.list(data.selector, {
+    const prevCustomers = await service.listCustomers(data.selector, {
       select: selects,
       relations,
     })
 
-    const customers = await service.update(data.selector, data.update)
+    const customers = await service.updateCustomers(data.selector, data.update)
 
     return new StepResponse(customers, prevCustomers)
   },
@@ -46,7 +46,7 @@ export const updateCustomersStep = createStep(
 
     await promiseAll(
       prevCustomers.map((c) =>
-        service.update(c.id, {
+        service.updateCustomers(c.id, {
           first_name: c.first_name,
           last_name: c.last_name,
           email: c.email,

packages/core/core-flows/src/defaults/steps/create-default-store.ts

@@ -1,6 +1,6 @@
 import { ModuleRegistrationName } from "@medusajs/modules-sdk"
 import { CreateStoreDTO, IStoreModuleService, StoreDTO } from "@medusajs/types"
-import { StepResponse, createStep } from "@medusajs/workflows-sdk"
+import { createStep, StepResponse } from "@medusajs/workflows-sdk"
 import { createStoresWorkflow } from "../../store"
 
 type CreateDefaultStoreStepInput = {
@@ -14,7 +14,7 @@ export const createDefaultStoreStep = createStep(
     const storeService = container.resolve(ModuleRegistrationName.STORE)
 
     let shouldDelete = false
-    let [store] = await storeService.list({}, { take: 1 })
+    let [store] = await storeService.listStores({}, { take: 1 })
 
     /**
      * @todo
@@ -55,6 +55,6 @@ export const createDefaultStoreStep = createStep(
       ModuleRegistrationName.STORE
     )
 
-    await service.delete(data.storeId)
+    await service.deleteStores(data.storeId)
   }
 )

packages/core/core-flows/src/definition/cart/steps/confirm-inventory.ts

@@ -1,5 +1,5 @@
 import { ModuleRegistrationName } from "@medusajs/modules-sdk"
-import { IInventoryServiceNext } from "@medusajs/types"
+import { IInventoryService } from "@medusajs/types"
 import { MedusaError, promiseAll } from "@medusajs/utils"
 import { createStep, StepResponse } from "@medusajs/workflows-sdk"
 
@@ -17,7 +17,7 @@ export const confirmInventoryStepId = "confirm-inventory-step"
 export const confirmInventoryStep = createStep(
   confirmInventoryStepId,
   async (data: StepInput, { container }) => {
-    const inventoryService = container.resolve<IInventoryServiceNext>(
+    const inventoryService = container.resolve<IInventoryService>(
       ModuleRegistrationName.INVENTORY
     )
 

packages/core/core-flows/src/definition/cart/steps/create-carts.ts

@@ -1,6 +1,6 @@
 import { ModuleRegistrationName } from "@medusajs/modules-sdk"
 import { CreateCartDTO, ICartModuleService } from "@medusajs/types"
-import { StepResponse, createStep } from "@medusajs/workflows-sdk"
+import { createStep, StepResponse } from "@medusajs/workflows-sdk"
 
 export const createCartsStepId = "create-carts"
 export const createCartsStep = createStep(
@@ -10,7 +10,7 @@ export const createCartsStep = createStep(
       ModuleRegistrationName.CART
     )
 
-    const createdCarts = await service.create(data)
+    const createdCarts = await service.createCarts(data)
 
     return new StepResponse(
       createdCarts,
@@ -26,6 +26,6 @@ export const createCartsStep = createStep(
       ModuleRegistrationName.CART
     )
 
-    await service.delete(createdCartsIds)
+    await service.deleteCarts(createdCartsIds)
   }
 )

packages/core/core-flows/src/definition/cart/steps/find-one-or-any-region.ts

@@ -17,20 +17,20 @@ export const findOneOrAnyRegionStep = createStep(
 
     if (data.regionId) {
       try {
-        const region = await service.retrieve(data.regionId)
+        const region = await service.retrieveRegion(data.regionId)
         return new StepResponse(region)
       } catch (error) {
         return new StepResponse(null)
       }
     }
 
-    const [store] = await storeModule.list()
+    const [store] = await storeModule.listStores()
 
     if (!store) {
       throw new MedusaError(MedusaError.Types.NOT_FOUND, "Store not found")
     }
 
-    const [region] = await service.list({
+    const [region] = await service.listRegions({
       id: store.default_region_id,
     })
 

packages/core/core-flows/src/definition/cart/steps/find-or-create-customer.ts

@@ -46,7 +46,7 @@ export const findOrCreateCustomerStep = createStep(
     let customerWasCreated = false
 
     if (data.customerId) {
-      const customer = await service.retrieve(data.customerId)
+      const customer = await service.retrieveCustomer(data.customerId)
       customerData.customer = customer
       customerData.email = customer.email
 
@@ -58,13 +58,13 @@ export const findOrCreateCustomerStep = createStep(
     if (data.email) {
       const validatedEmail = validateEmail(data.email)
 
-      let [customer] = await service.list({
+      let [customer] = await service.listCustomers({
         email: validatedEmail,
         has_account: false,
       })
 
       if (!customer) {
-        customer = await service.create({ email: validatedEmail })
+        customer = await service.createCustomers({ email: validatedEmail })
         customerWasCreated = true
       }
 
@@ -88,6 +88,6 @@ export const findOrCreateCustomerStep = createStep(
       ModuleRegistrationName.CUSTOMER
     )
 
-    await service.delete(customer.id)
+    await service.deleteCustomers(customer.id)
   }
 )

packages/core/core-flows/src/definition/cart/steps/find-sales-channel.ts

@@ -25,15 +25,17 @@ export const findSalesChannelStep = createStep(
     let salesChannel: SalesChannelDTO | undefined
 
     if (data.salesChannelId) {
-      salesChannel = await salesChannelService.retrieve(data.salesChannelId)
+      salesChannel = await salesChannelService.retrieveSalesChannel(
+        data.salesChannelId
+      )
     } else if (!isDefined(data.salesChannelId)) {
-      const [store] = await storeModule.list(
+      const [store] = await storeModule.listStores(
         {},
         { select: ["default_sales_channel_id"] }
       )
 
       if (store?.default_sales_channel_id) {
-        salesChannel = await salesChannelService.retrieve(
+        salesChannel = await salesChannelService.retrieveSalesChannel(
           store.default_sales_channel_id
         )
       }

packages/core/core-flows/src/definition/cart/steps/get-promotion-codes-to-apply.ts

@@ -38,7 +38,7 @@ export const getPromotionCodesToApply = createStep(
 
     const promotionCodesToApply: Set<string> = new Set(
       (
-        await promotionService.list(
+        await promotionService.listPromotions(
           { code: adjustmentCodes },
           { select: ["code"], take: null }
         )

packages/core/core-flows/src/definition/cart/steps/get-variants.ts

@@ -20,7 +20,7 @@ export const getVariantsStep = createStep(
       ModuleRegistrationName.PRODUCT
     )
 
-    const variants = await productModuleService.listVariants(
+    const variants = await productModuleService.listProductVariants(
       data.filter,
       data.config
     )

packages/core/core-flows/src/definition/cart/steps/prepare-adjustments-from-promotion-actions.ts

@@ -25,7 +25,7 @@ export const prepareAdjustmentsFromPromotionActionsStep = createStep(
     )
 
     const { actions = [] } = data
-    const promotions = await promotionModuleService.list(
+    const promotions = await promotionModuleService.listPromotions(
       { code: actions.map((a) => a.code) },
       { select: ["id", "code"] }
     )

packages/core/core-flows/src/definition/cart/steps/reserve-inventory.ts

@@ -1,5 +1,5 @@
 import { ModuleRegistrationName } from "@medusajs/modules-sdk"
-import { IInventoryServiceNext } from "@medusajs/types"
+import { IInventoryService } from "@medusajs/types"
 import { StepResponse, createStep } from "@medusajs/workflows-sdk"
 
 interface StepInput {
@@ -17,7 +17,7 @@ export const reserveInventoryStepId = "reserve-inventory-step"
 export const reserveInventoryStep = createStep(
   reserveInventoryStepId,
   async (data: StepInput, { container }) => {
-    const inventoryService = container.resolve<IInventoryServiceNext>(
+    const inventoryService = container.resolve<IInventoryService>(
       ModuleRegistrationName.INVENTORY
     )
 
@@ -40,7 +40,7 @@ export const reserveInventoryStep = createStep(
       return
     }
 
-    const inventoryService = container.resolve<IInventoryServiceNext>(
+    const inventoryService = container.resolve<IInventoryService>(
       ModuleRegistrationName.INVENTORY
     )
 

packages/core/core-flows/src/definition/cart/steps/retrieve-cart.ts

@@ -1,6 +1,6 @@
 import { ModuleRegistrationName } from "@medusajs/modules-sdk"
 import { CartDTO, FindConfig, ICartModuleService } from "@medusajs/types"
-import { StepResponse, createStep } from "@medusajs/workflows-sdk"
+import { createStep, StepResponse } from "@medusajs/workflows-sdk"
 
 interface StepInput {
   id: string
@@ -15,7 +15,7 @@ export const retrieveCartStep = createStep(
       ModuleRegistrationName.CART
     )
 
-    const cart = await cartModuleService.retrieve(data.id, data.config)
+    const cart = await cartModuleService.retrieveCart(data.id, data.config)
 
     // TODO: remove this when cart handles totals calculation
     cart.items = cart.items?.map((item) => {

packages/core/core-flows/src/definition/cart/steps/update-cart-promotions.ts

@@ -38,7 +38,7 @@ export const updateCartPromotionsStep = createStep(
       existingCartPromotionLinks.map((link) => [link.promotion_id, link])
     )
 
-    const promotions = await promotionService.list(
+    const promotions = await promotionService.listPromotions(
       { code: promo_codes },
       { select: ["id"] }
     )

packages/core/core-flows/src/definition/cart/steps/update-carts.ts

@@ -5,7 +5,7 @@ import {
   UpdateCartWorkflowInputDTO,
 } from "@medusajs/types"
 import { getSelectsAndRelationsFromObjectArray } from "@medusajs/utils"
-import { StepResponse, createStep } from "@medusajs/workflows-sdk"
+import { createStep, StepResponse } from "@medusajs/workflows-sdk"
 
 export const updateCartsStepId = "update-carts"
 export const updateCartsStep = createStep(
@@ -16,12 +16,12 @@ export const updateCartsStep = createStep(
     )
 
     const { selects, relations } = getSelectsAndRelationsFromObjectArray(data)
-    const cartsBeforeUpdate = await cartModule.list(
+    const cartsBeforeUpdate = await cartModule.listCarts(
       { id: data.map((d) => d.id) },
       { select: selects, relations }
     )
 
-    const updatedCart = await cartModule.update(data)
+    const updatedCart = await cartModule.updateCarts(data)
 
     return new StepResponse(updatedCart, cartsBeforeUpdate)
   },
@@ -48,6 +48,6 @@ export const updateCartsStep = createStep(
       })
     }
 
-    return await cartModule.update(dataToUpdate)
+    return await cartModule.updateCarts(dataToUpdate)
   }
 )

packages/core/core-flows/src/file/steps/delete-files.ts

@@ -10,7 +10,7 @@ export const deleteFilesStep = createStep(
       ModuleRegistrationName.FILE
     )
 
-    await service.delete(ids)
+    await service.deleteFiles(ids)
     return new StepResponse(void 0)
   },
   async () => {}

packages/core/core-flows/src/file/steps/upload-files.ts

@@ -17,7 +17,7 @@ export const uploadFilesStep = createStep(
     const service = container.resolve<IFileModuleService>(
       ModuleRegistrationName.FILE
     )
-    const created = await service.create(data.files)
+    const created = await service.createFiles(data.files)
     return new StepResponse(
       created,
       created.map((file) => file.id)
@@ -32,6 +32,6 @@ export const uploadFilesStep = createStep(
       ModuleRegistrationName.FILE
     )
 
-    await service.delete(createdIds)
+    await service.deleteFiles(createdIds)
   }
 )

packages/core/core-flows/src/fulfillment/steps/add-shipping-options-prices.ts

@@ -74,7 +74,7 @@ export const createShippingOptionsPriceSetsStep = createStep(
       const regionService = container.resolve<IRegionModuleService>(
         ModuleRegistrationName.REGION
       )
-      const regions = await regionService.list(
+      const regions = await regionService.listRegions(
         {
           id: [...new Set(regionIds)],
         },
@@ -96,7 +96,7 @@ export const createShippingOptionsPriceSetsStep = createStep(
       ModuleRegistrationName.PRICING
     )
 
-    const priceSets = await pricingService.create(priceSetsData)
+    const priceSets = await pricingService.createPriceSets(priceSetsData)
 
     const shippingOptionPriceSetLinData = data.map((input, index) => {
       return {
@@ -119,6 +119,6 @@ export const createShippingOptionsPriceSetsStep = createStep(
       ModuleRegistrationName.PRICING
     )
 
-    await pricingService.delete(priceSetIds)
+    await pricingService.deletePriceSets(priceSetIds)
   }
 )

packages/core/core-flows/src/fulfillment/steps/create-fulfillment-set.ts

@@ -3,7 +3,7 @@ import {
   CreateFulfillmentSetDTO,
   IFulfillmentModuleService,
 } from "@medusajs/types"
-import { StepResponse, createStep } from "@medusajs/workflows-sdk"
+import { createStep, StepResponse } from "@medusajs/workflows-sdk"
 
 export const createFulfillmentSetsId = "create-fulfillment-sets"
 export const createFulfillmentSets = createStep(
@@ -13,7 +13,7 @@ export const createFulfillmentSets = createStep(
       ModuleRegistrationName.FULFILLMENT
     )
 
-    const createSets = await service.create(data)
+    const createSets = await service.createFulfillmentSets(data)
 
     return new StepResponse(
       createSets,
@@ -29,6 +29,6 @@ export const createFulfillmentSets = createStep(
       ModuleRegistrationName.FULFILLMENT
     )
 
-    await service.delete(createSetIds)
+    await service.deleteFulfillmentSets(createSetIds)
   }
 )

packages/core/core-flows/src/fulfillment/steps/delete-fulfillment-sets.ts

@@ -1,6 +1,6 @@
 import { ModuleRegistrationName } from "@medusajs/modules-sdk"
 import { IFulfillmentModuleService } from "@medusajs/types"
-import { StepResponse, createStep } from "@medusajs/workflows-sdk"
+import { createStep, StepResponse } from "@medusajs/workflows-sdk"
 
 export const deleteFulfillmentSetsStepId = "delete-fulfillment-sets"
 export const deleteFulfillmentSetsStep = createStep(
@@ -10,7 +10,7 @@ export const deleteFulfillmentSetsStep = createStep(
       ModuleRegistrationName.FULFILLMENT
     )
 
-    await service.softDelete(ids)
+    await service.softDeleteFulfillmentSets(ids)
 
     return new StepResponse(void 0, ids)
   },
@@ -23,6 +23,6 @@ export const deleteFulfillmentSetsStep = createStep(
       ModuleRegistrationName.FULFILLMENT
     )
 
-    await service.restore(prevIds)
+    await service.restoreFulfillmentSets(prevIds)
   }
 )

packages/core/core-flows/src/fulfillment/steps/set-shipping-options-prices.ts

@@ -108,7 +108,7 @@ export const setShippingOptionsPricesStep = createStep(
       const regionService = container.resolve<IRegionModuleService>(
         ModuleRegistrationName.REGION
       )
-      const regions = await regionService.list(
+      const regions = await regionService.listRegions(
         {
           id: [...new Set(regionIds)],
         },
@@ -166,7 +166,7 @@ export const setShippingOptionsPricesStep = createStep(
         continue
       }
 
-      await pricingService.update(shippingOptionData.price_set_id, {
+      await pricingService.updatePriceSets(shippingOptionData.price_set_id, {
         prices: shippingOptionData.prices,
       })
     }
@@ -187,7 +187,7 @@ export const setShippingOptionsPricesStep = createStep(
       if (!isDefined(prices)) {
         continue
       }
-      await pricingService.update(data_.price_set_id, { prices })
+      await pricingService.updatePriceSets(data_.price_set_id, { prices })
     }
   }
 )

packages/core/core-flows/src/inventory/steps/adjust-inventory-levels.ts

@@ -1,4 +1,4 @@
-import { IInventoryServiceNext, InventoryNext } from "@medusajs/types"
+import { IInventoryService, InventoryTypes } from "@medusajs/types"
 import { StepResponse, createStep } from "@medusajs/workflows-sdk"
 
 import { ModuleRegistrationName } from "@medusajs/modules-sdk"
@@ -7,14 +7,14 @@ export const adjustInventoryLevelsStepId = "adjust-inventory-levels-step"
 export const adjustInventoryLevelsStep = createStep(
   adjustInventoryLevelsStepId,
   async (
-    input: InventoryNext.BulkAdjustInventoryLevelInput[],
+    input: InventoryTypes.BulkAdjustInventoryLevelInput[],
     { container }
   ) => {
-    const inventoryService: IInventoryServiceNext = container.resolve(
+    const inventoryService: IInventoryService = container.resolve(
       ModuleRegistrationName.INVENTORY
     )
 
-    const adjustedLevels: InventoryNext.InventoryLevelDTO[] =
+    const adjustedLevels: InventoryTypes.InventoryLevelDTO[] =
       await inventoryService.adjustInventory(
         input.map((item) => {
           return {

packages/core/core-flows/src/inventory/steps/create-inventory-items.ts

@@ -1,18 +1,18 @@
 import { StepResponse, createStep } from "@medusajs/workflows-sdk"
 
 import { ModuleRegistrationName } from "@medusajs/modules-sdk"
-import { IInventoryServiceNext, InventoryNext } from "@medusajs/types"
+import { IInventoryService, InventoryTypes } from "@medusajs/types"
 
 export const createInventoryItemsStepId = "create-inventory-items"
 export const createInventoryItemsStep = createStep(
   createInventoryItemsStepId,
-  async (data: InventoryNext.CreateInventoryItemInput[], { container }) => {
-    const inventoryService: IInventoryServiceNext = container.resolve(
+  async (data: InventoryTypes.CreateInventoryItemInput[], { container }) => {
+    const inventoryService: IInventoryService = container.resolve(
       ModuleRegistrationName.INVENTORY
     )
 
-    const createdItems: InventoryNext.InventoryItemDTO[] =
-      await inventoryService.create(data)
+    const createdItems: InventoryTypes.InventoryItemDTO[] =
+      await inventoryService.createInventoryItems(data)
 
     return new StepResponse(
       createdItems,
@@ -26,6 +26,6 @@ export const createInventoryItemsStep = createStep(
 
     const inventoryService = container.resolve(ModuleRegistrationName.INVENTORY)
 
-    await inventoryService!.delete(data)
+    await inventoryService.deleteInventoryItems(data)
   }
 )

packages/core/core-flows/src/inventory/steps/create-inventory-levels.ts

@@ -1,4 +1,4 @@
-import { IInventoryServiceNext, InventoryNext } from "@medusajs/types"
+import { IInventoryService, InventoryTypes } from "@medusajs/types"
 import { StepResponse, createStep } from "@medusajs/workflows-sdk"
 
 import { ModuleRegistrationName } from "@medusajs/modules-sdk"
@@ -6,8 +6,8 @@ import { ModuleRegistrationName } from "@medusajs/modules-sdk"
 export const createInventoryLevelsStepId = "create-inventory-levels"
 export const createInventoryLevelsStep = createStep(
   createInventoryLevelsStepId,
-  async (data: InventoryNext.CreateInventoryLevelInput[], { container }) => {
-    const service = container.resolve<IInventoryServiceNext>(
+  async (data: InventoryTypes.CreateInventoryLevelInput[], { container }) => {
+    const service = container.resolve<IInventoryService>(
       ModuleRegistrationName.INVENTORY
     )
 
@@ -22,7 +22,7 @@ export const createInventoryLevelsStep = createStep(
       return
     }
 
-    const service = container.resolve<IInventoryServiceNext>(
+    const service = container.resolve<IInventoryService>(
       ModuleRegistrationName.INVENTORY
     )
 

packages/core/core-flows/src/inventory/steps/delete-inventory-items.ts

@@ -8,7 +8,7 @@ export const deleteInventoryItemStep = createStep(
   async (ids: string[], { container }) => {
     const inventoryService = container.resolve(ModuleRegistrationName.INVENTORY)
 
-    await inventoryService.softDelete(ids)
+    await inventoryService.softDeleteInventoryItems(ids)
 
     return new StepResponse(void 0, ids)
   },
@@ -19,6 +19,6 @@ export const deleteInventoryItemStep = createStep(
 
     const inventoryService = container.resolve(ModuleRegistrationName.INVENTORY)
 
-    await inventoryService.restore(prevInventoryItemIds)
+    await inventoryService.restoreInventoryItems(prevInventoryItemIds)
   }
 )

packages/core/core-flows/src/inventory/steps/delete-inventory-levels.ts

@@ -1,4 +1,4 @@
-import { ICustomerModuleService, IInventoryServiceNext } from "@medusajs/types"
+import { ICustomerModuleService, IInventoryService } from "@medusajs/types"
 import { StepResponse, WorkflowData, createStep } from "@medusajs/workflows-sdk"
 
 import { ModuleRegistrationName } from "@medusajs/modules-sdk"
@@ -7,7 +7,7 @@ export const deleteInventoryLevelsStepId = "delete-inventory-levels-step"
 export const deleteInventoryLevelsStep = createStep(
   deleteInventoryLevelsStepId,
   async (ids: string[], { container }) => {
-    const service = container.resolve<IInventoryServiceNext>(
+    const service = container.resolve<IInventoryService>(
       ModuleRegistrationName.INVENTORY
     )
 
@@ -20,7 +20,7 @@ export const deleteInventoryLevelsStep = createStep(
       return
     }
 
-    const service = container.resolve<IInventoryServiceNext>(
+    const service = container.resolve<IInventoryService>(
       ModuleRegistrationName.INVENTORY
     )
 

packages/core/core-flows/src/inventory/steps/delete-levels-by-item-and-location.ts

@@ -5,7 +5,7 @@ import {
 } from "@medusajs/modules-sdk"
 import { StepResponse, createStep } from "@medusajs/workflows-sdk"
 
-import { IInventoryServiceNext } from "@medusajs/types"
+import { IInventoryService } from "@medusajs/types"
 import { MedusaError } from "@medusajs/utils"
 
 export const deleteInventoryLevelsFromItemAndLocationsStepId =
@@ -20,7 +20,7 @@ export const deleteInventoryLevelsFromItemAndLocationsStep = createStep(
       return new StepResponse(void 0, [])
     }
 
-    const service = container.resolve<IInventoryServiceNext>(
+    const service = container.resolve<IInventoryService>(
       ModuleRegistrationName.INVENTORY
     )
 
@@ -48,7 +48,7 @@ export const deleteInventoryLevelsFromItemAndLocationsStep = createStep(
       return
     }
 
-    const service = container.resolve<IInventoryServiceNext>(
+    const service = container.resolve<IInventoryService>(
       ModuleRegistrationName.INVENTORY
     )
 

packages/core/core-flows/src/inventory/steps/update-inventory-items.ts

@@ -1,4 +1,4 @@
-import { IInventoryServiceNext, InventoryNext } from "@medusajs/types"
+import { IInventoryService, InventoryTypes } from "@medusajs/types"
 import { StepResponse, createStep } from "@medusajs/workflows-sdk"
 import {
   convertItemResponseToUpdateRequest,
@@ -10,18 +10,20 @@ import { ModuleRegistrationName } from "@medusajs/modules-sdk"
 export const updateInventoryItemsStepId = "update-inventory-items-step"
 export const updateInventoryItemsStep = createStep(
   updateInventoryItemsStepId,
-  async (input: InventoryNext.UpdateInventoryItemInput[], { container }) => {
-    const inventoryService = container.resolve<IInventoryServiceNext>(
+  async (input: InventoryTypes.UpdateInventoryItemInput[], { container }) => {
+    const inventoryService = container.resolve<IInventoryService>(
       ModuleRegistrationName.INVENTORY
     )
     const { selects, relations } = getSelectsAndRelationsFromObjectArray(input)
 
-    const dataBeforeUpdate = await inventoryService.list(
+    const dataBeforeUpdate = await inventoryService.listInventoryItems(
       { id: input.map(({ id }) => id) },
       {}
     )
 
-    const updatedInventoryItems = await inventoryService.update(input)
+    const updatedInventoryItems = await inventoryService.updateInventoryItems(
+      input
+    )
 
     return new StepResponse(updatedInventoryItems, {
       dataBeforeUpdate,
@@ -36,11 +38,11 @@ export const updateInventoryItemsStep = createStep(
 
     const { dataBeforeUpdate, selects, relations } = revertInput
 
-    const inventoryService = container.resolve<IInventoryServiceNext>(
+    const inventoryService = container.resolve<IInventoryService>(
       ModuleRegistrationName.INVENTORY
     )
 
-    await inventoryService.update(
+    await inventoryService.updateInventoryItems(
       dataBeforeUpdate.map((data) =>
         convertItemResponseToUpdateRequest(data, selects, relations)
       )

packages/core/core-flows/src/inventory/steps/update-inventory-levels.ts

@@ -1,4 +1,4 @@
-import { IInventoryServiceNext, InventoryNext } from "@medusajs/types"
+import { IInventoryService, InventoryTypes } from "@medusajs/types"
 import { StepResponse, createStep } from "@medusajs/workflows-sdk"
 import {
   convertItemResponseToUpdateRequest,
@@ -11,10 +11,10 @@ export const updateInventoryLevelsStepId = "update-inventory-levels-step"
 export const updateInventoryLevelsStep = createStep(
   updateInventoryLevelsStepId,
   async (
-    input: InventoryNext.BulkUpdateInventoryLevelInput[],
+    input: InventoryTypes.BulkUpdateInventoryLevelInput[],
     { container }
   ) => {
-    const inventoryService: IInventoryServiceNext = container.resolve(
+    const inventoryService: IInventoryService = container.resolve(
       ModuleRegistrationName.INVENTORY
     )
 
@@ -30,7 +30,7 @@ export const updateInventoryLevelsStep = createStep(
       {}
     )
 
-    const updatedLevels: InventoryNext.InventoryLevelDTO[] =
+    const updatedLevels: InventoryTypes.InventoryLevelDTO[] =
       await inventoryService.updateInventoryLevels(input)
 
     return new StepResponse(updatedLevels, {
@@ -51,7 +51,7 @@ export const updateInventoryLevelsStep = createStep(
     await inventoryService.updateInventoryLevels(
       dataBeforeUpdate.map((data) =>
         convertItemResponseToUpdateRequest(data, selects, relations)
-      ) as InventoryNext.BulkUpdateInventoryLevelInput[]
+      ) as InventoryTypes.BulkUpdateInventoryLevelInput[]
     )
   }
 )

packages/core/core-flows/src/inventory/steps/validate-inventory-locations.ts

@@ -5,13 +5,13 @@ import {
   remoteQueryObjectFromString,
 } from "@medusajs/utils"
 
-import { InventoryNext } from "@medusajs/types"
+import { InventoryTypes } from "@medusajs/types"
 import { createStep } from "@medusajs/workflows-sdk"
 
 export const validateInventoryLocationsStepId = "validate-inventory-levels-step"
 export const validateInventoryLocationsStep = createStep(
   validateInventoryLocationsStepId,
-  async (data: InventoryNext.CreateInventoryLevelInput[], { container }) => {
+  async (data: InventoryTypes.CreateInventoryLevelInput[], { container }) => {
     const remoteQuery = container.resolve(
       ContainerRegistrationKeys.REMOTE_QUERY
     )

packages/core/core-flows/src/inventory/workflows/bulk-create-delete-levels.ts

@@ -1,4 +1,4 @@
-import { InventoryLevelDTO, InventoryNext } from "@medusajs/types"
+import { InventoryLevelDTO, InventoryTypes } from "@medusajs/types"
 import { WorkflowData, createWorkflow } from "@medusajs/workflows-sdk"
 import {
   createInventoryLevelsStep,
@@ -6,7 +6,7 @@ import {
 } from "../steps"
 
 interface WorkflowInput {
-  creates: InventoryNext.CreateInventoryLevelInput[]
+  creates: InventoryTypes.CreateInventoryLevelInput[]
   deletes: { inventory_item_id: string; location_id: string }[]
 }
 

packages/core/core-flows/src/inventory/workflows/create-inventory-items.ts

@@ -5,22 +5,22 @@ import {
 } from "@medusajs/workflows-sdk"
 import { createInventoryItemsStep } from "../steps"
 
-import { InventoryNext } from "@medusajs/types"
+import { InventoryTypes } from "@medusajs/types"
 import { createInventoryLevelsWorkflow } from "./create-inventory-levels"
 
 type LocationLevelWithoutInventory = Omit<
-  InventoryNext.CreateInventoryLevelInput,
+  InventoryTypes.CreateInventoryLevelInput,
   "inventory_item_id"
 >
 interface WorkflowInput {
-  items: (InventoryNext.CreateInventoryItemInput & {
+  items: (InventoryTypes.CreateInventoryItemInput & {
     location_levels?: LocationLevelWithoutInventory[]
   })[]
 }
 
 const buildLocationLevelMapAndItemData = (data: WorkflowInput) => {
   data.items = data.items ?? []
-  const inventoryItems: InventoryNext.CreateInventoryItemInput[] = []
+  const inventoryItems: InventoryTypes.CreateInventoryItemInput[] = []
   // Keep an index to location levels mapping to inject the created inventory item
   // id into the location levels workflow input
   const locationLevelMap: Record<number, LocationLevelWithoutInventory[]> = {}
@@ -39,9 +39,9 @@ const buildLocationLevelMapAndItemData = (data: WorkflowInput) => {
 
 const buildInventoryLevelsInput = (data: {
   locationLevelMap: Record<number, LocationLevelWithoutInventory[]>
-  items: InventoryNext.InventoryItemDTO[]
+  items: InventoryTypes.InventoryItemDTO[]
 }) => {
-  const inventoryLevels: InventoryNext.CreateInventoryLevelInput[] = []
+  const inventoryLevels: InventoryTypes.CreateInventoryLevelInput[] = []
   let index = 0
 
   // The order of the input is critical to accurately create location levels for

packages/core/core-flows/src/inventory/workflows/create-inventory-levels.ts

@@ -1,4 +1,4 @@
-import { InventoryLevelDTO, InventoryNext } from "@medusajs/types"
+import { InventoryLevelDTO, InventoryTypes } from "@medusajs/types"
 import { WorkflowData, createWorkflow } from "@medusajs/workflows-sdk"
 import {
   createInventoryLevelsStep,
@@ -6,7 +6,7 @@ import {
 } from "../steps"
 
 interface WorkflowInput {
-  inventory_levels: InventoryNext.CreateInventoryLevelInput[]
+  inventory_levels: InventoryTypes.CreateInventoryLevelInput[]
 }
 export const createInventoryLevelsWorkflowId =
   "create-inventory-levels-workflow"

packages/core/core-flows/src/inventory/workflows/update-inventory-items.ts

@@ -1,17 +1,17 @@
 import { WorkflowData, createWorkflow } from "@medusajs/workflows-sdk"
 
-import { InventoryNext } from "@medusajs/types"
+import { InventoryTypes } from "@medusajs/types"
 import { updateInventoryItemsStep } from "../steps"
 
 interface WorkflowInput {
-  updates: InventoryNext.UpdateInventoryItemInput[]
+  updates: InventoryTypes.UpdateInventoryItemInput[]
 }
 export const updateInventoryItemsWorkflowId = "update-inventory-items-workflow"
 export const updateInventoryItemsWorkflow = createWorkflow(
   updateInventoryItemsWorkflowId,
   (
     input: WorkflowData<WorkflowInput>
-  ): WorkflowData<InventoryNext.InventoryItemDTO[]> => {
+  ): WorkflowData<InventoryTypes.InventoryItemDTO[]> => {
     return updateInventoryItemsStep(input.updates)
   }
 )

packages/core/core-flows/src/inventory/workflows/update-inventory-levels.ts

@@ -1,10 +1,10 @@
-import { InventoryLevelDTO, InventoryNext } from "@medusajs/types"
+import { InventoryLevelDTO, InventoryTypes } from "@medusajs/types"
 import { WorkflowData, createWorkflow } from "@medusajs/workflows-sdk"
 
 import { updateInventoryLevelsStep } from "../steps/update-inventory-levels"
 
 interface WorkflowInput {
-  updates: InventoryNext.BulkUpdateInventoryLevelInput[]
+  updates: InventoryTypes.BulkUpdateInventoryLevelInput[]
 }
 export const updateInventoryLevelsWorkflowId =
   "update-inventory-levels-workflow"

packages/core/core-flows/src/order/steps/archive-orders.ts

@@ -1,6 +1,6 @@
 import { ModuleRegistrationName } from "@medusajs/modules-sdk"
 import { IOrderModuleService } from "@medusajs/types"
-import { StepResponse, createStep } from "@medusajs/workflows-sdk"
+import { createStep, StepResponse } from "@medusajs/workflows-sdk"
 
 type ArchiveOrdersStepInput = {
   orderIds: string[]
@@ -34,6 +34,6 @@ export const archiveOrdersStep = createStep(
       ModuleRegistrationName.ORDER
     )
 
-    await service.update(archived)
+    await service.updateOrders(archived)
   }
 )

packages/core/core-flows/src/order/steps/cancel-orders.ts

@@ -1,6 +1,6 @@
 import { ModuleRegistrationName } from "@medusajs/modules-sdk"
 import { IOrderModuleService } from "@medusajs/types"
-import { StepResponse, createStep } from "@medusajs/workflows-sdk"
+import { createStep, StepResponse } from "@medusajs/workflows-sdk"
 
 type CompleteOrdersStepInput = {
   orderIds: string[]
@@ -14,7 +14,7 @@ export const cancelOrdersStep = createStep(
       ModuleRegistrationName.ORDER
     )
 
-    const orders = await service.list(
+    const orders = await service.listOrders(
       {
         id: data.orderIds,
       },
@@ -45,6 +45,6 @@ export const cancelOrdersStep = createStep(
       ModuleRegistrationName.ORDER
     )
 
-    await service.update(canceled)
+    await service.updateOrders(canceled)
   }
 )

packages/core/core-flows/src/order/steps/complete-orders.ts

@@ -1,6 +1,6 @@
 import { ModuleRegistrationName } from "@medusajs/modules-sdk"
 import { IOrderModuleService } from "@medusajs/types"
-import { StepResponse, createStep } from "@medusajs/workflows-sdk"
+import { createStep, StepResponse } from "@medusajs/workflows-sdk"
 
 type CompleteOrdersStepInput = {
   orderIds: string[]
@@ -14,7 +14,7 @@ export const completeOrdersStep = createStep(
       ModuleRegistrationName.ORDER
     )
 
-    const orders = await service.list(
+    const orders = await service.listOrders(
       {
         id: data.orderIds,
       },
@@ -44,6 +44,6 @@ export const completeOrdersStep = createStep(
       ModuleRegistrationName.ORDER
     )
 
-    await service.update(completed)
+    await service.updateOrders(completed)
   }
 )

packages/core/core-flows/src/order/steps/create-orders.ts

@@ -1,6 +1,6 @@
 import { ModuleRegistrationName } from "@medusajs/modules-sdk"
 import { CreateOrderDTO, IOrderModuleService } from "@medusajs/types"
-import { StepResponse, createStep } from "@medusajs/workflows-sdk"
+import { createStep, StepResponse } from "@medusajs/workflows-sdk"
 
 type CreateOrdersStepInput = CreateOrderDTO[]
 
@@ -12,7 +12,7 @@ export const createOrdersStep = createStep(
       ModuleRegistrationName.ORDER
     )
 
-    const created = await service.create(data)
+    const created = await service.createOrders(data)
     return new StepResponse(
       created,
       created.map((store) => store.id)
@@ -27,6 +27,6 @@ export const createOrdersStep = createStep(
       ModuleRegistrationName.ORDER
     )
 
-    await service.delete(createdIds)
+    await service.deleteOrders(createdIds)
   }
 )

packages/core/core-flows/src/pricing/steps/create-price-sets.ts

@@ -1,6 +1,6 @@
 import { ModuleRegistrationName } from "@medusajs/modules-sdk"
 import { CreatePriceSetDTO, IPricingModuleService } from "@medusajs/types"
-import { StepResponse, createStep } from "@medusajs/workflows-sdk"
+import { createStep, StepResponse } from "@medusajs/workflows-sdk"
 
 export const createPriceSetsStepId = "create-price-sets"
 export const createPriceSetsStep = createStep(
@@ -10,7 +10,7 @@ export const createPriceSetsStep = createStep(
       ModuleRegistrationName.PRICING
     )
 
-    const priceSets = await pricingModule.create(data)
+    const priceSets = await pricingModule.createPriceSets(data)
 
     return new StepResponse(
       priceSets,
@@ -26,6 +26,6 @@ export const createPriceSetsStep = createStep(
       ModuleRegistrationName.PRICING
     )
 
-    await pricingModule.delete(priceSets)
+    await pricingModule.deletePriceSets(priceSets)
   }
 )

packages/core/core-flows/src/pricing/steps/create-pricing-rule-types.ts

@@ -42,6 +42,6 @@ export const createPricingRuleTypesStep = createStep(
       ModuleRegistrationName.PRICING
     )
 
-    await pricingModule.delete(ruleTypeIds)
+    await pricingModule.deleteRuleTypes(ruleTypeIds)
   }
 )

packages/core/core-flows/src/pricing/steps/update-price-sets.ts

@@ -1,10 +1,10 @@
 import { ModuleRegistrationName } from "@medusajs/modules-sdk"
 import { IPricingModuleService, PricingTypes } from "@medusajs/types"
 import {
-  MedusaError,
   getSelectsAndRelationsFromObjectArray,
+  MedusaError,
 } from "@medusajs/utils"
-import { StepResponse, createStep } from "@medusajs/workflows-sdk"
+import { createStep, StepResponse } from "@medusajs/workflows-sdk"
 
 type UpdatePriceSetsStepInput =
   | {
@@ -31,11 +31,11 @@ export const updatePriceSetsStep = createStep(
         )
       }
 
-      const prevData = await pricingModule.list({
+      const prevData = await pricingModule.listPriceSets({
         id: data.price_sets.map((p) => p.id) as string[],
       })
 
-      const priceSets = await pricingModule.upsert(data.price_sets)
+      const priceSets = await pricingModule.upsertPriceSets(data.price_sets)
       return new StepResponse(priceSets, prevData)
     }
 
@@ -47,12 +47,12 @@ export const updatePriceSetsStep = createStep(
       data.update,
     ])
 
-    const dataBeforeUpdate = await pricingModule.list(data.selector, {
+    const dataBeforeUpdate = await pricingModule.listPriceSets(data.selector, {
       select: selects,
       relations,
     })
 
-    const updatedPriceSets = await pricingModule.update(
+    const updatedPriceSets = await pricingModule.updatePriceSets(
       data.selector,
       data.update
     )
@@ -68,6 +68,8 @@ export const updatePriceSetsStep = createStep(
       return
     }
 
-    await pricingModule.upsert(revertInput as PricingTypes.UpsertPriceSetDTO[])
+    await pricingModule.upsertPriceSets(
+      revertInput as PricingTypes.UpsertPriceSetDTO[]
+    )
   }
 )

packages/core/core-flows/src/product-category/steps/create-product-categories.ts

@@ -17,7 +17,9 @@ export const createProductCategoriesStep = createStep(
       ModuleRegistrationName.PRODUCT
     )
 
-    const created = await service.createCategories(data.product_categories)
+    const created = await service.createProductCategories(
+      data.product_categories
+    )
 
     return new StepResponse(
       created,
@@ -33,6 +35,6 @@ export const createProductCategoriesStep = createStep(
       ModuleRegistrationName.PRODUCT
     )
 
-    await service.deleteCategories(createdIds)
+    await service.deleteProductCategories(createdIds)
   }
 )

packages/core/core-flows/src/product-category/steps/delete-product-categories.ts

@@ -10,7 +10,7 @@ export const deleteProductCategoriesStep = createStep(
       ModuleRegistrationName.PRODUCT
     )
 
-    await service.softDeleteCategories(ids)
+    await service.softDeleteProductCategories(ids)
     return new StepResponse(void 0, ids)
   },
   async (prevIds, { container }) => {
@@ -22,6 +22,6 @@ export const deleteProductCategoriesStep = createStep(
       ModuleRegistrationName.PRODUCT
     )
 
-    await service.restoreCategories(prevIds)
+    await service.restoreProductCategories(prevIds)
   }
 )

packages/core/core-flows/src/product-category/steps/update-product-categories.ts

@@ -24,12 +24,12 @@ export const updateProductCategoriesStep = createStep(
       data.update,
     ])
 
-    const prevData = await service.listCategories(data.selector, {
+    const prevData = await service.listProductCategories(data.selector, {
       select: selects,
       relations,
     })
 
-    const productCategories = await service.updateCategories(
+    const productCategories = await service.updateProductCategories(
       data.selector,
       data.update
     )
@@ -44,6 +44,6 @@ export const updateProductCategoriesStep = createStep(
       ModuleRegistrationName.PRODUCT
     )
 
-    await service.upsertCategories(prevData)
+    await service.upsertProductCategories(prevData)
   }
 )

packages/core/core-flows/src/product/steps/batch-link-products-collection.ts

@@ -16,7 +16,7 @@ export const batchLinkProductsToCollectionStep = createStep(
       return new StepResponse(void 0, null)
     }
 
-    const dbCollection = await service.retrieveCollection(data.id, {
+    const dbCollection = await service.retrieveProductCollection(data.id, {
       take: null,
       select: ["id", "products.id"],
       relations: ["products"],
@@ -29,7 +29,7 @@ export const batchLinkProductsToCollectionStep = createStep(
       ...(data.add ?? []),
     ]
 
-    await service.updateCollections(data.id, {
+    await service.updateProductCollections(data.id, {
       product_ids: newProductIds,
     })
 
@@ -47,7 +47,7 @@ export const batchLinkProductsToCollectionStep = createStep(
       ModuleRegistrationName.PRODUCT
     )
 
-    await service.updateCollections(prevData.id, {
+    await service.updateProductCollections(prevData.id, {
       product_ids: prevData.productIds,
     })
   }

packages/core/core-flows/src/product/steps/batch-link-products-in-category.ts

@@ -19,7 +19,7 @@ export const batchLinkProductsToCategoryStep = createStep(
     }
 
     const toRemoveSet = new Set(data.remove?.map((id) => id))
-    const dbProducts = await service.list(
+    const dbProducts = await service.listProducts(
       { id: [...(data.add ?? []), ...(data.remove ?? [])] },
       {
         take: null,
@@ -43,7 +43,7 @@ export const batchLinkProductsToCategoryStep = createStep(
       }
     })
 
-    await service.upsert(productsWithUpdatedCategories)
+    await service.upsertProducts(productsWithUpdatedCategories)
 
     return new StepResponse(void 0, {
       id: data.id,
@@ -61,7 +61,7 @@ export const batchLinkProductsToCategoryStep = createStep(
       ModuleRegistrationName.PRODUCT
     )
 
-    const dbProducts = await service.list(
+    const dbProducts = await service.listProducts(
       { id: prevData.productIds },
       {
         take: null,
@@ -86,6 +86,6 @@ export const batchLinkProductsToCategoryStep = createStep(
       }
     })
 
-    await service.upsert(productsWithRevertedCategories)
+    await service.upsertProducts(productsWithRevertedCategories)
   }
 )

packages/core/core-flows/src/product/steps/create-collections.ts

@@ -10,7 +10,7 @@ export const createCollectionsStep = createStep(
       ModuleRegistrationName.PRODUCT
     )
 
-    const created = await service.createCollections(data)
+    const created = await service.createProductCollections(data)
     return new StepResponse(
       created,
       created.map((collection) => collection.id)
@@ -25,6 +25,6 @@ export const createCollectionsStep = createStep(
       ModuleRegistrationName.PRODUCT
     )
 
-    await service.deleteCollections(createdIds)
+    await service.deleteProductCollections(createdIds)
   }
 )

packages/core/core-flows/src/product/steps/create-product-options.ts

@@ -10,7 +10,7 @@ export const createProductOptionsStep = createStep(
       ModuleRegistrationName.PRODUCT
     )
 
-    const created = await service.createOptions(data)
+    const created = await service.createProductOptions(data)
     return new StepResponse(
       created,
       created.map((productOption) => productOption.id)
@@ -25,6 +25,6 @@ export const createProductOptionsStep = createStep(
       ModuleRegistrationName.PRODUCT
     )
 
-    await service.deleteOptions(createdIds)
+    await service.deleteProductOptions(createdIds)
   }
 )

packages/core/core-flows/src/product/steps/create-product-tags.ts

@@ -10,7 +10,7 @@ export const createProductTagsStep = createStep(
       ModuleRegistrationName.PRODUCT
     )
 
-    const created = await service.createTags(data)
+    const created = await service.createProductTags(data)
     return new StepResponse(
       created,
       created.map((productTag) => productTag.id)
@@ -25,6 +25,6 @@ export const createProductTagsStep = createStep(
       ModuleRegistrationName.PRODUCT
     )
 
-    await service.deleteTags(createdIds)
+    await service.deleteProductTags(createdIds)
   }
 )

packages/core/core-flows/src/product/steps/create-product-types.ts

@@ -10,7 +10,7 @@ export const createProductTypesStep = createStep(
       ModuleRegistrationName.PRODUCT
     )
 
-    const created = await service.createTypes(data)
+    const created = await service.createProductTypes(data)
     return new StepResponse(
       created,
       created.map((productType) => productType.id)
@@ -25,6 +25,6 @@ export const createProductTypesStep = createStep(
       ModuleRegistrationName.PRODUCT
     )
 
-    await service.deleteTypes(createdIds)
+    await service.deleteProductTypes(createdIds)
   }
 )

packages/core/core-flows/src/product/steps/create-product-variants.ts

@@ -9,7 +9,7 @@ export const createProductVariantsStep = createStep(
     const service = container.resolve<IProductModuleService>(
       ModuleRegistrationName.PRODUCT
     )
-    const created = await service.createVariants(data)
+    const created = await service.createProductVariants(data)
     return new StepResponse(
       created,
       created.map((productVariant) => productVariant.id)
@@ -24,6 +24,6 @@ export const createProductVariantsStep = createStep(
       ModuleRegistrationName.PRODUCT
     )
 
-    await service.deleteVariants(createdIds)
+    await service.deleteProductVariants(createdIds)
   }
 )

packages/core/core-flows/src/product/steps/create-products.ts

@@ -10,7 +10,7 @@ export const createProductsStep = createStep(
       ModuleRegistrationName.PRODUCT
     )
 
-    const created = await service.create(data)
+    const created = await service.createProducts(data)
     return new StepResponse(
       created,
       created.map((product) => product.id)
@@ -25,6 +25,6 @@ export const createProductsStep = createStep(
       ModuleRegistrationName.PRODUCT
     )
 
-    await service.delete(createdIds)
+    await service.deleteProducts(createdIds)
   }
 )

packages/core/core-flows/src/product/steps/delete-collections.ts

@@ -10,7 +10,7 @@ export const deleteCollectionsStep = createStep(
       ModuleRegistrationName.PRODUCT
     )
 
-    await service.softDeleteCollections(ids)
+    await service.softDeleteProductCollections(ids)
     return new StepResponse(void 0, ids)
   },
   async (prevIds, { container }) => {
@@ -22,6 +22,6 @@ export const deleteCollectionsStep = createStep(
       ModuleRegistrationName.PRODUCT
     )
 
-    await service.restoreCollections(prevIds)
+    await service.restoreProductCollections(prevIds)
   }
 )

packages/core/core-flows/src/product/steps/delete-product-options.ts

@@ -10,7 +10,7 @@ export const deleteProductOptionsStep = createStep(
       ModuleRegistrationName.PRODUCT
     )
 
-    await service.softDeleteOptions(ids)
+    await service.softDeleteProductOptions(ids)
     return new StepResponse(void 0, ids)
   },
   async (prevIds, { container }) => {
@@ -22,6 +22,6 @@ export const deleteProductOptionsStep = createStep(
       ModuleRegistrationName.PRODUCT
     )
 
-    await service.restoreOptions(prevIds)
+    await service.restoreProductOptions(prevIds)
   }
 )

packages/core/core-flows/src/product/steps/delete-product-tags.ts

@@ -10,7 +10,7 @@ export const deleteProductTagsStep = createStep(
       ModuleRegistrationName.PRODUCT
     )
 
-    await service.softDeleteTags(ids)
+    await service.softDeleteProductTags(ids)
     return new StepResponse(void 0, ids)
   },
   async (prevIds, { container }) => {
@@ -22,6 +22,6 @@ export const deleteProductTagsStep = createStep(
       ModuleRegistrationName.PRODUCT
     )
 
-    await service.restoreTags(prevIds)
+    await service.restoreProductTags(prevIds)
   }
 )

packages/core/core-flows/src/product/steps/delete-product-types.ts

@@ -10,7 +10,7 @@ export const deleteProductTypesStep = createStep(
       ModuleRegistrationName.PRODUCT
     )
 
-    await service.softDeleteTypes(ids)
+    await service.softDeleteProductTypes(ids)
     return new StepResponse(void 0, ids)
   },
   async (prevIds, { container }) => {
@@ -22,6 +22,6 @@ export const deleteProductTypesStep = createStep(
       ModuleRegistrationName.PRODUCT
     )
 
-    await service.restoreTypes(prevIds)
+    await service.restoreProductTypes(prevIds)
   }
 )

packages/core/core-flows/src/product/steps/delete-product-variants.ts

@@ -10,7 +10,7 @@ export const deleteProductVariantsStep = createStep(
       ModuleRegistrationName.PRODUCT
     )
 
-    await service.softDeleteVariants(ids)
+    await service.softDeleteProductVariants(ids)
     return new StepResponse(void 0, ids)
   },
   async (prevIds, { container }) => {
@@ -22,6 +22,6 @@ export const deleteProductVariantsStep = createStep(
       ModuleRegistrationName.PRODUCT
     )
 
-    await service.restoreVariants(prevIds)
+    await service.restoreProductVariants(prevIds)
   }
 )

packages/core/core-flows/src/product/steps/delete-products.ts

@@ -10,7 +10,7 @@ export const deleteProductsStep = createStep(
       ModuleRegistrationName.PRODUCT
     )
 
-    await service.softDelete(ids)
+    await service.softDeleteProducts(ids)
     return new StepResponse(void 0, ids)
   },
   async (prevIds, { container }) => {
@@ -22,6 +22,6 @@ export const deleteProductsStep = createStep(
       ModuleRegistrationName.PRODUCT
     )
 
-    await service.restore(prevIds)
+    await service.restoreProducts(prevIds)
   }
 )

packages/core/core-flows/src/product/steps/get-products.ts

@@ -18,7 +18,7 @@ export const getProductsStep = createStep(
       return new StepResponse([], [])
     }
 
-    const products = await service.list(
+    const products = await service.listProducts(
       { id: data.ids },
       { relations: ["variants"], take: null }
     )

packages/core/core-flows/src/product/steps/update-collections.ts

@@ -20,12 +20,12 @@ export const updateCollectionsStep = createStep(
       data.update,
     ])
 
-    const prevData = await service.listCollections(data.selector, {
+    const prevData = await service.listProductCollections(data.selector, {
       select: selects,
       relations,
     })
 
-    const collections = await service.updateCollections(
+    const collections = await service.updateProductCollections(
       data.selector,
       data.update
     )
@@ -40,7 +40,7 @@ export const updateCollectionsStep = createStep(
       ModuleRegistrationName.PRODUCT
     )
 
-    await service.upsertCollections(
+    await service.upsertProductCollections(
       prevData.map((r) => ({
         ...(r as unknown as ProductTypes.UpdateProductCollectionDTO),
       }))

packages/core/core-flows/src/product/steps/update-product-options.ts

@@ -20,12 +20,12 @@ export const updateProductOptionsStep = createStep(
       data.update,
     ])
 
-    const prevData = await service.listOptions(data.selector, {
+    const prevData = await service.listProductOptions(data.selector, {
       select: selects,
       relations,
     })
 
-    const productOptions = await service.updateOptions(
+    const productOptions = await service.updateProductOptions(
       data.selector,
       data.update
     )
@@ -40,7 +40,7 @@ export const updateProductOptionsStep = createStep(
       ModuleRegistrationName.PRODUCT
     )
 
-    await service.upsertOptions(
+    await service.upsertProductOptions(
       prevData.map((o) => ({
         ...o,
         values: o.values?.map((v) => v.value),

packages/core/core-flows/src/product/steps/update-product-tags.ts

@@ -20,12 +20,15 @@ export const updateProductTagsStep = createStep(
       data.update,
     ])
 
-    const prevData = await service.listTags(data.selector, {
+    const prevData = await service.listProductTags(data.selector, {
       select: selects,
       relations,
     })
 
-    const productTags = await service.updateTags(data.selector, data.update)
+    const productTags = await service.updateProductTags(
+      data.selector,
+      data.update
+    )
     return new StepResponse(productTags, prevData)
   },
   async (prevData, { container }) => {
@@ -37,6 +40,6 @@ export const updateProductTagsStep = createStep(
       ModuleRegistrationName.PRODUCT
     )
 
-    await service.upsertTags(prevData)
+    await service.upsertProductTags(prevData)
   }
 )

packages/core/core-flows/src/product/steps/update-product-types.ts

@@ -20,12 +20,15 @@ export const updateProductTypesStep = createStep(
       data.update,
     ])
 
-    const prevData = await service.listTypes(data.selector, {
+    const prevData = await service.listProductTypes(data.selector, {
       select: selects,
       relations,
     })
 
-    const productTypes = await service.updateTypes(data.selector, data.update)
+    const productTypes = await service.updateProductTypes(
+      data.selector,
+      data.update
+    )
     return new StepResponse(productTypes, prevData)
   },
   async (prevData, { container }) => {
@@ -37,6 +40,6 @@ export const updateProductTypesStep = createStep(
       ModuleRegistrationName.PRODUCT
     )
 
-    await service.upsertTypes(prevData)
+    await service.upsertProductTypes(prevData)
   }
 )

packages/core/core-flows/src/product/steps/update-product-variants.ts

@@ -31,11 +31,11 @@ export const updateProductVariantsStep = createStep(
         )
       }
 
-      const prevData = await service.listVariants({
+      const prevData = await service.listProductVariants({
         id: data.product_variants.map((p) => p.id) as string[],
       })
 
-      const productVariants = await service.upsertVariants(
+      const productVariants = await service.upsertProductVariants(
         data.product_variants
       )
       return new StepResponse(productVariants, prevData)
@@ -45,12 +45,12 @@ export const updateProductVariantsStep = createStep(
       data.update,
     ])
 
-    const prevData = await service.listVariants(data.selector, {
+    const prevData = await service.listProductVariants(data.selector, {
       select: selects,
       relations,
     })
 
-    const productVariants = await service.updateVariants(
+    const productVariants = await service.updateProductVariants(
       data.selector,
       data.update
     )
@@ -65,6 +65,6 @@ export const updateProductVariantsStep = createStep(
       ModuleRegistrationName.PRODUCT
     )
 
-    await service.upsertVariants(prevData)
+    await service.upsertProductVariants(prevData)
   }
 )

packages/core/core-flows/src/product/steps/update-products.ts

@@ -35,11 +35,11 @@ export const updateProductsStep = createStep(
         return new StepResponse([], [])
       }
 
-      const prevData = await service.list({
+      const prevData = await service.listProducts({
         id: data.products.map((p) => p.id) as string[],
       })
 
-      const products = await service.upsert(data.products)
+      const products = await service.upsertProducts(data.products)
       return new StepResponse(products, prevData)
     }
 
@@ -47,12 +47,12 @@ export const updateProductsStep = createStep(
       data.update,
     ])
 
-    const prevData = await service.list(data.selector, {
+    const prevData = await service.listProducts(data.selector, {
       select: selects,
       relations,
     })
 
-    const products = await service.update(data.selector, data.update)
+    const products = await service.updateProducts(data.selector, data.update)
     return new StepResponse(products, prevData)
   },
   async (prevData, { container }) => {
@@ -64,7 +64,7 @@ export const updateProductsStep = createStep(
       ModuleRegistrationName.PRODUCT
     )
 
-    await service.upsert(
+    await service.upsertProducts(
       prevData.map((r) => ({
         ...(r as unknown as ProductTypes.UpdateProductDTO),
       }))

packages/core/core-flows/src/product/workflows/create-product-variants.ts

@@ -1,5 +1,5 @@
 import { LinkDefinition, Modules } from "@medusajs/modules-sdk"
-import { InventoryNext, PricingTypes, ProductTypes } from "@medusajs/types"
+import { InventoryTypes, PricingTypes, ProductTypes } from "@medusajs/types"
 import {
   WorkflowData,
   createWorkflow,
@@ -40,7 +40,7 @@ const buildLink = (
 
 const buildLinksToCreate = (data: {
   createdVariants: ProductTypes.ProductVariantDTO[]
-  inventoryIndexMap: Record<number, InventoryNext.InventoryItemDTO>
+  inventoryIndexMap: Record<number, InventoryTypes.InventoryItemDTO>
   input: WorkflowInput
 }) => {
   let index = 0
@@ -83,7 +83,7 @@ const buildVariantItemCreateMap = (data: {
   input: WorkflowInput
 }) => {
   let index = 0
-  const map: Record<number, InventoryNext.CreateInventoryItemInput> = {}
+  const map: Record<number, InventoryTypes.CreateInventoryItemInput> = {}
 
   for (const variant of data.createdVariants || []) {
     const variantInput = data.input.product_variants[index]
@@ -156,7 +156,7 @@ export const createProductVariantsWorkflow = createWorkflow(
     const inventoryIndexMap = transform(
       { createdInventoryItems, variantItemCreateMap },
       (data) => {
-        const map: Record<number, InventoryNext.InventoryItemDTO> = {}
+        const map: Record<number, InventoryTypes.InventoryItemDTO> = {}
         let inventoryIndex = 0
 
         for (const variantIndex of Object.keys(data.variantItemCreateMap)) {

packages/core/core-flows/src/promotion/steps/create-campaigns.ts

@@ -26,6 +26,6 @@ export const createCampaignsStep = createStep(
       ModuleRegistrationName.PROMOTION
     )
 
-    await promotionModule.delete(createdCampaignIds)
+    await promotionModule.deleteCampaigns(createdCampaignIds)
   }
 )

packages/core/core-flows/src/promotion/steps/create-promotions.ts

@@ -10,7 +10,7 @@ export const createPromotionsStep = createStep(
       ModuleRegistrationName.PROMOTION
     )
 
-    const createdPromotions = await promotionModule.create(data)
+    const createdPromotions = await promotionModule.createPromotions(data)
 
     return new StepResponse(
       createdPromotions,
@@ -26,6 +26,6 @@ export const createPromotionsStep = createStep(
       ModuleRegistrationName.PROMOTION
     )
 
-    await promotionModule.delete(createdPromotionIds)
+    await promotionModule.deletePromotions(createdPromotionIds)
   }
 )

packages/core/core-flows/src/promotion/steps/delete-promotions.ts

@@ -10,7 +10,7 @@ export const deletePromotionsStep = createStep(
       ModuleRegistrationName.PROMOTION
     )
 
-    await promotionModule.softDelete(ids)
+    await promotionModule.softDeletePromotions(ids)
 
     return new StepResponse(void 0, ids)
   },
@@ -23,6 +23,6 @@ export const deletePromotionsStep = createStep(
       ModuleRegistrationName.PROMOTION
     )
 
-    await promotionModule.restore(idsToRestore)
+    await promotionModule.restorePromotions(idsToRestore)
   }
 )

packages/core/core-flows/src/promotion/steps/remove-rules-from-promotions.ts

@@ -18,7 +18,7 @@ export const removeRulesFromPromotionsStep = createStep(
       ModuleRegistrationName.PROMOTION
     )
 
-    const promotion = await promotionModule.retrieve(data.id, {
+    const promotion = await promotionModule.retrievePromotion(data.id, {
       relations: [
         "rules.values",
         "application_method.target_rules.values",

packages/core/core-flows/src/promotion/steps/update-promotions.ts

@@ -15,12 +15,12 @@ export const updatePromotionsStep = createStep(
     )
 
     const { selects, relations } = getSelectsAndRelationsFromObjectArray(data)
-    const dataBeforeUpdate = await promotionModule.list(
+    const dataBeforeUpdate = await promotionModule.listPromotions(
       { id: data.map((d) => d.id) },
       { relations, select: selects }
     )
 
-    const updatedPromotions = await promotionModule.update(data)
+    const updatedPromotions = await promotionModule.updatePromotions(data)
 
     return new StepResponse(updatedPromotions, {
       dataBeforeUpdate,
@@ -39,7 +39,7 @@ export const updatePromotionsStep = createStep(
       ModuleRegistrationName.PROMOTION
     )
 
-    await promotionModule.update(
+    await promotionModule.updatePromotions(
       dataBeforeUpdate.map((data) =>
         convertItemResponseToUpdateRequest(data, selects, relations)
       )

packages/core/core-flows/src/region/steps/create-regions.ts

@@ -10,7 +10,7 @@ export const createRegionsStep = createStep(
       ModuleRegistrationName.REGION
     )
 
-    const created = await service.create(data)
+    const created = await service.createRegions(data)
 
     return new StepResponse(
       created,
@@ -26,6 +26,6 @@ export const createRegionsStep = createStep(
       ModuleRegistrationName.REGION
     )
 
-    await service.delete(createdIds)
+    await service.deleteRegions(createdIds)
   }
 )

packages/core/core-flows/src/region/steps/delete-regions.ts

@@ -10,7 +10,7 @@ export const deleteRegionsStep = createStep(
       ModuleRegistrationName.REGION
     )
 
-    await service.softDelete(ids)
+    await service.softDeleteRegions(ids)
 
     return new StepResponse(void 0, ids)
   },
@@ -23,6 +23,6 @@ export const deleteRegionsStep = createStep(
       ModuleRegistrationName.REGION
     )
 
-    await service.restore(prevIds)
+    await service.restoreRegions(prevIds)
   }
 )

packages/core/core-flows/src/region/steps/update-regions.ts

@@ -24,7 +24,7 @@ export const updateRegionsStep = createStep(
       data.update,
     ])
 
-    const prevData = await service.list(data.selector, {
+    const prevData = await service.listRegions(data.selector, {
       select: selects,
       relations,
     })
@@ -33,7 +33,7 @@ export const updateRegionsStep = createStep(
       return new StepResponse(prevData, [])
     }
 
-    const regions = await service.update(data.selector, data.update)
+    const regions = await service.updateRegions(data.selector, data.update)
 
     return new StepResponse(regions, prevData)
   },
@@ -46,7 +46,7 @@ export const updateRegionsStep = createStep(
       ModuleRegistrationName.REGION
     )
 
-    await service.upsert(
+    await service.upsertRegions(
       prevData.map((r) => ({
         id: r.id,
         name: r.name,

packages/core/core-flows/src/reservation/steps/create-reservations.ts

@@ -1,4 +1,4 @@
-import { IInventoryServiceNext, InventoryNext } from "@medusajs/types"
+import { IInventoryService, InventoryTypes } from "@medusajs/types"
 import { StepResponse, createStep } from "@medusajs/workflows-sdk"
 
 import { ModuleRegistrationName } from "@medusajs/modules-sdk"
@@ -6,8 +6,8 @@ import { ModuleRegistrationName } from "@medusajs/modules-sdk"
 export const createReservationsStepId = "create-reservations-step"
 export const createReservationsStep = createStep(
   createReservationsStepId,
-  async (data: InventoryNext.CreateReservationItemInput[], { container }) => {
-    const service = container.resolve<IInventoryServiceNext>(
+  async (data: InventoryTypes.CreateReservationItemInput[], { container }) => {
+    const service = container.resolve<IInventoryService>(
       ModuleRegistrationName.INVENTORY
     )
 
@@ -23,7 +23,7 @@ export const createReservationsStep = createStep(
       return
     }
 
-    const service = container.resolve<IInventoryServiceNext>(
+    const service = container.resolve<IInventoryService>(
       ModuleRegistrationName.INVENTORY
     )
 

packages/core/core-flows/src/reservation/steps/delete-reservations-by-line-items.ts

@@ -1,14 +1,14 @@
 import { StepResponse, createStep } from "@medusajs/workflows-sdk"
 
 import { ModuleRegistrationName } from "@medusajs/modules-sdk"
-import { IInventoryServiceNext } from "@medusajs/types"
+import { IInventoryService } from "@medusajs/types"
 
 export const deleteReservationsByLineItemsStepId =
   "delete-reservations-by-line-items"
 export const deleteReservationsByLineItemsStep = createStep(
   deleteReservationsByLineItemsStepId,
   async (ids: string[], { container }) => {
-    const service = container.resolve<IInventoryServiceNext>(
+    const service = container.resolve<IInventoryService>(
       ModuleRegistrationName.INVENTORY
     )
 
@@ -21,7 +21,7 @@ export const deleteReservationsByLineItemsStep = createStep(
       return
     }
 
-    const service = container.resolve<IInventoryServiceNext>(
+    const service = container.resolve<IInventoryService>(
       ModuleRegistrationName.INVENTORY
     )
 

packages/core/core-flows/src/reservation/steps/delete-reservations.ts

@@ -1,13 +1,13 @@
 import { StepResponse, createStep } from "@medusajs/workflows-sdk"
 
 import { ModuleRegistrationName } from "@medusajs/modules-sdk"
-import { IInventoryServiceNext } from "@medusajs/types"
+import { IInventoryService } from "@medusajs/types"
 
 export const deleteReservationsStepId = "delete-reservations"
 export const deleteReservationsStep = createStep(
   deleteReservationsStepId,
   async (ids: string[], { container }) => {
-    const service = container.resolve<IInventoryServiceNext>(
+    const service = container.resolve<IInventoryService>(
       ModuleRegistrationName.INVENTORY
     )
 
@@ -20,7 +20,7 @@ export const deleteReservationsStep = createStep(
       return
     }
 
-    const service = container.resolve<IInventoryServiceNext>(
+    const service = container.resolve<IInventoryService>(
       ModuleRegistrationName.INVENTORY
     )
 

packages/core/core-flows/src/reservation/steps/update-reservations.ts

@@ -1,8 +1,4 @@
-import {
-  IInventoryServiceNext,
-  InventoryNext,
-  UpdateRuleTypeDTO,
-} from "@medusajs/types"
+import { IInventoryService, InventoryTypes } from "@medusajs/types"
 import { StepResponse, createStep } from "@medusajs/workflows-sdk"
 import {
   convertItemResponseToUpdateRequest,
@@ -14,8 +10,8 @@ import { ModuleRegistrationName } from "@medusajs/modules-sdk"
 export const updateReservationsStepId = "update-reservations-step"
 export const updateReservationsStep = createStep(
   updateReservationsStepId,
-  async (data: InventoryNext.UpdateReservationItemInput[], { container }) => {
-    const inventoryModuleService = container.resolve<IInventoryServiceNext>(
+  async (data: InventoryTypes.UpdateReservationItemInput[], { container }) => {
+    const inventoryModuleService = container.resolve<IInventoryService>(
       ModuleRegistrationName.INVENTORY
     )
 
@@ -41,7 +37,7 @@ export const updateReservationsStep = createStep(
 
     const { dataBeforeUpdate = [], selects, relations } = revertInput
 
-    const inventoryModuleService = container.resolve<IInventoryServiceNext>(
+    const inventoryModuleService = container.resolve<IInventoryService>(
       ModuleRegistrationName.INVENTORY
     )
 

packages/core/core-flows/src/sales-channel/steps/create-default-sales-channel.ts

@@ -18,10 +18,13 @@ export const createDefaultSalesChannelStep = createStep(
     )
 
     let shouldDelete = false
-    let [salesChannel] = await salesChannelService.list({}, { take: 1 })
+    let [salesChannel] = await salesChannelService.listSalesChannels(
+      {},
+      { take: 1 }
+    )
 
     if (!salesChannel) {
-      salesChannel = await salesChannelService.create(input.data)
+      salesChannel = await salesChannelService.createSalesChannels(input.data)
 
       shouldDelete = true
     }
@@ -37,6 +40,6 @@ export const createDefaultSalesChannelStep = createStep(
       ModuleRegistrationName.SALES_CHANNEL
     )
 
-    await service.delete(data.id)
+    await service.deleteSalesChannels(data.id)
   }
 )

packages/core/core-flows/src/sales-channel/steps/create-sales-channels.ts

@@ -17,7 +17,9 @@ export const createSalesChannelsStep = createStep(
       ModuleRegistrationName.SALES_CHANNEL
     )
 
-    const salesChannels = await salesChannelService.create(input.data)
+    const salesChannels = await salesChannelService.createSalesChannels(
+      input.data
+    )
 
     return new StepResponse(
       salesChannels,
@@ -33,6 +35,6 @@ export const createSalesChannelsStep = createStep(
       ModuleRegistrationName.SALES_CHANNEL
     )
 
-    await service.delete(createdIds)
+    await service.deleteSalesChannels(createdIds)
   }
 )

packages/core/core-flows/src/sales-channel/steps/delete-sales-channels.ts

@@ -12,7 +12,7 @@ export const deleteSalesChannelsStep = createStep(
       ModuleRegistrationName.SALES_CHANNEL
     )
 
-    await service.softDelete(ids)
+    await service.softDeleteSalesChannels(ids)
 
     return new StepResponse(void 0, ids)
   },
@@ -25,6 +25,6 @@ export const deleteSalesChannelsStep = createStep(
       ModuleRegistrationName.SALES_CHANNEL
     )
 
-    await service.restore(prevSalesChannelIds)
+    await service.restoreSalesChannels(prevSalesChannelIds)
   }
 )

packages/core/core-flows/src/sales-channel/steps/update-sales-channels.ts

@@ -24,12 +24,15 @@ export const updateSalesChannelsStep = createStep(
       data.update,
     ])
 
-    const prevData = await service.list(data.selector, {
+    const prevData = await service.listSalesChannels(data.selector, {
       select: selects,
       relations,
     })
 
-    const channels = await service.update(data.selector, data.update)
+    const channels = await service.updateSalesChannels(
+      data.selector,
+      data.update
+    )
 
     return new StepResponse(channels, prevData)
   },
@@ -42,7 +45,7 @@ export const updateSalesChannelsStep = createStep(
       ModuleRegistrationName.SALES_CHANNEL
     )
 
-    await service.upsert(
+    await service.upsertSalesChannels(
       prevData.map((r) => ({
         id: r.id,
         name: r.name,

packages/core/core-flows/src/stock-location/steps/create-stock-locations.ts

@@ -1,6 +1,6 @@
 import {
   CreateStockLocationInput,
-  IStockLocationServiceNext,
+  IStockLocationService,
 } from "@medusajs/types"
 import { StepResponse, createStep } from "@medusajs/workflows-sdk"
 
@@ -10,11 +10,11 @@ export const createStockLocationsStepId = "create-stock-locations"
 export const createStockLocations = createStep(
   createStockLocationsStepId,
   async (data: CreateStockLocationInput[], { container }) => {
-    const stockLocationService = container.resolve<IStockLocationServiceNext>(
+    const stockLocationService = container.resolve<IStockLocationService>(
       ModuleRegistrationName.STOCK_LOCATION
     )
 
-    const created = await stockLocationService.create(data)
+    const created = await stockLocationService.createStockLocations(data)
 
     return new StepResponse(
       created,
@@ -30,6 +30,6 @@ export const createStockLocations = createStep(
       ModuleRegistrationName.STOCK_LOCATION
     )
 
-    await stockLocationService.delete(createdStockLocationIds)
+    await stockLocationService.deleteStockLocations(createdStockLocationIds)
   }
 )

packages/core/core-flows/src/stock-location/steps/delete-stock-locations.ts

@@ -11,7 +11,7 @@ export const deleteStockLocationsStep = createStep(
   async (input: string[], { container }) => {
     const service = container.resolve(ModuleRegistrationName.STOCK_LOCATION)
 
-    const softDeletedEntities = await service.softDelete(input)
+    const softDeletedEntities = await service.softDeleteStockLocations(input)
 
     return new StepResponse(
       {
@@ -26,6 +26,6 @@ export const deleteStockLocationsStep = createStep(
     }
     const service = container.resolve(ModuleRegistrationName.STOCK_LOCATION)
 
-    await service.restore(deletedLocationIds)
+    await service.restoreStockLocations(deletedLocationIds)
   }
 )

packages/core/core-flows/src/stock-location/steps/update-stock-locations.ts

@@ -1,16 +1,12 @@
 import {
   FilterableStockLocationProps,
-  IStockLocationServiceNext,
-  UpdateStockLocationNextInput,
+  IStockLocationService,
+  UpdateStockLocationInput,
 } from "@medusajs/types"
 import { StepResponse, createStep } from "@medusajs/workflows-sdk"
-import {
-  convertItemResponseToUpdateRequest,
-  getSelectsAndRelationsFromObjectArray,
-} from "@medusajs/utils"
+import { getSelectsAndRelationsFromObjectArray } from "@medusajs/utils"
 
 import { ModuleRegistrationName } from "@medusajs/modules-sdk"
-import { UpdateStockLocationInput } from "@medusajs/types"
 
 interface StepInput {
   selector: FilterableStockLocationProps
@@ -21,23 +17,27 @@ export const updateStockLocationsStepId = "update-stock-locations-step"
 export const updateStockLocationsStep = createStep(
   updateStockLocationsStepId,
   async (input: StepInput, { container }) => {
-    const stockLocationService = container.resolve<IStockLocationServiceNext>(
+    const stockLocationService = container.resolve<IStockLocationService>(
       ModuleRegistrationName.STOCK_LOCATION
     )
     const { selects, relations } = getSelectsAndRelationsFromObjectArray([
       input.update,
     ])
 
-    const dataBeforeUpdate = await stockLocationService.list(input.selector, {
-      select: selects,
-      relations,
-    })
-
-    const updatedStockLocations = await stockLocationService.update(
+    const dataBeforeUpdate = await stockLocationService.listStockLocations(
       input.selector,
-      input.update
+      {
+        select: selects,
+        relations,
+      }
     )
 
+    const updatedStockLocations =
+      await stockLocationService.updateStockLocations(
+        input.selector,
+        input.update
+      )
+
     return new StepResponse(updatedStockLocations, dataBeforeUpdate)
   },
   async (revertInput, { container }) => {
@@ -45,11 +45,11 @@ export const updateStockLocationsStep = createStep(
       return
     }
 
-    const stockLocationService = container.resolve<IStockLocationServiceNext>(
+    const stockLocationService = container.resolve<IStockLocationService>(
       ModuleRegistrationName.STOCK_LOCATION
     )
 
-    await stockLocationService.upsert(
+    await stockLocationService.upsertStockLocations(
       revertInput.map((item) => ({
         id: item.id,
         name: item.name,

packages/core/core-flows/src/stock-location/workflows/update-stock-locations.ts

@@ -1,12 +1,10 @@
 import {
-  InventoryNext,
   StockLocationDTO,
-  UpdateStockLocationNextInput,
+  UpdateStockLocationInput,
+  FilterableStockLocationProps,
 } from "@medusajs/types"
 import { WorkflowData, createWorkflow } from "@medusajs/workflows-sdk"
 
-import { FilterableStockLocationProps } from "@medusajs/types"
-import { UpdateStockLocationInput } from "@medusajs/types"
 import { updateStockLocationsStep } from "../steps"
 
 interface WorkflowInput {

packages/core/core-flows/src/store/steps/create-stores.ts

@@ -14,7 +14,7 @@ export const createStoresStep = createStep(
       ModuleRegistrationName.STORE
     )
 
-    const created = await service.create(data.stores)
+    const created = await service.createStores(data.stores)
     return new StepResponse(
       created,
       created.map((store) => store.id)
@@ -29,6 +29,6 @@ export const createStoresStep = createStep(
       ModuleRegistrationName.STORE
     )
 
-    await service.delete(createdIds)
+    await service.deleteStores(createdIds)
   }
 )

packages/core/core-flows/src/store/steps/delete-stores.ts

@@ -10,7 +10,7 @@ export const deleteStoresStep = createStep(
       ModuleRegistrationName.STORE
     )
 
-    await storeModule.softDelete(ids)
+    await storeModule.softDeleteStores(ids)
     return new StepResponse(void 0, ids)
   },
   async (idsToRestore, { container }) => {
@@ -22,6 +22,6 @@ export const deleteStoresStep = createStep(
       ModuleRegistrationName.STORE
     )
 
-    await storeModule.restore(idsToRestore)
+    await storeModule.restoreStores(idsToRestore)
   }
 )

packages/core/core-flows/src/store/steps/update-stores.ts

@@ -24,12 +24,12 @@ export const updateStoresStep = createStep(
       data.update,
     ])
 
-    const prevData = await service.list(data.selector, {
+    const prevData = await service.listStores(data.selector, {
       select: selects,
       relations,
     })
 
-    const stores = await service.update(data.selector, data.update)
+    const stores = await service.updateStores(data.selector, data.update)
     return new StepResponse(stores, prevData)
   },
   async (prevData, { container }) => {
@@ -41,7 +41,7 @@ export const updateStoresStep = createStep(
       ModuleRegistrationName.STORE
     )
 
-    await service.upsert(
+    await service.upsertStores(
       prevData.map((r) => ({
         ...r,
         metadata: r.metadata || undefined,

packages/core/core-flows/src/tax/steps/create-tax-rates.ts

@@ -1,6 +1,6 @@
 import { ModuleRegistrationName } from "@medusajs/modules-sdk"
 import { CreateTaxRateDTO, ITaxModuleService } from "@medusajs/types"
-import { StepResponse, createStep } from "@medusajs/workflows-sdk"
+import { createStep, StepResponse } from "@medusajs/workflows-sdk"
 
 export const createTaxRatesStepId = "create-tax-rates"
 export const createTaxRatesStep = createStep(
@@ -10,7 +10,7 @@ export const createTaxRatesStep = createStep(
       ModuleRegistrationName.TAX
     )
 
-    const created = await service.create(data)
+    const created = await service.createTaxRates(data)
 
     return new StepResponse(
       created,
@@ -26,6 +26,6 @@ export const createTaxRatesStep = createStep(
       ModuleRegistrationName.TAX
     )
 
-    await service.delete(createdIds)
+    await service.deleteTaxRates(createdIds)
   }
 )