diff --git a/src/App.tsx b/src/App.tsx
index f6a6a7d..862a6d8 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -2769,7 +2769,7 @@ function App() {
                          fontSize: "12px",
                        }}
                      >
-                       {"Using gateway"} 
+                       {"Using public node"} 
                      </Typography>
                  </>
             )}
diff --git a/src/ExtStates/NotAuthenticated.tsx b/src/ExtStates/NotAuthenticated.tsx
index f693a38..89c3406 100644
--- a/src/ExtStates/NotAuthenticated.tsx
+++ b/src/ExtStates/NotAuthenticated.tsx
@@ -407,12 +407,10 @@ export const NotAuthenticated = ({
           fontSize: '18px'
         }}
       >
-        WELCOME TO <TextItalic sx={{
-          fontSize: '18px'
-        }}>YOUR</TextItalic> <br></br>
+        WELCOME TO 
         <TextSpan sx={{
           fontSize: '18px'
-        }}> QORTAL WALLET</TextSpan>
+        }}> QORTAL</TextSpan>
       </TextP>
       
       <Spacer height="30px" />
@@ -436,7 +434,7 @@ export const NotAuthenticated = ({
       >
         <CustomButton onClick={()=> setExtstate('wallets')}>
           {/* <input {...getInputProps()} /> */}
-          Wallets
+          Accounts
         </CustomButton>
         </HtmlTooltip>
         {/* <Tooltip title="Authenticate by importing your Qortal JSON file" arrow>
@@ -482,7 +480,7 @@ export const NotAuthenticated = ({
             }
           }}
         >
-          Create wallet
+          Create account
         </CustomButton>
         </HtmlTooltip>
       
diff --git a/src/Wallets.tsx b/src/Wallets.tsx
index 8641a34..2c7b5e7 100644
--- a/src/Wallets.tsx
+++ b/src/Wallets.tsx
@@ -134,11 +134,11 @@ export const Wallets = ({ setExtState, setRawWallet, rawWallet }) => {
         setPassword('')
         setSeedError('')
       } else {
-        setSeedError('Could not create wallet.')
+        setSeedError('Could not create account.')
       }
 
     } catch (error) {
-      setSeedError(error?.message || 'Could not create wallet.')
+      setSeedError(error?.message || 'Could not create account.')
     } finally {
       setIsLoadingEncryptSeed(false)
     }
@@ -176,19 +176,19 @@ export const Wallets = ({ setExtState, setRawWallet, rawWallet }) => {
       {(wallets?.length === 0 ||
         !wallets) ? (
           <>
-            <Typography>No wallets saved</Typography>
+            <Typography>No accounts saved</Typography>
             <Spacer height="75px" />
           </>
         ): (
             <>
-            <Typography>Your saved wallets</Typography>
+            <Typography>Your saved accounts</Typography>
             <Spacer height="30px" />
           </>
         )}
 
       {rawWallet && (
         <Box>
-          <Typography>Selected Wallet:</Typography>
+          <Typography>Selected Account:</Typography>
           {rawWallet?.name && <Typography>{rawWallet.name}</Typography>}
           {rawWallet?.address0 && (
             <Typography>{rawWallet?.address0}</Typography>
@@ -267,7 +267,7 @@ export const Wallets = ({ setExtState, setRawWallet, rawWallet }) => {
           padding: '10px'
         }} {...getRootProps()}>
           <input {...getInputProps()} />
-          Add wallets
+          Add account
         </CustomButton>
         </HtmlTooltip>
       </Box>
diff --git a/src/components/CoreSyncStatus.tsx b/src/components/CoreSyncStatus.tsx
index 641996a..2334bef 100644
--- a/src/components/CoreSyncStatus.tsx
+++ b/src/components/CoreSyncStatus.tsx
@@ -97,7 +97,7 @@ export const CoreSyncStatus = ({imageSize, position}) => {
           <h4 className="lineHeight">{message}</h4>
           <h4 className="lineHeight">Block Height: <span style={{ color: '#03a9f4' }}>{height || ''}</span></h4>
           <h4 className="lineHeight">Connected Peers: <span style={{ color: '#03a9f4' }}>{numberOfConnections || ''}</span></h4>
-          <h4 className="lineHeight">Using gateway: <span style={{ color: '#03a9f4' }}>{isUsingGateway?.toString()}</span></h4>
+          <h4 className="lineHeight">Using public node: <span style={{ color: '#03a9f4' }}>{isUsingGateway?.toString()}</span></h4>
           <i></i>
         </div>
       </div>
diff --git a/src/qortalRequests/get.ts b/src/qortalRequests/get.ts
index 956fa07..6e27f8a 100644
--- a/src/qortalRequests/get.ts
+++ b/src/qortalRequests/get.ts
@@ -679,7 +679,7 @@ export const decryptDataWithSharingKey = async (data, sender) => {
 export const getHostedData = async (data, isFromExtension) => {
   const isGateway = await isRunningGateway();
   if (isGateway) {
-    throw new Error("This action cannot be done through a gateway");
+    throw new Error("This action cannot be done through a public node");
   }
   const resPermission = await getUserPermission(
     {
@@ -715,7 +715,7 @@ export const getHostedData = async (data, isFromExtension) => {
 export const deleteHostedData = async (data, isFromExtension) => {
   const isGateway = await isRunningGateway();
   if (isGateway) {
-    throw new Error("This action cannot be done through a gateway");
+    throw new Error("This action cannot be done through a public node");
   }
   const requiredFields = ["hostedData"];
   const missingFields: string[] = [];
@@ -800,7 +800,7 @@ export const decryptData = async (data) => {
 export const getListItems = async (data, isFromExtension) => {
   const isGateway = await isRunningGateway();
   if (isGateway) {
-    throw new Error("This action cannot be done through a gateway");
+    throw new Error("This action cannot be done through a public node");
   }
   const requiredFields = ["list_name"];
   const missingFields: string[] = [];
@@ -857,7 +857,7 @@ export const getListItems = async (data, isFromExtension) => {
 export const addListItems = async (data, isFromExtension) => {
   const isGateway = await isRunningGateway();
   if (isGateway) {
-    throw new Error("This action cannot be done through a gateway");
+    throw new Error("This action cannot be done through a public node");
   }
   const requiredFields = ["list_name", "items"];
   const missingFields: string[] = [];
@@ -915,7 +915,7 @@ export const addListItems = async (data, isFromExtension) => {
 export const deleteListItems = async (data, isFromExtension) => {
   const isGateway = await isRunningGateway();
   if (isGateway) {
-    throw new Error("This action cannot be done through a gateway");
+    throw new Error("This action cannot be done through a public node");
   }
   const requiredFields = ["list_name"];
   const missingFields: string[] = [];
@@ -2575,7 +2575,7 @@ export const getForeignFee = async (data) => {
 export const updateForeignFee = async (data) => {
   const isGateway = await isRunningGateway();
   if (isGateway) {
-    throw new Error("This action cannot be done through a gateway");
+    throw new Error("This action cannot be done through a public node");
   }
   const requiredFields = ["coin", "type", "value"];
   const missingFields: string[] = [];
@@ -2675,7 +2675,7 @@ export const getServerConnectionHistory = async (data) => {
 export const setCurrentForeignServer = async (data) => {
   const isGateway = await isRunningGateway();
   if (isGateway) {
-    throw new Error("This action cannot be done through a gateway");
+    throw new Error("This action cannot be done through a public node");
   }
   const requiredFields = ["coin"];
   const missingFields: string[] = [];
@@ -2735,7 +2735,7 @@ export const setCurrentForeignServer = async (data) => {
 export const addForeignServer = async (data) => {
   const isGateway = await isRunningGateway();
   if (isGateway) {
-    throw new Error("This action cannot be done through a gateway");
+    throw new Error("This action cannot be done through a public node");
   }
   const requiredFields = ["coin"];
   const missingFields: string[] = [];
@@ -2795,7 +2795,7 @@ export const addForeignServer = async (data) => {
 export const removeForeignServer = async (data) => {
   const isGateway = await isRunningGateway();
   if (isGateway) {
-    throw new Error("This action cannot be done through a gateway");
+    throw new Error("This action cannot be done through a public node");
   }
   const requiredFields = ["coin"];
   const missingFields: string[] = [];
@@ -3362,7 +3362,7 @@ export const createBuyOrder = async (data, isFromExtension) => {
           }, 0)
         )}
       ${` ${crosschainAtInfo?.[0]?.foreignBlockchain}`}`,
-        highlightedText: `Is using gateway: ${isGateway}`,
+        highlightedText: `Is using public node: ${isGateway}`,
         fee: "",
         foreignFee: `${sellerForeignFee[foreignBlockchain].value} ${sellerForeignFee[foreignBlockchain].ticker}`,
       },
@@ -3692,7 +3692,7 @@ export const adminAction = async (data, isFromExtension) => {
   }
   const isGateway = await isRunningGateway();
   if (isGateway) {
-    throw new Error("This action cannot be done through a gateway");
+    throw new Error("This action cannot be done through a public node");
   }
 
   let apiEndpoint = "";