diff --git a/client/src/containers/analysis-visualization/analysis-table/component.tsx b/client/src/containers/analysis-visualization/analysis-table/component.tsx
index 0de7c7ba1..26e3dafa0 100644
--- a/client/src/containers/analysis-visualization/analysis-table/component.tsx
+++ b/client/src/containers/analysis-visualization/analysis-table/component.tsx
@@ -435,7 +435,7 @@ const AnalysisTable = () => {
           const name =
             isParentRow(original) &&
             depth === 0 &&
-            indicators.find((i) => i.id === original.indicatorId)?.name;
+            indicators.find((i) => i.id === original.indicatorId)?.metadata?.short_name;
 
           return (
             <div className="flex gap-4 py-5">
diff --git a/client/src/containers/interventions/form/component.tsx b/client/src/containers/interventions/form/component.tsx
index 9b1045cf2..6529b63ad 100644
--- a/client/src/containers/interventions/form/component.tsx
+++ b/client/src/containers/interventions/form/component.tsx
@@ -1061,7 +1061,7 @@ const InterventionForm: React.FC<InterventionFormProps> = ({
                                 'text-gray-300': indicator.status === 'inactive',
                               })}
                             >
-                              {indicator.name}
+                              {indicator?.metadata?.short_name}
                             </label>
                             <Input
                               // @ts-expect-error not sure how to solve this dynamic typing
diff --git a/client/src/hooks/layers/impact.ts b/client/src/hooks/layers/impact.ts
index 14b4db77a..01ed58603 100644
--- a/client/src/hooks/layers/impact.ts
+++ b/client/src/hooks/layers/impact.ts
@@ -76,7 +76,7 @@ export const useImpactLayer = () => {
               legend: {
                 id: `impact-${indicator.id}-${isComparisonEnabled || 'compare'}`,
                 type: 'basic',
-                name: `${indicator.name} in ${year}`,
+                name: `${indicator?.metadata?.short_name} in ${year}`,
                 unit: data.metadata.unit,
                 min: !!data.metadata.quantiles.length && formatNumber(data.metadata.quantiles[0]),
                 items: data.metadata.quantiles
diff --git a/client/src/pages/data/targets.tsx b/client/src/pages/data/targets.tsx
index cbaa9edd8..76fc891cd 100644
--- a/client/src/pages/data/targets.tsx
+++ b/client/src/pages/data/targets.tsx
@@ -29,8 +29,8 @@ const AdminTargetsPage: React.FC = () => {
     if (indicators) {
       return indicators.map((indicator) => ({
         id: indicator.id,
-        name: indicator.name.toString(),
-        unit: indicator.metadata.units,
+        name: indicator?.metadata?.short_name,
+        unit: indicator?.metadata?.units,
         indicatorId: indicator.id,
         baselineYear: 2020,
         baselineValue: 1,