diff --git a/packages/commercelayer/src/api/endpoints/checkout/get-checkout.ts b/packages/commercelayer/src/api/endpoints/checkout/get-checkout.ts
index 1514553c2..ed6bde659 100644
--- a/packages/commercelayer/src/api/endpoints/checkout/get-checkout.ts
+++ b/packages/commercelayer/src/api/endpoints/checkout/get-checkout.ts
@@ -1,6 +1,6 @@
 import type { CheckoutEndpoint } from '.'
-import { Orders } from '@commercelayer/sdk'
 import getCredentials from '../../utils/getCredentials'
+import { Order } from '@commercelayer/sdk'
 
 const getCheckout: CheckoutEndpoint['handlers']['getCheckout'] = async ({
   req,
@@ -18,7 +18,7 @@ const getCheckout: CheckoutEndpoint['handlers']['getCheckout'] = async ({
 
   const { ENDPOINT } = getCredentials()
   if (orderId && accessToken) {
-    const clOrder = await Orders.withCredentials({ ENDPOINT, accessToken })
+    const clOrder = await Order.withCredentials({ endpoint, accessToken })
       .includes('lineItems')
       .find(orderId as string, { rawResponse: true })
     const checkoutUrl = clOrder.data.attributes.checkout_url
diff --git a/packages/commercelayer/src/cart/use-add-item.tsx b/packages/commercelayer/src/cart/use-add-item.tsx
index a1d7d7642..30f8149ea 100644
--- a/packages/commercelayer/src/cart/use-add-item.tsx
+++ b/packages/commercelayer/src/cart/use-add-item.tsx
@@ -15,8 +15,8 @@ export const handler: MutationHook<any> = {
   },
   async fetcher({ input }) {
     const localOrderId = localStorage.getItem('CL_ORDER_ID')
-    const { accessToken, endpoint } = getCredentials()
-    const organization = getOrganizationSlug(endpoint).organization
+    const { accessToken, ENDPOINT } = getCredentials()
+    const organization = getOrganizationSlug(ENDPOINT).organization
     const sdk = CLSdk({
       accessToken,
       organization,
diff --git a/packages/commercelayer/src/cart/use-cart.tsx b/packages/commercelayer/src/cart/use-cart.tsx
index 98a1bcdda..865c9104f 100644
--- a/packages/commercelayer/src/cart/use-cart.tsx
+++ b/packages/commercelayer/src/cart/use-cart.tsx
@@ -16,7 +16,7 @@ export const handler: SWRHook<any> = {
   async fetcher() {
     const id = localStorage.getItem('CL_ORDER_ID') || ''
     const credentials = getCredentials()
-    const organization = getOrganizationSlug(credentials.endpoint).organization
+    const organization = getOrganizationSlug(credentials.ENDPOINT).organization
     const sdk = CLSdk({
       accessToken: credentials.accessToken,
       organization,
@@ -57,7 +57,6 @@ export const handler: SWRHook<any> = {
     ({ useData }) =>
     () => {
       const response = useData()
-      console.log('response', response)
       return useMemo(
         () =>
           Object.create(response, {
diff --git a/packages/commercelayer/src/cart/use-remove-item.tsx b/packages/commercelayer/src/cart/use-remove-item.tsx
index 6f5b91ed3..04ef485e3 100644
--- a/packages/commercelayer/src/cart/use-remove-item.tsx
+++ b/packages/commercelayer/src/cart/use-remove-item.tsx
@@ -17,7 +17,7 @@ export const handler: MutationHook<any> = {
   async fetcher({ input: { id } }) {
     const credentials = getCredentials()
     const orderId = localStorage.getItem('CL_ORDER_ID')
-    const organization = getOrganizationSlug(credentials.endpoint).organization
+    const organization = getOrganizationSlug(credentials.ENDPOINT).organization
     const sdk = CLSdk({
       accessToken: credentials.accessToken,
       organization,
diff --git a/packages/commercelayer/src/cart/use-update-item.tsx b/packages/commercelayer/src/cart/use-update-item.tsx
index 86980b936..abe1c9aeb 100644
--- a/packages/commercelayer/src/cart/use-update-item.tsx
+++ b/packages/commercelayer/src/cart/use-update-item.tsx
@@ -17,7 +17,7 @@ export const handler: MutationHook<any> = {
   },
   async fetcher({ input: { item, quantity } }) {
     const credentials = getCredentials()
-    const organization = getOrganizationSlug(credentials.endpoint).organization
+    const organization = getOrganizationSlug(credentials.ENDPOINT).organization
     const sdk = CLSdk({
       accessToken: credentials.accessToken,
       organization,