diff --git a/server/src/main/java/dtos/context/VariableDTO.java b/server/src/main/java/dtos/context/VariableDTO.java
index 60cada2..6d35e31 100644
--- a/server/src/main/java/dtos/context/VariableDTO.java
+++ b/server/src/main/java/dtos/context/VariableDTO.java
@@ -3,6 +3,7 @@
 import dtos.diagnostics.SourcePositionDTO;
 import liquidjava.processor.context.PlacementInCode;
 import liquidjava.processor.context.RefinedVariable;
+import liquidjava.utils.VariableFormatter;
 
 /**
  * DTO for serializing RefinedVariable instances to JSON.
@@ -19,10 +20,10 @@ public static VariableDTO from(RefinedVariable refinedVariable) {
         PlacementInCode placement = refinedVariable.getPlacementInCode();
         if (placement == null) return null;
         return new VariableDTO(
-            refinedVariable.getName(),
+            VariableFormatter.formatVariable(refinedVariable.getName()),
             ContextHistoryDTO.stringifyType(refinedVariable.getType()),
-            refinedVariable.getRefinement().toString(),
-            refinedVariable.getMainRefinement().toString(),
+            VariableFormatter.formatText(refinedVariable.getRefinement().toString()),
+            VariableFormatter.formatText(refinedVariable.getMainRefinement().toString()),
             SourcePositionDTO.from(placement.getPosition()),
             SourcePositionDTO.from(placement.getAnnotationPosition())
         );
diff --git a/server/src/main/java/dtos/diagnostics/TranslationTableDTO.java b/server/src/main/java/dtos/diagnostics/TranslationTableDTO.java
index dee2c9f..9454192 100644
--- a/server/src/main/java/dtos/diagnostics/TranslationTableDTO.java
+++ b/server/src/main/java/dtos/diagnostics/TranslationTableDTO.java
@@ -3,6 +3,7 @@
 import java.util.HashMap;
 
 import liquidjava.diagnostics.TranslationTable;
+import liquidjava.utils.VariableFormatter;
 
 /**
  * DTO for serializing TranslationTable to JSON
@@ -14,7 +15,7 @@ public static TranslationTableDTO from(TranslationTable translationTable) {
         TranslationTableDTO dto = new TranslationTableDTO();
         if (translationTable != null) {
             translationTable.forEach((key, value) -> {
-                dto.put(key, PlacementInCodeDTO.from(value));
+                dto.put(VariableFormatter.formatVariable(key), PlacementInCodeDTO.from(value));
             });
         }
         return dto;