diff --git a/src/buy/components/Buy.test.tsx b/src/buy/components/Buy.test.tsx
index ebe8c93e11..ba3606f6da 100644
--- a/src/buy/components/Buy.test.tsx
+++ b/src/buy/components/Buy.test.tsx
@@ -1,5 +1,6 @@
 import { fireEvent, render, screen } from '@testing-library/react';
 import { type Mock, beforeEach, describe, expect, it, vi } from 'vitest';
+import { useOnchainKit } from '../../core-react/useOnchainKit';
 import { degenToken } from '../../token/constants';
 import { useOutsideClick } from '../../ui/react/internal/hooks/useOutsideClick';
 import { Buy } from './Buy';
@@ -24,6 +25,10 @@ vi.mock('../../ui/react/internal/hooks/useOutsideClick', () => ({
   useOutsideClick: vi.fn(),
 }));
 
+vi.mock('../../core-react/useOnchainKit', () => ({
+  useOnchainKit: vi.fn(),
+}));
+
 type useOutsideClickType = ReturnType<
   typeof vi.fn<
     (
@@ -61,11 +66,15 @@ describe('Buy', () => {
       },
     );
 
+    (useOnchainKit as Mock).mockReturnValue({
+      projectId: 'mock-project-id',
+    });
+
     vi.clearAllMocks();
   });
 
   it('renders the Buy component', () => {
-    render(<Buy className="test-class" toToken={degenToken} projectId="123" />);
+    render(<Buy className="test-class" toToken={degenToken} />);
 
     expect(screen.getByText('Buy')).toBeInTheDocument();
     expect(screen.getByText('DEGEN')).toBeInTheDocument();
@@ -88,7 +97,7 @@ describe('Buy', () => {
       },
     });
 
-    render(<Buy className="test-class" toToken={degenToken} projectId="123" />);
+    render(<Buy className="test-class" toToken={degenToken} />);
 
     expect(screen.getByTestId('mock-BuyDropdown')).toBeDefined();
     mockOutsideClickCallback({} as MouseEvent);
@@ -113,7 +122,7 @@ describe('Buy', () => {
       },
     });
 
-    render(<Buy className="test-class" toToken={degenToken} projectId="123" />);
+    render(<Buy className="test-class" toToken={degenToken} />);
 
     expect(screen.getByTestId('mock-BuyDropdown')).toBeDefined();
     fireEvent.click(screen.getByTestId('mock-BuyDropdown'));
@@ -121,7 +130,7 @@ describe('Buy', () => {
   });
 
   it('should not trigger click handler when dropdown is closed', () => {
-    render(<Buy className="test-class" toToken={degenToken} projectId="123" />);
+    render(<Buy className="test-class" toToken={degenToken} />);
     expect(screen.queryByTestId('mock-BuyDropdown')).not.toBeInTheDocument();
   });
 });
diff --git a/src/buy/components/BuyProvider.test.tsx b/src/buy/components/BuyProvider.test.tsx
index 37b3c41994..a6a4e68804 100644
--- a/src/buy/components/BuyProvider.test.tsx
+++ b/src/buy/components/BuyProvider.test.tsx
@@ -9,6 +9,7 @@ import {
 import React, { act, useCallback, useEffect } from 'react';
 import type { TransactionReceipt } from 'viem';
 import {
+  type Mock,
   afterEach,
   beforeEach,
   describe,
@@ -30,6 +31,7 @@ import { mock } from 'wagmi/connectors';
 import { useSendCalls } from 'wagmi/experimental';
 import { useCapabilitiesSafe } from '../../core-react/internal/hooks/useCapabilitiesSafe';
 import { buildSwapTransaction } from '../../core/api/buildSwapTransaction';
+import { useOnchainKit } from '../../core-react/useOnchainKit';
 import { getBuyQuote } from '../utils/getBuyQuote';
 import {
   daiToken,
@@ -62,6 +64,10 @@ vi.mock('../../swap/utils/processSwapTransaction', () => ({
   processSwapTransaction: vi.fn(),
 }));
 
+vi.mock('../../core-react/useOnchainKit', () => ({
+  useOnchainKit: vi.fn(),
+}));
+
 // vi.mock('../../swap/utils/isSwapError', () => ({
 //   isSwapError: vi.fn(),
 // }));
@@ -165,6 +171,12 @@ const renderWithProviders = ({
 }) => {
   const config = { maxSlippage: 10 };
   const mockExperimental = { useAggregator: true };
+  (useOnchainKit as Mock).mockReturnValue({
+    projectId: 'mock-project-id',
+    config: {
+      paymaster: undefined,
+    },
+  });
   return render(
     <WagmiProvider config={accountConfig}>
       <QueryClientProvider client={queryClient}>
@@ -266,6 +278,12 @@ const TestSwapComponent = () => {
 
 describe('useBuyContext', () => {
   beforeEach(async () => {
+    (useOnchainKit as Mock).mockReturnValue({
+      projectId: 'mock-project-id',
+      config: {
+        paymaster: undefined,
+      },
+    });
     vi.resetAllMocks();
     (useAccount as ReturnType<typeof vi.fn>).mockReturnValue({
       address: '0x123',
@@ -278,6 +296,7 @@ describe('useBuyContext', () => {
     (useSwitchChain as ReturnType<typeof vi.fn>).mockReturnValue({
       switchChainAsync: mockSwitchChain,
     });
+
     await act(async () => {
       renderWithProviders({ Component: () => null });
     });
@@ -332,6 +351,12 @@ describe('BuyProvider', () => {
       switchChainAsync: mockSwitchChain,
     });
     (useCapabilitiesSafe as ReturnType<typeof vi.fn>).mockReturnValue({});
+    (useOnchainKit as Mock).mockReturnValue({
+      projectId: 'mock-project-id',
+      config: {
+        paymaster: undefined,
+      },
+    });
   });
 
   it('should reset inputs when setLifecycleStatus is called with success', async () => {
@@ -705,7 +730,7 @@ describe('BuyProvider', () => {
     expect(result.current.lifecycleStatus).toEqual({
       statusName: 'error',
       statusData: expect.objectContaining({
-        code: 'TmSPc01',
+        code: 'TmBPc02',
         error: JSON.stringify(mockError),
         message: '',
       }),
@@ -773,7 +798,7 @@ describe('BuyProvider', () => {
       expect(
         screen.getByTestId('context-value-lifecycleStatus-statusData-code')
           .textContent,
-      ).toBe('TmSPc02');
+      ).toBe('TmBPc03');
     });
   });
 
@@ -790,7 +815,7 @@ describe('BuyProvider', () => {
       expect(
         screen.getByTestId('context-value-lifecycleStatus-statusData-code')
           .textContent,
-      ).toBe('TmSPc02');
+      ).toBe('TmBPc03');
     });
   });
 
diff --git a/src/buy/components/BuyProvider.tsx b/src/buy/components/BuyProvider.tsx
index f6ef2418c4..c479facc21 100644
--- a/src/buy/components/BuyProvider.tsx
+++ b/src/buy/components/BuyProvider.tsx
@@ -56,6 +56,7 @@ export function BuyProvider({
 }: BuyProviderReact) {
   const {
     config: { paymaster } = { paymaster: undefined },
+    projectId,
   } = useOnchainKit();
   const { address, chainId } = useAccount();
   const { switchChainAsync } = useSwitchChain();
@@ -89,7 +90,6 @@ export function BuyProvider({
   // Refreshes balances and inputs post-swap
   const resetInputs = useResetBuyInputs({ fromETH, fromUSDC, from, to });
 
-  const { projectId } = useOnchainKit();
   if (!projectId) {
     throw new Error(
       'Buy: Project ID is required, please set the projectId in the OnchainKitProvider',
diff --git a/src/internal/svg/appleSvg.tsx b/src/internal/svg/appleSvg.tsx
index 34da7a1b14..3126142a29 100644
--- a/src/internal/svg/appleSvg.tsx
+++ b/src/internal/svg/appleSvg.tsx
@@ -6,7 +6,7 @@ export const appleSvg = (
     id="Artwork"
     data-testid="appleSvg"
   >
-    <title>Apple Pay</title>
+    <title>Apple Pay Onramp</title>
     <path
       id="XMLID_4_"
       d="M150.7 0h-139c-1 0-2.1.1-3.1.3-1 .2-2 .5-3 1-.9.4-1.8 1.1-2.5 1.8S1.7 4.7 1.3 5.6c-.5.9-.8 1.9-1 3-.2 1-.2 2.1-.3 3.1v82.5c0 1 .1 2.1.3 3.1.2 1 .5 2 1 3 .5.9 1.1 1.8 1.8 2.5s1.6 1.4 2.5 1.8c.9.5 1.9.8 3 1 1 .2 2.1.2 3.1.3h142.1c1 0 2.1-.1 3.1-.3 1-.2 2-.5 3-1 .9-.5 1.8-1.1 2.5-1.8s1.4-1.6 1.8-2.5c.5-.9.8-1.9 1-3 .2-1 .2-2.1.3-3.1v-1.4-78-1.7-1.4c0-1-.1-2.1-.3-3.1-.2-1-.5-2-1-3-.5-.9-1.1-1.8-1.8-2.5s-1.6-1.4-2.5-1.8c-.9-.5-1.9-.8-3-1-1-.2-2.1-.2-3.1-.3H150.7z"
diff --git a/src/internal/svg/cardSvg.tsx b/src/internal/svg/cardSvg.tsx
index 7d9aaded0a..7b51b1de53 100644
--- a/src/internal/svg/cardSvg.tsx
+++ b/src/internal/svg/cardSvg.tsx
@@ -11,7 +11,7 @@ export const cardSvg = (
     strokeLinejoin="round"
     data-testid="cardSvg"
   >
-    <title>Debit Card</title>
+    <title>Debit Card Onramp</title>
     <rect x="2" y="4" width="20" height="16" rx="2" />
     <path d="M7 15h0M2 9.5h20" />
   </svg>
diff --git a/src/internal/svg/coinbaseLogoSvg.tsx b/src/internal/svg/coinbaseLogoSvg.tsx
index 3d6a7e48a8..0ae2a6b268 100644
--- a/src/internal/svg/coinbaseLogoSvg.tsx
+++ b/src/internal/svg/coinbaseLogoSvg.tsx
@@ -10,7 +10,7 @@ export const coinbaseLogoSvg = (
     className={cn(icon.foreground)}
     data-testid="coinbaseLogoSvg"
   >
-    <title>Coinbase Pay</title>
+    <title>Coinbase Pay Onramp</title>
     <path
       d="M7.93154 12.5C5.74045 12.5 3.96577 10.6354 3.96577 8.33333C3.96577 6.03125 5.74045 4.16667 7.93154 4.16667C9.8946 4.16667 11.5239 5.67014 11.8378 7.63889H15.8333C15.4962 3.36111 12.089 0 7.93154 0C3.55267 0 0 3.73264 0 8.33333C0 12.934 3.55267 16.6667 7.93154 16.6667C12.089 16.6667 15.4962 13.3056 15.8333 9.02778H11.8378C11.5239 10.9965 9.8946 12.5 7.93154 12.5Z"
       fill="#0052FF"