diff --git a/pom.xml b/pom.xml
index 83ff2164..e43bc72f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 	<groupId>fr.insee.lunatic</groupId>
 	<artifactId>lunatic-model</artifactId>
 	<packaging>jar</packaging>
-	<version>5.10.1</version>
+	<version>6.0.0</version>
 	<name>Lunatic Model</name>
 	<description>Classes and converters for the Lunatic model</description>
 	<url>https://inseefr.github.io/Lunatic-Model/</url>
diff --git a/src/main/java/fr/insee/lunatic/conversion/JsonDeserializer.java b/src/main/java/fr/insee/lunatic/conversion/JsonDeserializer.java
index 5189bf8d..39874755 100644
--- a/src/main/java/fr/insee/lunatic/conversion/JsonDeserializer.java
+++ b/src/main/java/fr/insee/lunatic/conversion/JsonDeserializer.java
@@ -3,46 +3,18 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import fr.insee.lunatic.exception.SerializationException;
 import fr.insee.lunatic.model.flat.Questionnaire;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
 
-import javax.xml.transform.stream.StreamSource;
 import java.io.IOException;
 import java.io.InputStream;
 
+@Slf4j
 public class JsonDeserializer {
 
-	private static final Logger logger = LoggerFactory.getLogger(JsonDeserializer.class);
-
-	/**
-	 * Deserializes the file at given relative path to a Lunatic questionnaire object.
-	 * @param fileName Relative file path.
-	 * @return Deserialized Lunatic questionnaire object. null if the input given is null or empty.
-	 * @throws SerializationException if file cannot be found or deserialization fails.
-	 * @deprecated The string file path argument is misleading, this method should be removed.
-	 */
-	@Deprecated(since = "3.16.0", forRemoval = true)
-	public Questionnaire deserialize(String fileName) throws SerializationException {
-
-		if ((fileName == null) || (fileName.isEmpty())) return null;
-
-		logger.info("Deserializing questionnaire from file {}", fileName);
-
-		ObjectMapper mapper = new ObjectMapper();
-		Questionnaire questionnaire;
-		try {
-			questionnaire = mapper.readValue(new StreamSource(fileName).getInputStream(), Questionnaire.class);
-		} catch (IOException e) {
-			throw new SerializationException(e.getMessage(), e);
-		}
-		logger.info("Questionnaire {} successfully deserialized", questionnaire.getId());
-		return questionnaire;
-	}
-
 	public Questionnaire deserialize(InputStream jsonQuestionnaire) throws SerializationException {
 		if (jsonQuestionnaire == null) return null;
 
-		logger.debug("Deserializing questionnaire from input stream");
+		log.debug("Deserializing questionnaire from input stream");
 
 		ObjectMapper mapper = new ObjectMapper();
 		Questionnaire questionnaire;
@@ -51,7 +23,8 @@ public Questionnaire deserialize(InputStream jsonQuestionnaire) throws Serializa
 		} catch (IOException e) {
 			throw new SerializationException(e.getMessage(), e);
 		}
-		logger.info("Questionnaire {} successfully deserialized", questionnaire.getId());
+		log.info("Questionnaire {} successfully deserialized", questionnaire.getId());
 		return questionnaire;
 	}
+
 }
diff --git a/src/main/java/fr/insee/lunatic/conversion/UnitDeserializer.java b/src/main/java/fr/insee/lunatic/conversion/UnitDeserializer.java
deleted file mode 100644
index 81de386e..00000000
--- a/src/main/java/fr/insee/lunatic/conversion/UnitDeserializer.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package fr.insee.lunatic.conversion;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
-import fr.insee.lunatic.model.flat.InputNumber.Unit;
-import fr.insee.lunatic.model.flat.LabelType;
-import fr.insee.lunatic.model.flat.LabelTypeEnum;
-
-import java.io.IOException;
-
-public class UnitDeserializer extends StdDeserializer<Unit> {
-
-    public UnitDeserializer() {
-        super(Unit.class);
-    }
-    protected UnitDeserializer(Class<Unit> unitClass) {
-        super(unitClass);
-    }
-
-    @Override
-    public Unit deserialize(JsonParser jsonParser, DeserializationContext deserializationContext)
-            throws IOException {
-        JsonNode unitNode = jsonParser.getCodec().readTree(jsonParser);
-        if (unitNode.isTextual()) {
-            Unit unit = new Unit();
-            unit.setValue(unitNode.textValue());
-            return unit;
-        }
-        if (unitNode.isObject()) {
-            Unit unit = new Unit();
-            LabelType label = new LabelType();
-            label.setValue(unitNode.get("value").textValue());
-            label.setType(LabelTypeEnum.fromValue(unitNode.get("type").textValue()));
-            unit.setLabel(label);
-            return unit;
-        }
-        return null;
-    }
-
-}
diff --git a/src/main/java/fr/insee/lunatic/conversion/UnitSerializer.java b/src/main/java/fr/insee/lunatic/conversion/UnitSerializer.java
deleted file mode 100644
index b3be746c..00000000
--- a/src/main/java/fr/insee/lunatic/conversion/UnitSerializer.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package fr.insee.lunatic.conversion;
-
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.ser.std.StdSerializer;
-import fr.insee.lunatic.model.flat.InputNumber.Unit;
-
-import java.io.IOException;
-
-public class UnitSerializer extends StdSerializer<Unit> {
-
-    public UnitSerializer() {
-        super(Unit.class);
-    }
-    protected UnitSerializer(Class<Unit> unitClass) {
-        super(unitClass);
-    }
-
-    @Override
-    public void serialize(Unit unit, JsonGenerator jsonGenerator, SerializerProvider serializerProvider)
-            throws IOException {
-        if (unit.getLabel() != null){
-            serializeLabel(unit, jsonGenerator);
-            return;
-        }
-        if (unit.getValue() != null) {
-            serializeString(unit, jsonGenerator);
-            return;
-        }
-        jsonGenerator.writeNull();
-    }
-
-    private void serializeString(Unit unit, JsonGenerator jsonGenerator) throws IOException {
-        jsonGenerator.writeString(unit.getValue());
-    }
-
-    private void serializeLabel(Unit unit, JsonGenerator jsonGenerator) throws IOException {
-        jsonGenerator.writeStartObject();
-        jsonGenerator.writeFieldName("value");
-        jsonGenerator.writeString(unit.getLabel().getValue());
-        jsonGenerator.writeFieldName("type");
-        jsonGenerator.writeString(unit.getLabel().getType().value());
-        jsonGenerator.writeEndObject();
-    }
-
-}
diff --git a/src/main/java/fr/insee/lunatic/model/flat/Accordion.java b/src/main/java/fr/insee/lunatic/model/flat/Accordion.java
index 5545a56c..27c46986 100644
--- a/src/main/java/fr/insee/lunatic/model/flat/Accordion.java
+++ b/src/main/java/fr/insee/lunatic/model/flat/Accordion.java
@@ -13,7 +13,7 @@ public class Accordion extends ComponentType {
     List<Item> items;
 
     public Accordion() {
-        super(ComponentTypeEnum.ACCORDION);
+        super(ComponentTypeName.ACCORDION);
         this.items = new ArrayList<>();
     }
 
diff --git a/src/main/java/fr/insee/lunatic/model/flat/BodyCell.java b/src/main/java/fr/insee/lunatic/model/flat/BodyCell.java
index c8a6ba90..fd5d8c49 100644
--- a/src/main/java/fr/insee/lunatic/model/flat/BodyCell.java
+++ b/src/main/java/fr/insee/lunatic/model/flat/BodyCell.java
@@ -32,71 +32,48 @@
         "optionResponses",
         "bindingDependencies"
 })
+@Getter @Setter
 public class BodyCell {
 
     /** Orientation for radio / checkbox cells. */
-    @Getter @Setter
     protected Orientation orientation;
 
-    @Getter @Setter
     protected String value;
-    @Getter @Setter
     protected LabelType label;
-    @Getter @Setter
     protected String format;
 
-    @Getter @Setter
     protected String dateFormat;
 
     /** For input number cells. */
-    protected InputNumber.Unit unit;
+    protected LabelType unit;
 
-    @Getter @Setter
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     protected List<Option> options;
     /** For suggester cells: Name of the code list used for auto-completion. */
 
-    @Getter @Setter
     private String storeName;
 
     /** For component cells: collected response of the cell. */
-    @Getter @Setter
     protected ResponseType response;
 
-    /** Collected or external variable names required to evaluate expressions used in the component properties.
-     * @deprecated Binding dependencies at component level are not used anymore in Lunatic. */
-    @Getter @Setter
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    @Deprecated(since = "3.4.0", forRemoval = true)
-    protected List<String> bindingDependencies = new ArrayList<>();
-
-    @Getter @Setter
-    protected ComponentTypeEnum componentType;
-    @Getter @Setter
+    protected ComponentTypeName componentType;
     protected BigInteger maxLength;
 
     @JsonIgnore
     private Boundaries boundaries;
 
-    @Getter @Setter
     protected BigInteger decimals;
-    @Getter @Setter
     protected BigInteger colspan;
-    @Getter @Setter
     protected BigInteger rowspan;
 
     /** For suggester cells: option responses. */
-    @Getter @Setter
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     protected List<Suggester.OptionResponse> optionResponses;
 
-    @Getter @Setter
     protected ConditionFilterType conditionFilter;
 
-    @Getter @Setter
     protected LabelType conditionReadOnly;
 
-    @Getter @Setter
     protected String id;
 
     public BodyCell() {
@@ -104,46 +81,13 @@ public BodyCell() {
         this.optionResponses = new ArrayList<>();
     }
 
-    @JsonProperty("unit")
-    public InputNumber.Unit getUnitWrapper() {
-        return unit;
-    }
-
-    @JsonProperty("unit")
-    public void setUnit(InputNumber.Unit unit) {
-        this.unit = unit;
-    }
-
-    /** Legacy unit string property.
-     * @deprecated Use label unit. */
-    @JsonIgnore
-    @Deprecated(since = "3.15.2", forRemoval = true)
-    public String getUnit() {
-        if (unit == null)
-            return null;
-        return unit.getValue();
-    }
-
+    /**
+     * @deprecated Use <code>getUnit()</code> method.
+     */
     @JsonIgnore
+    @Deprecated(since = "6.0.0")
     public LabelType getUnitLabel() {
-        if (unit == null)
-            return null;
-        return unit.getLabel();
-    }
-
-    /** Legacy unit string property.
-     * @deprecated Use label unit. */
-    @JsonIgnore
-    @Deprecated(since = "3.15.2", forRemoval = true)
-    public void setUnit(String value) {
-        unit = new InputNumber.Unit();
-        unit.setValue(value);
-    }
-
-    @JsonIgnore
-    public void setUnit(LabelType labelType) {
-        unit = new InputNumber.Unit();
-        unit.setLabel(labelType);
+        return unit;
     }
 
     @JsonProperty("min")
diff --git a/src/main/java/fr/insee/lunatic/model/flat/CheckboxBoolean.java b/src/main/java/fr/insee/lunatic/model/flat/CheckboxBoolean.java
index fb7dd54f..6fbf428f 100644
--- a/src/main/java/fr/insee/lunatic/model/flat/CheckboxBoolean.java
+++ b/src/main/java/fr/insee/lunatic/model/flat/CheckboxBoolean.java
@@ -9,7 +9,7 @@
 public class CheckboxBoolean extends ComponentType implements ComponentSimpleResponseType, ComponentMandatory {
 
     public CheckboxBoolean() {
-        super(ComponentTypeEnum.CHECKBOX_BOOLEAN);
+        super(ComponentTypeName.CHECKBOX_BOOLEAN);
     }
 
     @JsonProperty(required = true)
diff --git a/src/main/java/fr/insee/lunatic/model/flat/CheckboxGroup.java b/src/main/java/fr/insee/lunatic/model/flat/CheckboxGroup.java
index 55fc2315..199abe4b 100644
--- a/src/main/java/fr/insee/lunatic/model/flat/CheckboxGroup.java
+++ b/src/main/java/fr/insee/lunatic/model/flat/CheckboxGroup.java
@@ -25,7 +25,7 @@ public class CheckboxGroup extends ComponentType implements ComponentMultipleRes
     private Boolean mandatory;
 
     public CheckboxGroup() {
-        super(ComponentTypeEnum.CHECKBOX_GROUP);
+        super(ComponentTypeName.CHECKBOX_GROUP);
         this.orientation = Orientation.VERTICAL;
         this.responses = new ArrayList<>();
     }
diff --git a/src/main/java/fr/insee/lunatic/model/flat/CheckboxOne.java b/src/main/java/fr/insee/lunatic/model/flat/CheckboxOne.java
index aaeb1d03..6963ed45 100644
--- a/src/main/java/fr/insee/lunatic/model/flat/CheckboxOne.java
+++ b/src/main/java/fr/insee/lunatic/model/flat/CheckboxOne.java
@@ -29,7 +29,7 @@ public class CheckboxOne extends ComponentType implements ComponentSimpleRespons
     private Boolean mandatory;
 
     public CheckboxOne() {
-        super(ComponentTypeEnum.CHECKBOX_ONE);
+        super(ComponentTypeName.CHECKBOX_ONE);
         this.orientation = Orientation.VERTICAL;
         this.options = new ArrayList<>();
     }
diff --git a/src/main/java/fr/insee/lunatic/model/flat/ComponentType.java b/src/main/java/fr/insee/lunatic/model/flat/ComponentType.java
index 02339951..c8d3d380 100644
--- a/src/main/java/fr/insee/lunatic/model/flat/ComponentType.java
+++ b/src/main/java/fr/insee/lunatic/model/flat/ComponentType.java
@@ -90,71 +90,62 @@
         @JsonSubTypes.Type(value = FilterDescription.class, name = "FilterDescription"),
         @JsonSubTypes.Type(value = Accordion.class, name = "Accordion"),
 })
-@Getter
-@Setter
 public abstract class ComponentType {
 
     /** Component identifier. */
+    @Getter @Setter
     @JsonProperty(required = true)
     protected String id;
 
     /** Property that defines the type of component in the serialized object. */
-    protected ComponentTypeEnum componentType;
-
-    /**
-     * @deprecated The "component type" is set in constructor.
-     */
-    @Deprecated(since = "5.10.1", forRemoval = true)
-    public void setComponentType(ComponentTypeEnum componentTypeEnum) {
-        this.componentType = componentTypeEnum;
-    }
+    @Getter
+    @JsonProperty("componentType")
+    protected ComponentTypeName componentTypeName;
 
     /** Displayed label of the component. */
+    @Getter @Setter
     protected LabelType label;
 
     /** Component description (concept introduced in Lunatic v3). */
+    @Getter @Setter
     private LabelType description;
 
     /** Declarations to display with the component. */
+    @Getter @Setter
     @JsonInclude(Include.NON_EMPTY)
     protected List<DeclarationType> declarations;
 
     /** Filter applied on the component. */
+    @Getter @Setter
     protected ConditionFilterType conditionFilter;
 
     /** Controls applied on the component. */
+    @Getter @Setter
     @JsonInclude(Include.NON_EMPTY)
     protected List<ControlType> controls;
 
-    /** Object that indicates in which sequence/subsequence belongs the component.
-     * @deprecated Unused by Lunatic anymore, to be removed. */
-    @Deprecated(since = "5.1.0", forRemoval = true)
-    protected Hierarchy hierarchy;
-
+    @Getter @Setter
     protected ResponseType missingResponse;
 
-    /** Collected or external variable names required to evaluate expressions used in the component properties.
-     * @deprecated Binding dependencies at component level are not used anymore in Lunatic. */
-    @JsonInclude(Include.NON_EMPTY)
-    @Deprecated(since = "3.4.0", forRemoval = true)
-    protected List<String> bindingDependencies = new ArrayList<>();
-
     /** Page number of the component: "1", "2", "3", etc.
      * For components that are in a loop, the page number becomes: "n.1", "n.2", "n.3", etc.
      * (where 'n' is the loop page number).
      * Components that share the same page number are displayed on the same page. */
+    @Getter @Setter
     protected String page;
 
     /** {@link ComponentPosition} */
+    @Getter @Setter
     protected ComponentPosition position;
 
     /** This property should be moved in the Suggester component.
      * Yet having this property defined here makes Eno suggester specific treatment easier.
      * To be moved in the Suggester class when the suggester specific treatment is removed in Eno. */
+    @Getter @Setter
     protected String storeName;
 
-    protected ComponentType(ComponentTypeEnum componentType) {
-        this.componentType = componentType;
+    protected ComponentType(ComponentTypeName componentTypeName) {
+        this.componentTypeName = componentTypeName;
         controls = new ArrayList<>();
         declarations = new ArrayList<>();
     }
diff --git a/src/main/java/fr/insee/lunatic/model/flat/ComponentTypeEnum.java b/src/main/java/fr/insee/lunatic/model/flat/ComponentTypeName.java
similarity index 85%
rename from src/main/java/fr/insee/lunatic/model/flat/ComponentTypeEnum.java
rename to src/main/java/fr/insee/lunatic/model/flat/ComponentTypeName.java
index 8d11296f..36ca8908 100644
--- a/src/main/java/fr/insee/lunatic/model/flat/ComponentTypeEnum.java
+++ b/src/main/java/fr/insee/lunatic/model/flat/ComponentTypeName.java
@@ -3,7 +3,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 
-public enum ComponentTypeEnum {
+public enum ComponentTypeName {
 
     QUESTIONNAIRE("Questionnaire"),
     SEQUENCE("Sequence"),
@@ -31,7 +31,7 @@ public enum ComponentTypeEnum {
 
     private final String value;
 
-    ComponentTypeEnum(String v) {
+    ComponentTypeName(String v) {
         value = v;
     }
 
@@ -41,8 +41,8 @@ public String value() {
     }
 
     @JsonCreator
-    public static ComponentTypeEnum fromValue(String v) {
-        for (ComponentTypeEnum c: ComponentTypeEnum.values()) {
+    public static ComponentTypeName fromValue(String v) {
+        for (ComponentTypeName c: ComponentTypeName.values()) {
             if (c.value.equals(v)) {
                 return c;
             }
diff --git a/src/main/java/fr/insee/lunatic/model/flat/ControlContextType.java b/src/main/java/fr/insee/lunatic/model/flat/ControlContextType.java
index 274188cd..d50ae05b 100644
--- a/src/main/java/fr/insee/lunatic/model/flat/ControlContextType.java
+++ b/src/main/java/fr/insee/lunatic/model/flat/ControlContextType.java
@@ -6,15 +6,11 @@
  */
 public enum ControlContextType {
 
-    /** Default type. */
+    /** Default type.
+     * Note: a roundabout control is a 'SIMPLE' control in a roundabout component. */
     SIMPLE,
 
     /** Control at row level of a roster for loop (i.e. dynamic table). */
-    ROW,
-
-    /** Special type of control for roundabouts.
-     * @deprecated Should not be used, a roundabout control is a 'SIMPLE' control in a roundabout component. */
-    @Deprecated(since = "3.15.3", forRemoval = true)
-    ROUNDABOUT
+    ROW
 
 }
diff --git a/src/main/java/fr/insee/lunatic/model/flat/Datepicker.java b/src/main/java/fr/insee/lunatic/model/flat/Datepicker.java
index aa99580f..9afac950 100644
--- a/src/main/java/fr/insee/lunatic/model/flat/Datepicker.java
+++ b/src/main/java/fr/insee/lunatic/model/flat/Datepicker.java
@@ -12,7 +12,7 @@
 public class Datepicker extends ComponentType implements ComponentSimpleResponseType, ComponentMandatory {
 
     public Datepicker() {
-        super(ComponentTypeEnum.DATEPICKER);
+        super(ComponentTypeName.DATEPICKER);
     }
 
     /** Indicates whether the response is mandatory for this component. */
diff --git a/src/main/java/fr/insee/lunatic/model/flat/Dropdown.java b/src/main/java/fr/insee/lunatic/model/flat/Dropdown.java
index f179b6c4..5b61f5b6 100644
--- a/src/main/java/fr/insee/lunatic/model/flat/Dropdown.java
+++ b/src/main/java/fr/insee/lunatic/model/flat/Dropdown.java
@@ -24,7 +24,7 @@ public class Dropdown extends ComponentType implements ComponentSimpleResponseTy
     protected ResponseType response;
 
     public Dropdown() {
-        super(ComponentTypeEnum.DROPDOWN);
+        super(ComponentTypeName.DROPDOWN);
         this.options = new ArrayList<>();
     }
 
diff --git a/src/main/java/fr/insee/lunatic/model/flat/Duration.java b/src/main/java/fr/insee/lunatic/model/flat/Duration.java
index 2f09784f..827d1f5e 100644
--- a/src/main/java/fr/insee/lunatic/model/flat/Duration.java
+++ b/src/main/java/fr/insee/lunatic/model/flat/Duration.java
@@ -12,7 +12,7 @@
 public class Duration extends ComponentType implements ComponentSimpleResponseType, ComponentMandatory {
 
     public Duration() {
-        super(ComponentTypeEnum.DURATION);
+        super(ComponentTypeName.DURATION);
     }
 
     /** Indicates whether the response is mandatory for this component. */
diff --git a/src/main/java/fr/insee/lunatic/model/flat/FilterDescription.java b/src/main/java/fr/insee/lunatic/model/flat/FilterDescription.java
index f0578b20..94540b5b 100644
--- a/src/main/java/fr/insee/lunatic/model/flat/FilterDescription.java
+++ b/src/main/java/fr/insee/lunatic/model/flat/FilterDescription.java
@@ -24,7 +24,7 @@
 public class FilterDescription extends ComponentType {
 
     public FilterDescription() {
-        super(ComponentTypeEnum.FILTER_DESCRIPTION);
+        super(ComponentTypeName.FILTER_DESCRIPTION);
     }
 
     /** Identifier of the component on which the filter starts. */
diff --git a/src/main/java/fr/insee/lunatic/model/flat/Input.java b/src/main/java/fr/insee/lunatic/model/flat/Input.java
index 20c106a3..0a68f7f1 100644
--- a/src/main/java/fr/insee/lunatic/model/flat/Input.java
+++ b/src/main/java/fr/insee/lunatic/model/flat/Input.java
@@ -14,7 +14,7 @@
 public class Input extends ComponentType implements ComponentSimpleResponseType, ComponentMandatory {
 
     public Input() {
-        super(ComponentTypeEnum.INPUT);
+        super(ComponentTypeName.INPUT);
     }
 
     /** Indicates whether the response is mandatory for this component. */
diff --git a/src/main/java/fr/insee/lunatic/model/flat/InputNumber.java b/src/main/java/fr/insee/lunatic/model/flat/InputNumber.java
index a8a444fa..ecf2ba1e 100644
--- a/src/main/java/fr/insee/lunatic/model/flat/InputNumber.java
+++ b/src/main/java/fr/insee/lunatic/model/flat/InputNumber.java
@@ -2,10 +2,6 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import fr.insee.lunatic.conversion.UnitDeserializer;
-import fr.insee.lunatic.conversion.UnitSerializer;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -14,91 +10,39 @@
 /**
  * Response component to collect numeric data.
  */
-@Getter
-@Setter
+@Getter @Setter
 public class InputNumber extends ComponentType implements ComponentSimpleResponseType, ComponentMandatory {
 
     public InputNumber() {
-        super(ComponentTypeEnum.INPUT_NUMBER);
+        super(ComponentTypeName.INPUT_NUMBER);
     }
 
     /** Indicates whether the response is mandatory for this component. */
     @JsonProperty("isMandatory")
     private Boolean mandatory;
 
-    /**
-     * Wrapper class for the unit property to ensure backward compatibility in serialization/deserialization.
-     */
-    @JsonSerialize(using = UnitSerializer.class)
-    @JsonDeserialize(using = UnitDeserializer.class)
-    @Getter
-    @Setter
-    public static class Unit {
-        private String value;
-        private LabelType label;
-    }
-
     /** Minimum value allowed. */
-    @Getter @Setter
     protected Double min;
 
     /** Maximum value allowed. */
-    @Getter @Setter
     protected Double max;
 
     /** Number of decimals allowed. null is equivalent to zero. */
-    @Getter @Setter
     protected BigInteger decimals;
 
     /** Unit of the numeric response. */
-    protected Unit unit;
-
-    @JsonProperty("unit")
-    public Unit getUnitWrapper() {
-        return unit;
-    }
-
-    @JsonProperty("unit")
-    public void setUnit(Unit unit) {
-        this.unit = unit;
-    }
-
-    /** Legacy unit string property.
-     * @deprecated Use label unit. */
-    @SuppressWarnings("java:S1192") // Sonar identifies deprecated tag as duplicate code
-    @JsonIgnore
-    @Deprecated(since = "3.14.0", forRemoval = true)
-    public String getUnit() {
-        if (unit == null)
-            return null;
-        return unit.getValue();
-    }
+    protected LabelType unit;
 
+    /**
+     * @deprecated Use <code>getUnit()</code> method.
+     */
     @JsonIgnore
+    @Deprecated(since = "6.0.0")
     public LabelType getUnitLabel() {
-        if (unit == null)
-            return null;
-        return unit.getLabel();
-    }
-
-    /** Legacy unit string property.
-     * @deprecated Use label unit. */
-    @SuppressWarnings("java:S1192") // Sonar identifies deprecated tag as duplicate code
-    @JsonIgnore
-    @Deprecated(since = "3.14.0", forRemoval = true)
-    public void setUnit(String value) {
-        unit = new Unit();
-        unit.setValue(value);
-    }
-
-    @JsonIgnore
-    public void setUnit(LabelType labelType) {
-        unit = new Unit();
-        unit.setLabel(labelType);
+        return unit;
     }
 
     /** {@link ResponseType} */
-    @Getter @Setter
     @JsonProperty(required = true)
     protected ResponseType response;
 
diff --git a/src/main/java/fr/insee/lunatic/model/flat/Loop.java b/src/main/java/fr/insee/lunatic/model/flat/Loop.java
index 89bee96a..e0eb526b 100644
--- a/src/main/java/fr/insee/lunatic/model/flat/Loop.java
+++ b/src/main/java/fr/insee/lunatic/model/flat/Loop.java
@@ -48,7 +48,7 @@ public class Loop
     protected Boolean isPaginatedByIterations;
 
     public Loop() {
-        super(ComponentTypeEnum.LOOP);
+        super(ComponentTypeName.LOOP);
         this.loopDependencies = new ArrayList<>();
         this.components = new ArrayList<>();
     }
diff --git a/src/main/java/fr/insee/lunatic/model/flat/PairwiseLinks.java b/src/main/java/fr/insee/lunatic/model/flat/PairwiseLinks.java
index c45ae839..fd386162 100644
--- a/src/main/java/fr/insee/lunatic/model/flat/PairwiseLinks.java
+++ b/src/main/java/fr/insee/lunatic/model/flat/PairwiseLinks.java
@@ -40,7 +40,7 @@ public class PairwiseLinks
     protected SymLinksType symLinks;
 
     public PairwiseLinks() {
-        super(ComponentTypeEnum.PAIRWISE_LINKS);
+        super(ComponentTypeName.PAIRWISE_LINKS);
         this.components = new ArrayList<>();
     }
 
diff --git a/src/main/java/fr/insee/lunatic/model/flat/Question.java b/src/main/java/fr/insee/lunatic/model/flat/Question.java
index e395b12c..c259a9b4 100644
--- a/src/main/java/fr/insee/lunatic/model/flat/Question.java
+++ b/src/main/java/fr/insee/lunatic/model/flat/Question.java
@@ -21,7 +21,7 @@ public class Question extends ComponentType implements ComponentMandatory {
     private Boolean mandatory;
 
     public Question() {
-        super(ComponentTypeEnum.QUESTION);
+        super(ComponentTypeName.QUESTION);
         this.components = new ArrayList<>();
     }
 
@@ -39,7 +39,7 @@ public Question() {
     public void addComponent(ComponentType component) {
         if (! isQuestionComponent(component))
             throw new IllegalArgumentException(
-                    "Component of type " + component.getComponentType() + " cannot be inserted in a Question component.");
+                    "Component of type " + component.getComponentTypeName() + " cannot be inserted in a Question component.");
         this.components.add(component);
     }
 
@@ -58,9 +58,9 @@ public void addComponents(Collection<ComponentType> components) {
      * @return True if the type of the given component is valid for a Question.
      */
     public static boolean isQuestionComponent(ComponentType component) {
-        if (component.getComponentType() == null)
+        if (component.getComponentTypeName() == null)
             return false;
-        return switch (component.getComponentType()) {
+        return switch (component.getComponentTypeName()) {
             case CHECKBOX_BOOLEAN, INPUT, TEXTAREA, INPUT_NUMBER, DATEPICKER, DURATION,
                     CHECKBOX_ONE, RADIO, DROPDOWN, SUGGESTER, TEXT,
                     CHECKBOX_GROUP, TABLE, ROSTER_FOR_LOOP, PAIRWISE_LINKS -> true;
diff --git a/src/main/java/fr/insee/lunatic/model/flat/Questionnaire.java b/src/main/java/fr/insee/lunatic/model/flat/Questionnaire.java
index 995d8865..17225d59 100644
--- a/src/main/java/fr/insee/lunatic/model/flat/Questionnaire.java
+++ b/src/main/java/fr/insee/lunatic/model/flat/Questionnaire.java
@@ -17,8 +17,13 @@
 @Setter
 public class Questionnaire extends ComponentType {
 
+    /**
+     * @deprecated Unused in Lunatic.
+     */
     @JsonProperty("final")
+    @Deprecated(since = "6.0.0")
     protected Boolean _final;
+
     protected String modele;
     protected String enoCoreVersion;
     protected String lunaticModelVersion;
@@ -41,42 +46,19 @@ public class Questionnaire extends ComponentType {
     protected Articulation articulation;
 
     public Questionnaire () {
-        super(ComponentTypeEnum.QUESTIONNAIRE);
+        super(ComponentTypeName.QUESTIONNAIRE);
         this.components = new ArrayList<>();
         this.suggesters = new ArrayList<>();
         this.variables = new ArrayList<>();
     }
 
-    @JsonProperty("pagination")
-    public Pagination getPaginationEnum() {
-        return pagination;
-    }
-
-    @JsonProperty("pagination")
-    public void setPagination(Pagination pagination) {
-        this.pagination = pagination;
-    }
-
-
-    /**
-     * Method for the legacy string pagination attribute.
-     * @return String value of the questionnaire pagination mode.
-     * @deprecated Use the Pagination enum.
-     */
-    @JsonIgnore
-    @Deprecated(since = "3.14.0", forRemoval = true)
-    public String getPagination() {
-        return pagination.value();
-    }
-
     /**
-     * Method for the legacy string pagination attribute.
-     * @deprecated Use the Pagination enum.
+     * @deprecated Use <code>getPagination()</code> method.
      */
     @JsonIgnore
-    @Deprecated(since = "3.14.0", forRemoval = true)
-    public void setPagination(String pagination) {
-        this.pagination = Pagination.fromValue(pagination);
+    @Deprecated(since = "6.0.0")
+    public Pagination getPaginationEnum() {
+        return pagination;
     }
 
 }
diff --git a/src/main/java/fr/insee/lunatic/model/flat/Radio.java b/src/main/java/fr/insee/lunatic/model/flat/Radio.java
index ce43ba56..c39565eb 100644
--- a/src/main/java/fr/insee/lunatic/model/flat/Radio.java
+++ b/src/main/java/fr/insee/lunatic/model/flat/Radio.java
@@ -29,7 +29,7 @@ public class Radio extends ComponentType implements ComponentSimpleResponseType,
     protected ResponseType response;
 
     public Radio() {
-        super(ComponentTypeEnum.RADIO);
+        super(ComponentTypeName.RADIO);
         this.orientation = Orientation.VERTICAL;
         this.options = new ArrayList<>();
     }
diff --git a/src/main/java/fr/insee/lunatic/model/flat/RosterForLoop.java b/src/main/java/fr/insee/lunatic/model/flat/RosterForLoop.java
index c03d3e98..a94e3793 100644
--- a/src/main/java/fr/insee/lunatic/model/flat/RosterForLoop.java
+++ b/src/main/java/fr/insee/lunatic/model/flat/RosterForLoop.java
@@ -18,16 +18,8 @@ public class RosterForLoop
     protected List<BodyCell> components;
     protected LabelType iterations;
 
-    /**
-     * Metadata on how the table should be displayed.
-     * Value should be one of "HORIZONTAL", "VERTICAL" or "DEFAULT".
-     * @deprecated Unused in Lunatic, to be removed.
-     */
-    @Deprecated(since = "3.14.0", forRemoval = true)
-    protected String positioning;
-
     public RosterForLoop() {
-        super(ComponentTypeEnum.ROSTER_FOR_LOOP);
+        super(ComponentTypeName.ROSTER_FOR_LOOP);
         this.header = new ArrayList<>();
         this.components = new ArrayList<>();
     }
diff --git a/src/main/java/fr/insee/lunatic/model/flat/Roundabout.java b/src/main/java/fr/insee/lunatic/model/flat/Roundabout.java
index 8710434a..2cf8e466 100644
--- a/src/main/java/fr/insee/lunatic/model/flat/Roundabout.java
+++ b/src/main/java/fr/insee/lunatic/model/flat/Roundabout.java
@@ -35,7 +35,7 @@ public static class Item {
     }
 
     public Roundabout() {
-        super(ComponentTypeEnum.ROUNDABOUT);
+        super(ComponentTypeName.ROUNDABOUT);
         this.components = new ArrayList<>();
         this.loopDependencies = new ArrayList<>();
     }
diff --git a/src/main/java/fr/insee/lunatic/model/flat/Sequence.java b/src/main/java/fr/insee/lunatic/model/flat/Sequence.java
index 0d59a4d5..f60e5113 100644
--- a/src/main/java/fr/insee/lunatic/model/flat/Sequence.java
+++ b/src/main/java/fr/insee/lunatic/model/flat/Sequence.java
@@ -8,7 +8,7 @@
 public class Sequence extends ComponentType implements ComponentSequenceType {
 
     public Sequence() {
-        super(ComponentTypeEnum.SEQUENCE);
+        super(ComponentTypeName.SEQUENCE);
     }
 
 }
diff --git a/src/main/java/fr/insee/lunatic/model/flat/Subsequence.java b/src/main/java/fr/insee/lunatic/model/flat/Subsequence.java
index c7211138..d140321c 100644
--- a/src/main/java/fr/insee/lunatic/model/flat/Subsequence.java
+++ b/src/main/java/fr/insee/lunatic/model/flat/Subsequence.java
@@ -8,7 +8,7 @@
 public class Subsequence extends ComponentType implements ComponentSequenceType {
 
     public Subsequence() {
-        super(ComponentTypeEnum.SUBSEQUENCE);
+        super(ComponentTypeName.SUBSEQUENCE);
     }
 
     protected String goToPage;
diff --git a/src/main/java/fr/insee/lunatic/model/flat/Suggester.java b/src/main/java/fr/insee/lunatic/model/flat/Suggester.java
index c0230f36..69a8a45b 100644
--- a/src/main/java/fr/insee/lunatic/model/flat/Suggester.java
+++ b/src/main/java/fr/insee/lunatic/model/flat/Suggester.java
@@ -17,7 +17,7 @@
 public class Suggester extends ComponentType implements ComponentSimpleResponseType, ComponentMandatory {
 
     public Suggester() {
-        super(ComponentTypeEnum.SUGGESTER);
+        super(ComponentTypeName.SUGGESTER);
     }
 
     public record OptionResponse(String name, String attribute) {}
diff --git a/src/main/java/fr/insee/lunatic/model/flat/Table.java b/src/main/java/fr/insee/lunatic/model/flat/Table.java
index 0185e83c..c7f7fe36 100644
--- a/src/main/java/fr/insee/lunatic/model/flat/Table.java
+++ b/src/main/java/fr/insee/lunatic/model/flat/Table.java
@@ -10,28 +10,20 @@
 
 @Getter
 @Setter
-public class Table
-    extends ComponentType
-    implements ComponentMultipleResponseType
-{
+public class Table extends ComponentType implements ComponentMultipleResponseType {
 
     protected LinesRoster lines;
+
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     protected List<HeaderType> header;
+
     @JsonProperty("body")
     protected List<BodyLine> bodyLines;
 
-    /**
-     * Metadata on how the table should be displayed.
-     * Value should be one of "HORIZONTAL", "VERTICAL" or "DEFAULT".
-     * @deprecated Unused in Lunatic, to be removed.
-     */
-    @Deprecated(since = "3.14.0", forRemoval = true)
-    protected String positioning;
-
     public Table() {
-        super(ComponentTypeEnum.TABLE);
+        super(ComponentTypeName.TABLE);
         this.header = new ArrayList<>();
         this.bodyLines = new ArrayList<>();
     }
+
 }
diff --git a/src/main/java/fr/insee/lunatic/model/flat/Text.java b/src/main/java/fr/insee/lunatic/model/flat/Text.java
index 765f3646..9c513b7c 100644
--- a/src/main/java/fr/insee/lunatic/model/flat/Text.java
+++ b/src/main/java/fr/insee/lunatic/model/flat/Text.java
@@ -6,7 +6,7 @@
 public class Text extends ComponentType {
 
     public Text() {
-        super(ComponentTypeEnum.TEXT);
+        super(ComponentTypeName.TEXT);
     }
 
 }
diff --git a/src/main/java/fr/insee/lunatic/model/flat/Textarea.java b/src/main/java/fr/insee/lunatic/model/flat/Textarea.java
index f984637c..8c9a00ee 100644
--- a/src/main/java/fr/insee/lunatic/model/flat/Textarea.java
+++ b/src/main/java/fr/insee/lunatic/model/flat/Textarea.java
@@ -14,7 +14,7 @@
 public class Textarea extends ComponentType implements ComponentSimpleResponseType, ComponentMandatory {
 
     public Textarea() {
-        super(ComponentTypeEnum.TEXTAREA);
+        super(ComponentTypeName.TEXTAREA);
     }
 
     /** Indicates whether the response is mandatory for this component. */
diff --git a/src/main/java/fr/insee/lunatic/model/flat/articulation/Articulation.java b/src/main/java/fr/insee/lunatic/model/flat/articulation/Articulation.java
index ad3349f6..e3998a19 100644
--- a/src/main/java/fr/insee/lunatic/model/flat/articulation/Articulation.java
+++ b/src/main/java/fr/insee/lunatic/model/flat/articulation/Articulation.java
@@ -18,13 +18,6 @@ public class Articulation {
      * list of items to compute table of articulation
      */
     @Getter
-    private List<ArticulationItem> items = new ArrayList<>();
-
-    /** @deprecated The list is instantiated when the articulation object is created.
-     * Use the getter method. */
-    @Deprecated(since = "5.8.1", forRemoval = true)
-    public void setItems(List<ArticulationItem> items) {
-        this.items = items;
-    }
+    private final List<ArticulationItem> items = new ArrayList<>();
 
 }
diff --git a/src/main/java/fr/insee/lunatic/model/flat/variable/CalculatedVariableType.java b/src/main/java/fr/insee/lunatic/model/flat/variable/CalculatedVariableType.java
index 098c2f7a..58e1fb48 100644
--- a/src/main/java/fr/insee/lunatic/model/flat/variable/CalculatedVariableType.java
+++ b/src/main/java/fr/insee/lunatic/model/flat/variable/CalculatedVariableType.java
@@ -1,8 +1,7 @@
 package fr.insee.lunatic.model.flat.variable;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import fr.insee.lunatic.model.flat.LabelType;
 import lombok.Getter;
 import lombok.Setter;
@@ -13,6 +12,7 @@
 /**
  * A calculated variable contains an expression to be evaluated at runtime.
  */
+@Getter @Setter
 public class CalculatedVariableType extends VariableType {
 
     public CalculatedVariableType() {
@@ -20,11 +20,9 @@ public CalculatedVariableType() {
     }
 
     /** Expression of the calculated variable. */
-    @Getter @Setter
     protected LabelType expression;
 
     /** Name of collected and/or external variables that are required to evaluate the expression. */
-    @Getter @Setter
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     protected List<String> bindingDependencies = new ArrayList<>();
 
@@ -32,47 +30,20 @@ public CalculatedVariableType() {
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     protected List<String> shapeFrom = new ArrayList<>();
 
-    /** Whether or not the Lunatic engine should ignore this variable
+    /** Whether the Lunatic engine should ignore this variable
      * (e.g. it is an exploitation variable that will be calculated later). */
-    @Getter @Setter
     @JsonInclude(JsonInclude.Include.NON_NULL)
     protected Boolean isIgnoredByLunatic;
 
     /**
      * Returns the list of the 'shape from' variable names.
      * @return A list of variable names.
+     * @deprecated Use <code>getShapeFrom()</code> method.
      */
-    @JsonProperty("shapeFrom")
+    @JsonIgnore
+    @Deprecated(since = "6.0.0")
     public List<String> getShapeFromList() {
         return shapeFrom;
     }
 
-    @JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
-    public void setShapeFrom(List<String> variableNames) {
-        this.shapeFrom = variableNames;
-    }
-
-    /**
-     * Get the first variable in the shape from variables list.
-     * @return A variable name.
-     * @deprecated The shape from property is a list now so this method will be removed at some point.
-     */
-    @Deprecated(since = "3.13.0", forRemoval = true)
-    public String getShapeFrom() {
-        if (shapeFrom.isEmpty())
-            return null;
-        return shapeFrom.getFirst();
-    }
-
-    /**
-     * Set shape from variable.
-     * @param variableName Variable name.
-     * @deprecated The shape from property is now a list of variable names.
-     */
-    @Deprecated(since = "3.13.0", forRemoval = true)
-    public void setShapeFrom(String variableName) {
-        shapeFrom.clear();
-        shapeFrom.add(variableName);
-    }
-
 }
diff --git a/src/main/java/fr/insee/lunatic/model/flat/variable/CollectedVariableType.java b/src/main/java/fr/insee/lunatic/model/flat/variable/CollectedVariableType.java
index e5242bea..9bd568f6 100644
--- a/src/main/java/fr/insee/lunatic/model/flat/variable/CollectedVariableType.java
+++ b/src/main/java/fr/insee/lunatic/model/flat/variable/CollectedVariableType.java
@@ -14,13 +14,6 @@ public CollectedVariableType() {
         variableType = VariableTypeEnum.COLLECTED;
     }
 
-    /**
-     * Identifier of the component in which the variable is collected.
-     * @deprecated Not used by Lunatic anymore.
-     */
-    @Deprecated(since = "3.3.5", forRemoval = true)
-    protected String componentRef;
-
     /** Value field of the collected variable. */
     protected CollectedVariableValues values;
 
diff --git a/src/test/java/fr/insee/lunatic/conversion/AccordionSerializationTest.java b/src/test/java/fr/insee/lunatic/conversion/AccordionSerializationTest.java
index dd3a7f56..fb2c7bc8 100644
--- a/src/test/java/fr/insee/lunatic/conversion/AccordionSerializationTest.java
+++ b/src/test/java/fr/insee/lunatic/conversion/AccordionSerializationTest.java
@@ -83,7 +83,7 @@ void deserializeAccordion() throws SerializationException {
                 new ByteArrayInputStream(accordionJson.getBytes()));
         //
         Accordion accordion = assertInstanceOf(Accordion.class, questionnaire.getComponents().getFirst());
-        assertEquals(ComponentTypeEnum.ACCORDION, accordion.getComponentType());
+        assertEquals(ComponentTypeName.ACCORDION, accordion.getComponentTypeName());
         assertEquals(ComponentPosition.BOTTOM, accordion.getPosition());
         //...
     }
diff --git a/src/test/java/fr/insee/lunatic/conversion/ArticulationSerializationTest.java b/src/test/java/fr/insee/lunatic/conversion/ArticulationSerializationTest.java
index 2c749120..20dfc741 100644
--- a/src/test/java/fr/insee/lunatic/conversion/ArticulationSerializationTest.java
+++ b/src/test/java/fr/insee/lunatic/conversion/ArticulationSerializationTest.java
@@ -5,19 +5,13 @@
 import fr.insee.lunatic.model.flat.Questionnaire;
 import fr.insee.lunatic.model.flat.articulation.Articulation;
 import fr.insee.lunatic.model.flat.articulation.ArticulationItem;
-import fr.insee.lunatic.model.flat.multimode.Multimode;
-import fr.insee.lunatic.model.flat.multimode.MultimodeLeaf;
-import fr.insee.lunatic.model.flat.multimode.MultimodeQuestionnaire;
-import fr.insee.lunatic.model.flat.multimode.MultimodeRule;
 import org.json.JSONException;
 import org.junit.jupiter.api.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
 import org.skyscreamer.jsonassert.JSONCompareMode;
 
 import java.io.ByteArrayInputStream;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
diff --git a/src/test/java/fr/insee/lunatic/conversion/BodyCellSerializationTest.java b/src/test/java/fr/insee/lunatic/conversion/BodyCellSerializationTest.java
index 5cfc6209..5ef0f240 100644
--- a/src/test/java/fr/insee/lunatic/conversion/BodyCellSerializationTest.java
+++ b/src/test/java/fr/insee/lunatic/conversion/BodyCellSerializationTest.java
@@ -76,7 +76,7 @@ void serializeSuggesterCell() throws JsonProcessingException, JSONException {
         //
         BodyCell bodyCell = new BodyCell();
         bodyCell.setId("foo-id");
-        bodyCell.setComponentType(ComponentTypeEnum.SUGGESTER);
+        bodyCell.setComponentType(ComponentTypeName.SUGGESTER);
         bodyCell.setStoreName("FOO_CODE_LIST");
         bodyCell.setResponse(new ResponseType());
         bodyCell.getResponse().setName("FOO");
@@ -92,7 +92,7 @@ void deserializeSuggesterCell() throws JsonProcessingException {
         BodyCell bodyCell = objectMapper.readValue(jsonSuggesterCell, BodyCell.class);
         //
         assertEquals("foo-id", bodyCell.getId());
-        assertEquals(ComponentTypeEnum.SUGGESTER, bodyCell.getComponentType());
+        assertEquals(ComponentTypeName.SUGGESTER, bodyCell.getComponentType());
         assertEquals("FOO_CODE_LIST", bodyCell.getStoreName());
         assertEquals("FOO", bodyCell.getResponse().getName());
     }
@@ -102,12 +102,12 @@ void serializeInputNumberCell() throws JsonProcessingException, JSONException {
         //
         BodyCell bodyCell = new BodyCell();
         bodyCell.setId("foo-id");
-        bodyCell.setComponentType(ComponentTypeEnum.INPUT_NUMBER);
+        bodyCell.setComponentType(ComponentTypeName.INPUT_NUMBER);
         bodyCell.setMin(0d);
         bodyCell.setMax(100d);
         bodyCell.setUnit(new LabelType());
-        bodyCell.getUnitLabel().setValue("%");
-        bodyCell.getUnitLabel().setType(LabelTypeEnum.VTL_MD);
+        bodyCell.getUnit().setValue("%");
+        bodyCell.getUnit().setType(LabelTypeEnum.VTL_MD);
         bodyCell.setResponse(new ResponseType());
         bodyCell.getResponse().setName("FOO");
         //
@@ -122,11 +122,11 @@ void deserializeInputNumberCell() throws JsonProcessingException {
         BodyCell bodyCell = objectMapper.readValue(jsonInputNumberCell, BodyCell.class);
         //
         assertEquals("foo-id", bodyCell.getId());
-        assertEquals(ComponentTypeEnum.INPUT_NUMBER, bodyCell.getComponentType());
+        assertEquals(ComponentTypeName.INPUT_NUMBER, bodyCell.getComponentType());
         assertEquals(0d, bodyCell.getMin());
         assertEquals(100d, bodyCell.getMax());
-        assertEquals("%", bodyCell.getUnitLabel().getValue());
-        assertEquals(LabelTypeEnum.VTL_MD, bodyCell.getUnitLabel().getType());
+        assertEquals("%", bodyCell.getUnit().getValue());
+        assertEquals(LabelTypeEnum.VTL_MD, bodyCell.getUnit().getType());
         assertEquals("FOO", bodyCell.getResponse().getName());
     }
 
@@ -135,7 +135,7 @@ void serializeInputNumberCell2() throws JsonProcessingException, JSONException {
         //
         BodyCell bodyCell = new BodyCell();
         bodyCell.setId("foo-id");
-        bodyCell.setComponentType(ComponentTypeEnum.INPUT_NUMBER);
+        bodyCell.setComponentType(ComponentTypeName.INPUT_NUMBER);
         bodyCell.setMin(0.5d);
         bodyCell.setMax(1d);
         bodyCell.setResponse(new ResponseType());
@@ -152,7 +152,7 @@ void deserializeInputNumberCell2() throws JsonProcessingException {
         BodyCell bodyCell = objectMapper.readValue(jsonInputNumberCellWithDecimals, BodyCell.class);
         //
         assertEquals("foo-id", bodyCell.getId());
-        assertEquals(ComponentTypeEnum.INPUT_NUMBER, bodyCell.getComponentType());
+        assertEquals(ComponentTypeName.INPUT_NUMBER, bodyCell.getComponentType());
         assertEquals(0.5d, bodyCell.getMin());
         assertEquals(1d, bodyCell.getMax());
         assertEquals("FOO", bodyCell.getResponse().getName());
@@ -163,7 +163,7 @@ void serializeDatepickerCell() throws JsonProcessingException, JSONException {
         //
         BodyCell bodyCell = new BodyCell();
         bodyCell.setId("foo-id");
-        bodyCell.setComponentType(ComponentTypeEnum.DATEPICKER);
+        bodyCell.setComponentType(ComponentTypeName.DATEPICKER);
         bodyCell.setMin("24/05/1950");
         bodyCell.setMax("02/04/2030");
         bodyCell.setResponse(new ResponseType());
@@ -180,7 +180,7 @@ void deserializeDatepickerCell() throws JsonProcessingException {
         BodyCell bodyCell = objectMapper.readValue(jsonDatepickerCell, BodyCell.class);
         //
         assertEquals("foo-id", bodyCell.getId());
-        assertEquals(ComponentTypeEnum.DATEPICKER, bodyCell.getComponentType());
+        assertEquals(ComponentTypeName.DATEPICKER, bodyCell.getComponentType());
         String minValue = (String) bodyCell.getMin();
         String maxValue = (String) bodyCell.getMax();
         assertEquals("24/05/1950", minValue);
diff --git a/src/test/java/fr/insee/lunatic/conversion/CleaningSerializationTest.java b/src/test/java/fr/insee/lunatic/conversion/CleaningSerializationTest.java
index e5111a7e..32103400 100644
--- a/src/test/java/fr/insee/lunatic/conversion/CleaningSerializationTest.java
+++ b/src/test/java/fr/insee/lunatic/conversion/CleaningSerializationTest.java
@@ -2,7 +2,10 @@
 
 import fr.insee.lunatic.exception.SerializationException;
 import fr.insee.lunatic.model.flat.Questionnaire;
-import fr.insee.lunatic.model.flat.cleaning.*;
+import fr.insee.lunatic.model.flat.cleaning.CleanedVariableEntry;
+import fr.insee.lunatic.model.flat.cleaning.CleaningExpression;
+import fr.insee.lunatic.model.flat.cleaning.CleaningType;
+import fr.insee.lunatic.model.flat.cleaning.CleaningVariableEntry;
 import org.json.JSONException;
 import org.junit.jupiter.api.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
diff --git a/src/test/java/fr/insee/lunatic/conversion/ComponentsSerialisationTest.java b/src/test/java/fr/insee/lunatic/conversion/ComponentsSerialisationTest.java
index 8b7cf85f..3f96ba22 100644
--- a/src/test/java/fr/insee/lunatic/conversion/ComponentsSerialisationTest.java
+++ b/src/test/java/fr/insee/lunatic/conversion/ComponentsSerialisationTest.java
@@ -1,7 +1,7 @@
 package fr.insee.lunatic.conversion;
 
 import fr.insee.lunatic.exception.SerializationException;
-import fr.insee.lunatic.model.flat.ComponentTypeEnum;
+import fr.insee.lunatic.model.flat.ComponentTypeName;
 import fr.insee.lunatic.model.flat.Input;
 import fr.insee.lunatic.model.flat.Questionnaire;
 import org.json.JSONException;
@@ -64,11 +64,11 @@ void deserializeInputComponent() throws SerializationException {
         //
         assertNotNull(questionnaire);
         assertEquals("questionnaire-id", questionnaire.getId());
-        assertEquals(ComponentTypeEnum.QUESTIONNAIRE, questionnaire.getComponentType());
+        assertEquals(ComponentTypeName.QUESTIONNAIRE, questionnaire.getComponentTypeName());
         //
         assertEquals(1, questionnaire.getComponents().size());
         assertEquals("input-id", questionnaire.getComponents().getFirst().getId());
-        assertEquals(ComponentTypeEnum.INPUT, questionnaire.getComponents().getFirst().getComponentType());
+        assertEquals(ComponentTypeName.INPUT, questionnaire.getComponents().getFirst().getComponentTypeName());
     }
 
 }
diff --git a/src/test/java/fr/insee/lunatic/conversion/InputNumberSerializationTest.java b/src/test/java/fr/insee/lunatic/conversion/InputNumberSerializationTest.java
index 6f37af6f..bbc926a8 100644
--- a/src/test/java/fr/insee/lunatic/conversion/InputNumberSerializationTest.java
+++ b/src/test/java/fr/insee/lunatic/conversion/InputNumberSerializationTest.java
@@ -31,19 +31,6 @@ class InputNumberSerializationTest {
               ]
             }""";
 
-    private final String jsonStringUnit = """
-            {
-              "componentType": "Questionnaire",
-              "components": [
-                {
-                  "componentType": "InputNumber",
-                  "min": 0,
-                  "max": 100,
-                  "unit": "kg"
-                }
-              ]
-            }""";
-
     private final String jsonLabelUnit = """
             {
               "componentType": "Questionnaire",
@@ -74,21 +61,6 @@ void serializeInputNumber_noUnit() throws SerializationException, JSONException
         JSONAssert.assertEquals(jsonNoUnit, result, JSONCompareMode.STRICT);
     }
 
-    @Test
-    void serializeInputNumber_stringUnit() throws SerializationException, JSONException {
-        //
-        Questionnaire questionnaire = new Questionnaire();
-        InputNumber inputNumber = new InputNumber();
-        inputNumber.setMin(0d);
-        inputNumber.setMax(100d);
-        inputNumber.setUnit("kg");
-        questionnaire.getComponents().add(inputNumber);
-        //
-        String result = jsonSerializer.serialize(questionnaire);
-        //
-        JSONAssert.assertEquals(jsonStringUnit, result, JSONCompareMode.STRICT);
-    }
-
     @Test
     void serializeInputNumber_labelUnit() throws SerializationException, JSONException {
         //
@@ -97,8 +69,8 @@ void serializeInputNumber_labelUnit() throws SerializationException, JSONExcepti
         inputNumber.setMin(0d);
         inputNumber.setMax(100d);
         inputNumber.setUnit(new LabelType());
-        inputNumber.getUnitLabel().setValue("\"kg\"");
-        inputNumber.getUnitLabel().setType(LabelTypeEnum.VTL_MD);
+        inputNumber.getUnit().setValue("\"kg\"");
+        inputNumber.getUnit().setType(LabelTypeEnum.VTL_MD);
         questionnaire.getComponents().add(inputNumber);
         //
         String result = jsonSerializer.serialize(questionnaire);
@@ -113,16 +85,6 @@ void deserializeInputNumber_noUnit() throws SerializationException {
         //
         InputNumber inputNumber = assertInstanceOf(InputNumber.class, questionnaire.getComponents().getFirst());
         assertNull(inputNumber.getUnit());
-        assertNull(inputNumber.getUnitLabel());
-    }
-
-    @Test
-    void deserializeInputNumber_stringUnit() throws SerializationException {
-        //
-        Questionnaire questionnaire = jsonDeserializer.deserialize(new ByteArrayInputStream(jsonStringUnit.getBytes()));
-        //
-        InputNumber inputNumber = assertInstanceOf(InputNumber.class, questionnaire.getComponents().getFirst());
-        assertEquals("kg", inputNumber.getUnit());
     }
 
     @Test
@@ -131,8 +93,8 @@ void deserializeInputNumber_labelUnit() throws SerializationException {
         Questionnaire questionnaire = jsonDeserializer.deserialize(new ByteArrayInputStream(jsonLabelUnit.getBytes()));
         //
         InputNumber inputNumber = assertInstanceOf(InputNumber.class, questionnaire.getComponents().getFirst());
-        assertEquals("\"kg\"", inputNumber.getUnitLabel().getValue());
-        assertEquals(LabelTypeEnum.VTL_MD, inputNumber.getUnitLabel().getType());
+        assertEquals("\"kg\"", inputNumber.getUnit().getValue());
+        assertEquals(LabelTypeEnum.VTL_MD, inputNumber.getUnit().getType());
     }
 
 }
diff --git a/src/test/java/fr/insee/lunatic/conversion/JsonDeserializerTest.java b/src/test/java/fr/insee/lunatic/conversion/JsonDeserializerTest.java
index 34dacf5e..3203cfb7 100644
--- a/src/test/java/fr/insee/lunatic/conversion/JsonDeserializerTest.java
+++ b/src/test/java/fr/insee/lunatic/conversion/JsonDeserializerTest.java
@@ -1,7 +1,7 @@
 package fr.insee.lunatic.conversion;
 
 import fr.insee.lunatic.exception.SerializationException;
-import fr.insee.lunatic.model.flat.ComponentTypeEnum;
+import fr.insee.lunatic.model.flat.ComponentTypeName;
 import fr.insee.lunatic.model.flat.Questionnaire;
 import org.junit.jupiter.api.Test;
 
@@ -22,7 +22,7 @@ void deserialize_simplestCase() throws SerializationException {
         //
         assertNotNull(questionnaire);
         assertEquals("foo-id", questionnaire.getId());
-        assertEquals(ComponentTypeEnum.QUESTIONNAIRE, questionnaire.getComponentType());
+        assertEquals(ComponentTypeName.QUESTIONNAIRE, questionnaire.getComponentTypeName());
     }
 
 }
diff --git a/src/test/java/fr/insee/lunatic/conversion/MultimodeSerializationTest.java b/src/test/java/fr/insee/lunatic/conversion/MultimodeSerializationTest.java
index 3a4d175a..a14d592e 100644
--- a/src/test/java/fr/insee/lunatic/conversion/MultimodeSerializationTest.java
+++ b/src/test/java/fr/insee/lunatic/conversion/MultimodeSerializationTest.java
@@ -2,7 +2,6 @@
 
 import fr.insee.lunatic.exception.SerializationException;
 import fr.insee.lunatic.model.flat.LabelTypeEnum;
-import fr.insee.lunatic.model.flat.Pagination;
 import fr.insee.lunatic.model.flat.Questionnaire;
 import fr.insee.lunatic.model.flat.multimode.Multimode;
 import fr.insee.lunatic.model.flat.multimode.MultimodeLeaf;
@@ -14,7 +13,6 @@
 import org.skyscreamer.jsonassert.JSONCompareMode;
 
 import java.io.ByteArrayInputStream;
-import java.security.KeyStore;
 import java.util.HashMap;
 import java.util.Map;
 
diff --git a/src/test/java/fr/insee/lunatic/conversion/PaginationSerializationTest.java b/src/test/java/fr/insee/lunatic/conversion/PaginationSerializationTest.java
index 1580252f..2be46307 100644
--- a/src/test/java/fr/insee/lunatic/conversion/PaginationSerializationTest.java
+++ b/src/test/java/fr/insee/lunatic/conversion/PaginationSerializationTest.java
@@ -35,22 +35,7 @@ void deserializePagination() throws SerializationException {
         //
         Questionnaire questionnaire = new JsonDeserializer().deserialize(new ByteArrayInputStream(jsonInput.getBytes()));
         //
-        assertEquals(Pagination.QUESTION, questionnaire.getPaginationEnum());
-        assertEquals("question", questionnaire.getPagination()); // backward compatibility test
-    }
-
-    // backward compatibility test
-    @Test
-    void serializeStringPagination() throws SerializationException, JSONException {
-        //
-        Questionnaire questionnaire = new Questionnaire();
-        questionnaire.setPagination("question");
-        //
-        String result = new JsonSerializer().serialize(questionnaire);
-        //
-        String expected = """
-                {"componentType": "Questionnaire", "pagination": "question"}""";
-        JSONAssert.assertEquals(expected, result, JSONCompareMode.STRICT);
+        assertEquals(Pagination.QUESTION, questionnaire.getPagination());
     }
 
 }
diff --git a/src/test/java/fr/insee/lunatic/conversion/ResizingSerializationTest.java b/src/test/java/fr/insee/lunatic/conversion/ResizingSerializationTest.java
index dd22258d..7e45c7c4 100644
--- a/src/test/java/fr/insee/lunatic/conversion/ResizingSerializationTest.java
+++ b/src/test/java/fr/insee/lunatic/conversion/ResizingSerializationTest.java
@@ -1,7 +1,10 @@
 package fr.insee.lunatic.conversion;
 
 import fr.insee.lunatic.exception.SerializationException;
-import fr.insee.lunatic.model.flat.*;
+import fr.insee.lunatic.model.flat.Questionnaire;
+import fr.insee.lunatic.model.flat.ResizingIterationEntry;
+import fr.insee.lunatic.model.flat.ResizingPairwiseEntry;
+import fr.insee.lunatic.model.flat.ResizingType;
 import org.json.JSONException;
 import org.junit.jupiter.api.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
diff --git a/src/test/java/fr/insee/lunatic/conversion/RosterForLoopSerializationTest.java b/src/test/java/fr/insee/lunatic/conversion/RosterForLoopSerializationTest.java
index 0a74bacb..dc951567 100644
--- a/src/test/java/fr/insee/lunatic/conversion/RosterForLoopSerializationTest.java
+++ b/src/test/java/fr/insee/lunatic/conversion/RosterForLoopSerializationTest.java
@@ -45,7 +45,7 @@ void serializeRosterForLoopWithConditionFilterInCell() throws SerializationExcep
         Questionnaire questionnaire = new Questionnaire();
         RosterForLoop rosterForLoop = new RosterForLoop();
         BodyCell inputNumberCell = new BodyCell();
-        inputNumberCell.setComponentType(ComponentTypeEnum.INPUT_NUMBER);
+        inputNumberCell.setComponentType(ComponentTypeName.INPUT_NUMBER);
         inputNumberCell.setId("input-number-cell-id");
         ConditionFilterType conditionFilter = new ConditionFilterType();
         conditionFilter.setType(LabelTypeEnum.VTL);
@@ -72,7 +72,7 @@ void deserializeRosterForLoopWithConditionFilterInCell() throws SerializationExc
         RosterForLoop rosterForLoop = assertInstanceOf(RosterForLoop.class, questionnaire.getComponents().getFirst());
         assertEquals(1, rosterForLoop.getComponents().size());
         BodyCell inputNumberCell = rosterForLoop.getComponents().getFirst();
-        assertEquals(ComponentTypeEnum.INPUT_NUMBER, inputNumberCell.getComponentType());
+        assertEquals(ComponentTypeName.INPUT_NUMBER, inputNumberCell.getComponentType());
         assertEquals("AGE >= 18", inputNumberCell.getConditionFilter().getValue());
         assertEquals(LabelTypeEnum.VTL, inputNumberCell.getConditionFilter().getType());
         assertEquals("AGE > 50", inputNumberCell.getConditionReadOnly().getValue());
diff --git a/src/test/java/fr/insee/lunatic/conversion/RoundaboutSerializationTest.java b/src/test/java/fr/insee/lunatic/conversion/RoundaboutSerializationTest.java
index e192537e..03ac5e90 100644
--- a/src/test/java/fr/insee/lunatic/conversion/RoundaboutSerializationTest.java
+++ b/src/test/java/fr/insee/lunatic/conversion/RoundaboutSerializationTest.java
@@ -66,7 +66,7 @@ void deserializeRoundabout() throws IOException, SerializationException {
         //
         Roundabout roundabout = assertInstanceOf(Roundabout.class, questionnaire.getComponents().getFirst());
         assertEquals(1, roundabout.getComponents().size());
-        assertEquals(ComponentTypeEnum.INPUT, roundabout.getComponents().getFirst().getComponentType());
+        assertEquals(ComponentTypeName.INPUT, roundabout.getComponents().getFirst().getComponentTypeName());
     }
 
 }
diff --git a/src/test/java/fr/insee/lunatic/conversion/SuggesterSerializationTest.java b/src/test/java/fr/insee/lunatic/conversion/SuggesterSerializationTest.java
index bb366d10..b4a766c2 100644
--- a/src/test/java/fr/insee/lunatic/conversion/SuggesterSerializationTest.java
+++ b/src/test/java/fr/insee/lunatic/conversion/SuggesterSerializationTest.java
@@ -72,7 +72,7 @@ void deserializeSuggesterComponent() throws SerializationException {
         //
         Suggester suggester = assertInstanceOf(Suggester.class, questionnaire.getComponents().getFirst());
         assertEquals("foo-id", suggester.getId());
-        assertEquals(ComponentTypeEnum.SUGGESTER, suggester.getComponentType());
+        assertEquals(ComponentTypeName.SUGGESTER, suggester.getComponentTypeName());
         assertEquals("FOO_CODE_LIST", suggester.getStoreName());
         assertEquals("FOO", suggester.getResponse().getName());
         assertEquals(2, suggester.getOptionResponses().size());
diff --git a/src/test/java/fr/insee/lunatic/conversion/TableSerializationTest.java b/src/test/java/fr/insee/lunatic/conversion/TableSerializationTest.java
index cdffdb3f..ef6cf6f4 100644
--- a/src/test/java/fr/insee/lunatic/conversion/TableSerializationTest.java
+++ b/src/test/java/fr/insee/lunatic/conversion/TableSerializationTest.java
@@ -44,7 +44,7 @@ void serializeTableWithTextCells() throws SerializationException, JSONException
         table.getBodyLines().add(new BodyLine());
         BodyCell textCell = new BodyCell();
         textCell.setId("text-cell-id");
-        textCell.setComponentType(ComponentTypeEnum.TEXT);
+        textCell.setComponentType(ComponentTypeName.TEXT);
         textCell.setLabel(new LabelType());
         textCell.getLabel().setType(LabelTypeEnum.VTL_MD);
         textCell.getLabel().setValue("\"Label value.\"");
@@ -66,7 +66,7 @@ void deserializeTableWithTextCells() throws SerializationException {
         assertEquals(1, table.getBodyLines().size());
         assertEquals(1, table.getBodyLines().getFirst().getBodyCells().size());
         BodyCell textCell = table.getBodyLines().getFirst().getBodyCells().getFirst();
-        assertEquals(ComponentTypeEnum.TEXT, textCell.getComponentType());
+        assertEquals(ComponentTypeName.TEXT, textCell.getComponentType());
         assertEquals("\"Label value.\"", textCell.getLabel().getValue());
         assertEquals(LabelTypeEnum.VTL_MD, textCell.getLabel().getType());
     }
diff --git a/src/test/java/fr/insee/lunatic/conversion/TextSerializationTest.java b/src/test/java/fr/insee/lunatic/conversion/TextSerializationTest.java
index 09e24a30..aba25985 100644
--- a/src/test/java/fr/insee/lunatic/conversion/TextSerializationTest.java
+++ b/src/test/java/fr/insee/lunatic/conversion/TextSerializationTest.java
@@ -52,7 +52,7 @@ void deserializeTextComponent() throws SerializationException {
                 new ByteArrayInputStream(textComponentJson.getBytes()));
         //
         Text text = assertInstanceOf(Text.class, questionnaire.getComponents().getFirst());
-        assertEquals(ComponentTypeEnum.TEXT, text.getComponentType());
+        assertEquals(ComponentTypeName.TEXT, text.getComponentTypeName());
         assertEquals("\"Non-editable text.\"", text.getLabel().getValue());
         assertEquals(LabelTypeEnum.VTL_MD, text.getLabel().getType());
     }
diff --git a/src/test/java/fr/insee/lunatic/conversion/UnitDeserializerTest.java b/src/test/java/fr/insee/lunatic/conversion/UnitDeserializerTest.java
deleted file mode 100644
index 7214fc53..00000000
--- a/src/test/java/fr/insee/lunatic/conversion/UnitDeserializerTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package fr.insee.lunatic.conversion;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import fr.insee.lunatic.model.flat.InputNumber.Unit;
-import fr.insee.lunatic.model.flat.LabelTypeEnum;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-class UnitDeserializerTest {
-
-    @Test
-    void deserializeStringUnit() throws JsonProcessingException {
-        //
-        Unit unit = new ObjectMapper().readValue("\"kg\"", Unit.class);
-        //
-        assertEquals("kg", unit.getValue());
-    }
-
-    @Test
-    void deserializeLabelUnit() throws JsonProcessingException {
-        //
-        String jsonInput = """
-                {"value": "\\"kg\\"", "type": "VTL|MD"}""";
-        //
-        Unit unit = new ObjectMapper().readValue(jsonInput, Unit.class);
-        //
-        assertEquals("\"kg\"", unit.getLabel().getValue());
-        assertEquals(LabelTypeEnum.VTL_MD, unit.getLabel().getType());
-    }
-
-}
diff --git a/src/test/java/fr/insee/lunatic/conversion/UnitSerializerTest.java b/src/test/java/fr/insee/lunatic/conversion/UnitSerializerTest.java
deleted file mode 100644
index 3d2581bd..00000000
--- a/src/test/java/fr/insee/lunatic/conversion/UnitSerializerTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package fr.insee.lunatic.conversion;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import fr.insee.lunatic.model.flat.InputNumber;
-import fr.insee.lunatic.model.flat.LabelType;
-import fr.insee.lunatic.model.flat.LabelTypeEnum;
-import org.json.JSONException;
-import org.junit.jupiter.api.Test;
-import org.skyscreamer.jsonassert.JSONAssert;
-import org.skyscreamer.jsonassert.JSONCompareMode;
-
-class UnitSerializerTest {
-
-    @Test
-    void serializeStringUnit() throws JsonProcessingException, JSONException {
-        //
-        InputNumber.Unit unit = new InputNumber.Unit();
-        unit.setValue("kg");
-        //
-        String result = new ObjectMapper().writeValueAsString(unit);
-        //
-        JSONAssert.assertEquals("\"kg\"", result, JSONCompareMode.STRICT);
-    }
-
-    @Test
-    void serializeLabelUnit() throws JsonProcessingException, JSONException {
-        //
-        InputNumber.Unit unit = new InputNumber.Unit();
-        unit.setLabel(new LabelType());
-        unit.getLabel().setValue("\"kg\"");
-        unit.getLabel().setType(LabelTypeEnum.VTL_MD);
-        //
-        String result = new ObjectMapper().writeValueAsString(unit);
-        //
-        String expected = """
-                {"value": "\\"kg\\"", "type": "VTL|MD"}""";
-        JSONAssert.assertEquals(expected, result, JSONCompareMode.STRICT);
-    }
-
-}
diff --git a/src/test/java/fr/insee/lunatic/conversion/variable/CalculatedVariableSerializationTest.java b/src/test/java/fr/insee/lunatic/conversion/variable/CalculatedVariableSerializationTest.java
index 93143de7..c1521149 100644
--- a/src/test/java/fr/insee/lunatic/conversion/variable/CalculatedVariableSerializationTest.java
+++ b/src/test/java/fr/insee/lunatic/conversion/variable/CalculatedVariableSerializationTest.java
@@ -111,7 +111,7 @@ void serializeCalculatedVariable_withShapeFrom() throws SerializationException,
         calculatedVariableType.setExpression(new LabelType());
         calculatedVariableType.getExpression().setValue("<VTL expression>");
         calculatedVariableType.getExpression().setType(LabelTypeEnum.VTL);
-        calculatedVariableType.getShapeFromList().add("SOME_COLLECTED_VARIABLE");
+        calculatedVariableType.getShapeFrom().add("SOME_COLLECTED_VARIABLE");
         questionnaire.getVariables().add(calculatedVariableType);
         //
         String result = jsonSerializer.serialize(questionnaire);
@@ -164,8 +164,8 @@ void deserializeCalculatedVariable_withShapeFrom() throws SerializationException
         assertEquals(1, questionnaire.getVariables().size());
         CalculatedVariableType calculatedVariableType = assertInstanceOf(CalculatedVariableType.class,
                 questionnaire.getVariables().getFirst());
-        assertEquals(1, calculatedVariableType.getShapeFromList().size());
-        assertEquals("SOME_COLLECTED_VARIABLE", calculatedVariableType.getShapeFromList().getFirst());
+        assertEquals(1, calculatedVariableType.getShapeFrom().size());
+        assertEquals("SOME_COLLECTED_VARIABLE", calculatedVariableType.getShapeFrom().getFirst());
         assertEquals(1, calculatedVariableType.getDimension().value());
     }
 
@@ -180,7 +180,7 @@ void deserializeShapeFrom_twoVariables() throws SerializationException {
         Questionnaire deserialized = jsonDeserializer.deserialize(new ByteArrayInputStream(jsonInput.getBytes()));
         //
         CalculatedVariableType calculatedVariable = (CalculatedVariableType) deserialized.getVariables().getFirst();
-        assertEquals(List.of("VAR1", "VAR2"), calculatedVariable.getShapeFromList());
+        assertEquals(List.of("VAR1", "VAR2"), calculatedVariable.getShapeFrom());
     }
 
     @Test
@@ -200,17 +200,4 @@ void serializeShapeFrom_twoVariables() throws SerializationException, JSONExcept
         JSONAssert.assertEquals(expected, serialized, JSONCompareMode.STRICT);
     }
 
-    @Test
-    void stringShapeFrom_backwardCompatibility() throws SerializationException {
-        //
-        String stringShapeFrom = """
-                {"componentType":"Questionnaire","variables":[
-                    {"variableType":"CALCULATED","shapeFrom":"FOO"}
-                ]}""";
-        //
-        Questionnaire deserialized = jsonDeserializer.deserialize(new ByteArrayInputStream(stringShapeFrom.getBytes()));
-        CalculatedVariableType calculatedVariable = (CalculatedVariableType) deserialized.getVariables().getFirst();
-        assertEquals("FOO", calculatedVariable.getShapeFromList().getFirst());
-    }
-
 }
diff --git a/src/test/java/fr/insee/lunatic/conversion/variable/CollectedVariableSerializationTest.java b/src/test/java/fr/insee/lunatic/conversion/variable/CollectedVariableSerializationTest.java
index f2693e43..3ff8ced3 100644
--- a/src/test/java/fr/insee/lunatic/conversion/variable/CollectedVariableSerializationTest.java
+++ b/src/test/java/fr/insee/lunatic/conversion/variable/CollectedVariableSerializationTest.java
@@ -13,7 +13,6 @@
 import org.skyscreamer.jsonassert.JSONCompareMode;
 
 import java.io.ByteArrayInputStream;
-import java.math.BigInteger;
 
 import static org.junit.jupiter.api.Assertions.*;