diff --git a/frontend/src/pages/organization/SettingsPage/SettingsPage.tsx b/frontend/src/pages/organization/SettingsPage/SettingsPage.tsx
index f519b3cc4..263b3350c 100644
--- a/frontend/src/pages/organization/SettingsPage/SettingsPage.tsx
+++ b/frontend/src/pages/organization/SettingsPage/SettingsPage.tsx
@@ -21,7 +21,7 @@ export const SettingsPage = () => {
         <div className="w-full max-w-8xl">
           <PageHeader
             scope={isSubOrganization ? "namespace" : "org"}
-            description="Configure organization-wide settings"
+            description={`Configure ${isSubOrganization ? "sub-" : ""}organization-wide settings`}
             title={isSubOrganization ? "Sub-Organization Settings" : "Organization Settings"}
           >
             {isSubOrganization && (
diff --git a/frontend/src/pages/organization/SettingsPage/components/KmipTab/OrgKmipTab.tsx b/frontend/src/pages/organization/SettingsPage/components/KmipTab/OrgKmipTab.tsx
index 1ab529ea3..4b9b5048f 100644
--- a/frontend/src/pages/organization/SettingsPage/components/KmipTab/OrgKmipTab.tsx
+++ b/frontend/src/pages/organization/SettingsPage/components/KmipTab/OrgKmipTab.tsx
@@ -53,7 +53,7 @@ const OrgConfigSection = ({
     resolver: zodResolver(orgConfigFormSchema)
   });
 
-  const { currentOrg } = useOrganization();
+  const { currentOrg, isSubOrganization } = useOrganization();
   const { mutateAsync: setupOrgKmip } = useSetupOrgKmip(currentOrg.id);
 
   const onFormSubmit = async (formData: TKmipOrgConfigForm) => {
@@ -175,7 +175,10 @@ const OrgConfigSection = ({
         )}
         {!isKmipConfigLoading && !kmipConfig && (
           <div className="mt-2">
-            <div>KMIP has not yet been configured for the organization.</div>
+            <div>
+              KMIP has not yet been configured for the {isSubOrganization ? "sub-" : ""}
+              organization.
+            </div>
             <Button
               className="mt-2"
               onClick={() => {
diff --git a/frontend/src/pages/organization/SettingsPage/components/OrgEncryptionTab/OrgEncryptionTab.tsx b/frontend/src/pages/organization/SettingsPage/components/OrgEncryptionTab/OrgEncryptionTab.tsx
index 81649b604..e6c75052a 100644
--- a/frontend/src/pages/organization/SettingsPage/components/OrgEncryptionTab/OrgEncryptionTab.tsx
+++ b/frontend/src/pages/organization/SettingsPage/components/OrgEncryptionTab/OrgEncryptionTab.tsx
@@ -32,7 +32,7 @@ import { UpdateExternalKmsForm } from "./UpdateExternalKmsForm";
 
 export const OrgEncryptionTab = withPermission(
   () => {
-    const { currentOrg } = useOrganization();
+    const { currentOrg, isSubOrganization } = useOrganization();
     const { subscription } = useSubscription();
     const orgId = currentOrg?.id || "";
     const { popUp, handlePopUpOpen, handlePopUpToggle } = usePopUp([
@@ -86,7 +86,7 @@ export const OrgEncryptionTab = withPermission(
           </OrgPermissionCan>
         </div>
         <p className="mb-4 text-gray-400">
-          Encrypt your organization&apos;s data with external KMS.
+          Encrypt your {isSubOrganization ? "sub-" : ""}organization&apos;s data with external KMS.
         </p>
         <TableContainer>
           <Table>
diff --git a/frontend/src/pages/organization/SettingsPage/components/OrgNameChangeSection/SubOrgNameChangeSection.tsx b/frontend/src/pages/organization/SettingsPage/components/OrgNameChangeSection/SubOrgNameChangeSection.tsx
index d74c0e3aa..e3ae0d257 100644
--- a/frontend/src/pages/organization/SettingsPage/components/OrgNameChangeSection/SubOrgNameChangeSection.tsx
+++ b/frontend/src/pages/organization/SettingsPage/components/OrgNameChangeSection/SubOrgNameChangeSection.tsx
@@ -60,7 +60,7 @@ export const SubOrgNameChangeSection = (): JSX.Element => {
   return (
     <form onSubmit={handleSubmit(onFormSubmit)} className="py-4">
       <div>
-        <h2 className="text-md mb-2 text-mineshaft-100">Organization Name</h2>
+        <h2 className="text-md mb-2 text-mineshaft-100">Sub-Organization Name</h2>
         <Controller
           defaultValue=""
           render={({ field, fieldState: { error } }) => (