diff --git a/frontend/src/__tests__/cypress/cypress/pages/modelServing.ts b/frontend/src/__tests__/cypress/cypress/pages/modelServing.ts
index 9284c27644..7d600af7f6 100644
--- a/frontend/src/__tests__/cypress/cypress/pages/modelServing.ts
+++ b/frontend/src/__tests__/cypress/cypress/pages/modelServing.ts
@@ -171,6 +171,10 @@ class ServingRuntimeModal extends Modal {
     return this.find().findByTestId('serving-runtime-template-selection');
   }
 
+  findAuthenticationSection() {
+    return this.find().findByTestId('auth-section');
+  }
+
   findModelRouteCheckbox() {
     return this.find().findByTestId('alt-form-checkbox-route');
   }
diff --git a/frontend/src/__tests__/cypress/cypress/tests/mocked/modelServing/servingRuntimeList.cy.ts b/frontend/src/__tests__/cypress/cypress/tests/mocked/modelServing/servingRuntimeList.cy.ts
index c920156135..09d9be6541 100644
--- a/frontend/src/__tests__/cypress/cypress/tests/mocked/modelServing/servingRuntimeList.cy.ts
+++ b/frontend/src/__tests__/cypress/cypress/tests/mocked/modelServing/servingRuntimeList.cy.ts
@@ -931,6 +931,33 @@ describe('Serving Runtime List', () => {
       kserveModal.findLocationPathInput().type('correct-path');
       kserveModal.findSubmitButton().should('be.enabled');
     });
+
+    it('Check authentication section', () => {
+      initIntercepts({
+        disableModelMeshConfig: false,
+        disableKServeConfig: false,
+        servingRuntimes: [],
+        requiredCapabilities: [StackCapability.SERVICE_MESH, StackCapability.SERVICE_MESH_AUTHZ],
+      });
+      projectDetails.visitSection('test-project', 'model-server');
+
+      modelServingSection.getServingPlatformCard('single-serving').findDeployModelButton().click();
+
+      kserveModal.shouldBeOpen();
+
+      kserveModal.findSubmitButton().should('be.disabled');
+
+      // Test labels are correct
+      expect(
+        kserveModal.findAuthenticationSection().findByText('Token authentication').should('exist'),
+      );
+      expect(
+        kserveModal
+          .findAuthenticationSection()
+          .findByText('Require token authentication')
+          .should('exist'),
+      );
+    });
   });
 
   describe('ModelMesh model server', () => {
@@ -1565,7 +1592,7 @@ describe('Serving Runtime List', () => {
       const kserveRow = modelServingSection.getKServeRow('Llama Caikit');
       kserveRow.findExpansion().should(be.collapsed);
       kserveRow.findToggleButton().click();
-      kserveRow.findDescriptionListItem('Token authorization').should('exist');
+      kserveRow.findDescriptionListItem('Token authentication').should('exist');
     });
 
     it('Check token section is disabled if capability is disabled', () => {
@@ -1579,7 +1606,7 @@ describe('Serving Runtime List', () => {
       const kserveRow = modelServingSection.getKServeRow('Llama Caikit');
       kserveRow.findExpansion().should(be.collapsed);
       kserveRow.findToggleButton().click();
-      kserveRow.findDescriptionListItem('Token authorization').should('not.exist');
+      kserveRow.findDescriptionListItem('Token authentication').should('not.exist');
     });
   });
 
diff --git a/frontend/src/pages/home/aiFlows/DeployAndMonitorGallery.tsx b/frontend/src/pages/home/aiFlows/DeployAndMonitorGallery.tsx
index 45da98f2b1..7860d6e1e3 100644
--- a/frontend/src/pages/home/aiFlows/DeployAndMonitorGallery.tsx
+++ b/frontend/src/pages/home/aiFlows/DeployAndMonitorGallery.tsx
@@ -24,8 +24,8 @@ const DeployAndMonitorGallery: React.FC<{ onClose: () => void }> = ({ onClose })
             <Text component="small">
               Use model servers to deploy models for testing and implementing in intelligent
               applications. Configuring a model server includes specifying the number of replicas
-              being deployed, the server size, the token authorization, the serving runtime, and how
-              the project that the model server belongs to is accessed.
+              being deployed, the server size, the token authentication, the serving runtime, and
+              how the project that the model server belongs to is accessed.
             </Text>
           </TextContent>
         }
diff --git a/frontend/src/pages/modelServing/screens/projects/KServeSection/KServeInferenceServiceTableRow.tsx b/frontend/src/pages/modelServing/screens/projects/KServeSection/KServeInferenceServiceTableRow.tsx
index e6bffc8749..2bcf8154b2 100644
--- a/frontend/src/pages/modelServing/screens/projects/KServeSection/KServeInferenceServiceTableRow.tsx
+++ b/frontend/src/pages/modelServing/screens/projects/KServeSection/KServeInferenceServiceTableRow.tsx
@@ -109,7 +109,7 @@ const KServeInferenceServiceTableRow: React.FC<KServeInferenceServiceTableRowPro
                 <StackItem>
                   <DescriptionList>
                     <DescriptionListGroup>
-                      <DescriptionListTerm>Token authorization</DescriptionListTerm>
+                      <DescriptionListTerm>Token authentication</DescriptionListTerm>
                       <DescriptionListDescription>
                         <ServingRuntimeTokensTable
                           obj={obj}
diff --git a/frontend/src/pages/modelServing/screens/projects/ModelServingPlatform.tsx b/frontend/src/pages/modelServing/screens/projects/ModelServingPlatform.tsx
index ee1fb728a7..55905c74f8 100644
--- a/frontend/src/pages/modelServing/screens/projects/ModelServingPlatform.tsx
+++ b/frontend/src/pages/modelServing/screens/projects/ModelServingPlatform.tsx
@@ -99,7 +99,7 @@ const ModelServingPlatform: React.FC = () => {
           title={modelMeshEnabled ? 'Start by adding a model server' : 'Start by deploying a model'}
           description={
             modelMeshEnabled
-              ? 'Model servers are used to deploy models and to allow apps to send requests to your models. Configuring a model server includes specifying the number of replicas being deployed, the server size, the token authorization, the serving runtime, and how the project that the model server belongs to is accessed.\n'
+              ? 'Model servers are used to deploy models and to allow apps to send requests to your models. Configuring a model server includes specifying the number of replicas being deployed, the server size, the token authentication, the serving runtime, and how the project that the model server belongs to is accessed.\n'
               : 'Each model is deployed on its own model server.'
           }
           createButton={
diff --git a/frontend/src/pages/modelServing/screens/projects/ServingRuntimeModal/AuthServingRuntimeSection.tsx b/frontend/src/pages/modelServing/screens/projects/ServingRuntimeModal/AuthServingRuntimeSection.tsx
index b0dd5b7bcd..5726b31c11 100644
--- a/frontend/src/pages/modelServing/screens/projects/ServingRuntimeModal/AuthServingRuntimeSection.tsx
+++ b/frontend/src/pages/modelServing/screens/projects/ServingRuntimeModal/AuthServingRuntimeSection.tsx
@@ -49,21 +49,21 @@ const AuthServingRuntimeSection: React.FC<AuthServingRuntimeSectionProps> = ({
   }, [data.tokens, setData]);
 
   return (
-    <Stack>
+    <Stack hasGutter>
       {!allowCreate && (
         <StackItem>
           <Popover
             showClose
             bodyContent={
               publicRoute
-                ? 'Model route and token authorization can only be changed by administrator users.'
-                : 'Token authorization can only be changed by administrator users and component Authorino needs to be installed.'
+                ? 'Model route and token authentication can only be changed by administrator users.'
+                : 'Token authentication can only be changed by administrator users and component Authorino needs to be installed.'
             }
           >
             <Button variant="link" icon={<OutlinedQuestionCircleIcon />} isInline>
               {publicRoute
-                ? "Why can't I change the model route and token authorization fields?"
-                : "Why can't I change the token authorization field?"}
+                ? "Why can't I change the model route and token authentication fields?"
+                : "Why can't I change the token authentication field?"}
             </Button>
           </Popover>
         </StackItem>
diff --git a/frontend/src/pages/modelServing/screens/projects/ServingRuntimeModal/ServingRuntimeTokenSection.tsx b/frontend/src/pages/modelServing/screens/projects/ServingRuntimeModal/ServingRuntimeTokenSection.tsx
index ec938c4e28..2ed8b7f496 100644
--- a/frontend/src/pages/modelServing/screens/projects/ServingRuntimeModal/ServingRuntimeTokenSection.tsx
+++ b/frontend/src/pages/modelServing/screens/projects/ServingRuntimeModal/ServingRuntimeTokenSection.tsx
@@ -32,7 +32,7 @@ const ServingRuntimeTokenSection: React.FC<ServingRuntimeTokenSectionProps> = ({
   allowCreate,
   createNewToken,
 }) => (
-  <FormSection title="Token authorization">
+  <FormSection title="Token authentication" id="auth-section" data-testid="auth-section">
     <FormGroup>
       <Checkbox
         label="Require token authentication"
diff --git a/frontend/src/pages/modelServing/screens/projects/kServeModal/ManageKServeModal.tsx b/frontend/src/pages/modelServing/screens/projects/kServeModal/ManageKServeModal.tsx
index e9b096fc62..89033a4048 100644
--- a/frontend/src/pages/modelServing/screens/projects/kServeModal/ManageKServeModal.tsx
+++ b/frontend/src/pages/modelServing/screens/projects/kServeModal/ManageKServeModal.tsx
@@ -257,14 +257,14 @@ const ManageKServeModal: React.FC<ManageKServeModalProps> = ({
                 isExpandable
                 isInline
                 variant="warning"
-                title="Token authorization service not installed"
+                title="Token authentication service not installed"
                 actionClose={<AlertActionCloseButton onClose={() => setAlertVisible(false)} />}
               >
                 <p>
                   The single model serving platform used by this project allows deployed models to
-                  be accessible via external routes. It is recommended that token authorization be
+                  be accessible via external routes. It is recommended that token authentication be
                   enabled to protect these routes. The serving platform requires the Authorino
-                  operator be installed on the cluster for token authorization. Contact a cluster
+                  operator be installed on the cluster for token authentication. Contact a cluster
                   administrator to install the operator.
                 </p>
               </Alert>