diff --git a/Website/components/datamodelview/Attributes.tsx b/Website/components/datamodelview/Attributes.tsx
index 3aa8a86..cb40ef3 100644
--- a/Website/components/datamodelview/Attributes.tsx
+++ b/Website/components/datamodelview/Attributes.tsx
@@ -187,7 +187,7 @@ export const Attributes = ({ entity, search = "", onVisibleCountChange }: IAttri
             <Box className="flex gap-1 md:gap-2 items-center">
                 <TextField
                     size="small"
-                    placeholder="Search attributes..."
+                    placeholder="Search columns..."
                     value={searchQuery}
                     onChange={(e) => setSearchQuery(e.target.value)}
                     onKeyDown={(e) => {
@@ -291,10 +291,10 @@ export const Attributes = ({ entity, search = "", onVisibleCountChange }: IAttri
                         <Box className="flex flex-col items-center gap-1">
                             <Typography variant="body2">
                                 {searchQuery && typeFilter !== "all"
-                                    ? `No ${typeFilter === "all" ? "" : typeFilter.replace("Attribute", "")} attributes found matching "${searchQuery}"`
+                                    ? `No ${typeFilter === "all" ? "" : typeFilter.replace("Attribute", "")} columns found matching "${searchQuery}"`
                                     : searchQuery
-                                        ? `No attributes found matching "${searchQuery}"`
-                                        : `No ${typeFilter === "all" ? "" : typeFilter.replace("Attribute", "")} attributes available`
+                                        ? `No columns found matching "${searchQuery}"`
+                                        : `No ${typeFilter === "all" ? "" : typeFilter.replace("Attribute", "")} columns available`
                                 }
                             </Typography>
                             <Button
@@ -309,7 +309,7 @@ export const Attributes = ({ entity, search = "", onVisibleCountChange }: IAttri
                             </Button>
                         </Box>
                     ) : (
-                        <Typography variant="body2">No attributes available for this table</Typography>
+                        <Typography variant="body2">No columns available for this table</Typography>
                     )}
                 </Box>
             ) : (
diff --git a/Website/components/datamodelview/Keys.tsx b/Website/components/datamodelview/Keys.tsx
index c6ef9eb..3a64592 100644
--- a/Website/components/datamodelview/Keys.tsx
+++ b/Website/components/datamodelview/Keys.tsx
@@ -249,7 +249,7 @@ function Keys({ entity, search = "" }: IKeysProps) {
                                     sx={{ color: 'text.primary' }}
                                 >
                                     <Box className="flex items-center">
-                                        Key Attributes
+                                        Key Columns
                                         <SortIcon column="attributes" />
                                     </Box>
                                 </TableCell>
diff --git a/Website/components/datamodelview/List.tsx b/Website/components/datamodelview/List.tsx
index 37a77d5..4d795d6 100644
--- a/Website/components/datamodelview/List.tsx
+++ b/Website/components/datamodelview/List.tsx
@@ -291,7 +291,7 @@ export const List = ({ setCurrentIndex, entityActiveTabs }: IListProps) => {
                     <div className="flex flex-col items-center justify-center h-64 text-gray-500">
                         <div className="text-lg font-medium mb-2">No tables found</div>
                         <div className="text-sm text-center">
-                            No attributes match your search for &quot;{search}&quot;
+                            No columns match your search for &quot;{search}&quot;
                         </div>
                     </div>
                 )}
diff --git a/Website/components/datamodelview/Section.tsx b/Website/components/datamodelview/Section.tsx
index 529604d..396568d 100644
--- a/Website/components/datamodelview/Section.tsx
+++ b/Website/components/datamodelview/Section.tsx
@@ -79,7 +79,7 @@ export const Section = React.memo(
                                     label={
                                         <div className="flex items-center min-w-[120px] sm:min-w-[140px] px-2 py-1 text-xs sm:text-sm">
                                             <SellRounded className="mr-2 h-4 w-4 shrink-0" />
-                                            <span className="truncate">Attributes [{visibleAttributeCount}]</span>
+                                            <span className="truncate">Columns [{visibleAttributeCount}]</span>
                                         </div>
                                     }
                                 />
diff --git a/Website/components/datamodelview/TimeSlicedSearch.tsx b/Website/components/datamodelview/TimeSlicedSearch.tsx
index 78f25b4..67e3f18 100644
--- a/Website/components/datamodelview/TimeSlicedSearch.tsx
+++ b/Website/components/datamodelview/TimeSlicedSearch.tsx
@@ -58,7 +58,7 @@ export const TimeSlicedSearch = ({
   initialLocalValue,
   currentIndex,
   totalResults,
-  placeholder = "Search attributes...",
+  placeholder = "Search columns...",
   onSearchScopeChange,
 }: TimeSlicedSearchProps) => {
   const searchParams = useSearchParams();
@@ -440,7 +440,7 @@ export const TimeSlicedSearch = ({
             className='ml-1 flex-1'
             type="text"
             placeholder={placeholder}
-            aria-label="Search attributes in tables"
+            aria-label="Search columns in tables"
             value={localValue}
             onChange={handleChange}
             onFocus={handleSearchFocus}
@@ -508,7 +508,7 @@ export const TimeSlicedSearch = ({
                 }}
               >
                 <ToggleButton value={SEARCH_SCOPE_KEYS.COLUMN_NAMES} aria-label="column names">
-                  <Tooltip title="Search in column/attribute names" slotProps={{ popper: { sx: { zIndex: 10001 } } }}>
+                  <Tooltip title="Search in column names" slotProps={{ popper: { sx: { zIndex: 10001 } } }}>
                     <AbcRounded fontSize="small" />
                   </Tooltip>
                 </ToggleButton>
diff --git a/Website/components/homeview/HomeView.tsx b/Website/components/homeview/HomeView.tsx
index 5201136..3ff28cb 100644
--- a/Website/components/homeview/HomeView.tsx
+++ b/Website/components/homeview/HomeView.tsx
@@ -26,7 +26,7 @@ export const HomeView = ({ }: IHomeViewProps) => {
         {
             image: '/insights.jpg',
             title: 'New Search features!',
-            text: 'Enhanced global search with customizable scope filters—search across attributes, descriptions, data types, relationships, and more. New security role impersonation lets you filter entities by access permissions, making it easy to understand what data different roles can see. All filters are shareable via URL for seamless collaboration.',
+            text: 'Enhanced global search with customizable scope filters—search across columns, descriptions, data types, relationships, and more. New security role impersonation lets you filter entities by access permissions, making it easy to understand what data different roles can see. All filters are shareable via URL for seamless collaboration.',
             type: '(v2.3.1) Feature Update',
             actionlabel: 'Try It Now',
             action: () => router.push('/metadata')
diff --git a/Website/components/insightsview/overview/InsightsOverviewView.tsx b/Website/components/insightsview/overview/InsightsOverviewView.tsx
index dce8194..2a4a1bc 100644
--- a/Website/components/insightsview/overview/InsightsOverviewView.tsx
+++ b/Website/components/insightsview/overview/InsightsOverviewView.tsx
@@ -850,7 +850,7 @@ const InsightsOverviewView = ({ }: InsightsOverviewViewProps) => {
                                 }
                             ]}
                             role="application"
-                            ariaLabel="Attribute process dependencies by detection source"
+                            ariaLabel="Column process dependencies by detection source"
                             barAriaLabel={e => `${e.id}: ${e.formattedValue}`}
                             theme={{
                                 background: 'transparent',
diff --git a/Website/hooks/useAttributeSelection.ts b/Website/hooks/useAttributeSelection.ts
index 738c064..82abab3 100644
--- a/Website/hooks/useAttributeSelection.ts
+++ b/Website/hooks/useAttributeSelection.ts
@@ -57,11 +57,11 @@ export const useAttributeSelection = (initialMode: AttributeSelectionMode = 'cus
             case 'minimal':
                 return 'Primary key only';
             case 'custom-lookups':
-                return 'Custom lookup attributes';
+                return 'Custom lookup columns';
             case 'all-lookups':
-                return 'All lookup attributes';
+                return 'All lookup columns';
             case 'custom':
-                return 'Pick specific attributes';
+                return 'Pick specific columns';
             default:
                 return '';
         }