diff --git a/trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core/src/org/eclipse/tracecompass/incubator/internal/trace/server/jersey/rest/core/model/AxisDomain.java b/trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core/src/org/eclipse/tracecompass/incubator/internal/trace/server/jersey/rest/core/model/AxisDomain.java
index d46045597..f97954883 100644
--- a/trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core/src/org/eclipse/tracecompass/incubator/internal/trace/server/jersey/rest/core/model/AxisDomain.java
+++ b/trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core/src/org/eclipse/tracecompass/incubator/internal/trace/server/jersey/rest/core/model/AxisDomain.java
@@ -31,7 +31,7 @@
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "type", visible = true)
 @JsonSubTypes({
     @JsonSubTypes.Type(value = AxisDomainCategorical.class, name = "categorical"),
-    @JsonSubTypes.Type(value = AxisDomainTimeRange.class, name = "timeRange")
+    @JsonSubTypes.Type(value = AxisDomainRange.class, name = "range")
 })
 public interface AxisDomain {
 
@@ -39,11 +39,11 @@ public interface AxisDomain {
      * Returns the type of axis domain.
      * <p>
      * This is used as a discriminator to identify the specific subtype
-     * implementation (e.g., "categorical", "timeRange").
+     * implementation (e.g., "categorical", "range").
      *
      * @return A string identifying the domain type
      */
-    @Schema(description = "Type of axis domain (e.g., 'categorical' or 'timeRange')", requiredMode = RequiredMode.REQUIRED)
+    @Schema(description = "Type of axis domain (e.g., 'categorical' or 'range')", requiredMode = RequiredMode.REQUIRED)
     @JsonProperty("type")
     String getType();
 }
diff --git a/trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core/src/org/eclipse/tracecompass/incubator/internal/trace/server/jersey/rest/core/model/AxisDomainTimeRange.java b/trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core/src/org/eclipse/tracecompass/incubator/internal/trace/server/jersey/rest/core/model/AxisDomainRange.java
similarity index 94%
rename from trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core/src/org/eclipse/tracecompass/incubator/internal/trace/server/jersey/rest/core/model/AxisDomainTimeRange.java
rename to trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core/src/org/eclipse/tracecompass/incubator/internal/trace/server/jersey/rest/core/model/AxisDomainRange.java
index aedeb4f9f..65ecc7d9e 100644
--- a/trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core/src/org/eclipse/tracecompass/incubator/internal/trace/server/jersey/rest/core/model/AxisDomainTimeRange.java
+++ b/trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core/src/org/eclipse/tracecompass/incubator/internal/trace/server/jersey/rest/core/model/AxisDomainRange.java
@@ -23,7 +23,7 @@
  * <p>
  * Used in Swagger schema generation for chart axis descriptions.
  */
-public class AxisDomainTimeRange implements AxisDomain {
+public class AxisDomainRange implements AxisDomain {
 
     private final long start;
     private final long end;
@@ -37,7 +37,7 @@ public class AxisDomainTimeRange implements AxisDomain {
      *            The maximum value of the axis domain
      */
     @JsonCreator
-    public AxisDomainTimeRange(
+    public AxisDomainRange(
             @JsonProperty("start") long start,
             @JsonProperty("end") long end) {
         this.start = start;
@@ -47,7 +47,7 @@ public AxisDomainTimeRange(
     @Override
     @Schema(description = "Type of axis domain", requiredMode = RequiredMode.REQUIRED)
     public String getType() {
-        return "timeRange";
+        return "range";
     }
 
     /**
diff --git a/trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core/src/org/eclipse/tracecompass/incubator/internal/trace/server/jersey/rest/core/model/SeriesModel.java b/trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core/src/org/eclipse/tracecompass/incubator/internal/trace/server/jersey/rest/core/model/SeriesModel.java
index 550831cf2..998127901 100644
--- a/trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core/src/org/eclipse/tracecompass/incubator/internal/trace/server/jersey/rest/core/model/SeriesModel.java
+++ b/trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core/src/org/eclipse/tracecompass/incubator/internal/trace/server/jersey/rest/core/model/SeriesModel.java
@@ -60,14 +60,14 @@ public interface SeriesModel {
      * @return The X values' description.
      */
     @JsonProperty("xValuesDescription")
-    @ArraySchema(arraySchema = @Schema(description = "Series' X axis description"), schema = @Schema(requiredMode = RequiredMode.REQUIRED))
+    @Schema(description = "Series' X axis description", requiredMode = RequiredMode.REQUIRED)
     XYAxisDescription getXAxisDescription();
 
     /**
      * @return The Y values' description.
      */
     @JsonProperty("yValuesDescription")
-    @ArraySchema(arraySchema = @Schema(description = "Series' Y axis description"), schema = @Schema(requiredMode = RequiredMode.REQUIRED))
+    @Schema(description = "Series' Y axis description", requiredMode = RequiredMode.REQUIRED)
     XYAxisDescription getYAxisDescription();
 
     /**
diff --git a/trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core/src/org/eclipse/tracecompass/incubator/internal/trace/server/jersey/rest/core/webapp/AxisDomainSerializer.java b/trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core/src/org/eclipse/tracecompass/incubator/internal/trace/server/jersey/rest/core/webapp/AxisDomainSerializer.java
index 44a041dc6..e37a951f5 100644
--- a/trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core/src/org/eclipse/tracecompass/incubator/internal/trace/server/jersey/rest/core/webapp/AxisDomainSerializer.java
+++ b/trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core/src/org/eclipse/tracecompass/incubator/internal/trace/server/jersey/rest/core/webapp/AxisDomainSerializer.java
@@ -54,10 +54,10 @@ public void serialize(IAxisDomain value, JsonGenerator gen, SerializerProvider s
         if (value instanceof IAxisDomain.Categorical categorical) {
             gen.writeStringField(TYPE, "categorical"); //$NON-NLS-1$
             gen.writeObjectField("categories", categorical.categories()); //$NON-NLS-1$
-        } else if (value instanceof IAxisDomain.Range timeRange) {
-            gen.writeStringField(TYPE, "timeRange"); //$NON-NLS-1$
-            gen.writeNumberField("start", timeRange.start()); //$NON-NLS-1$
-            gen.writeNumberField("end", timeRange.end()); //$NON-NLS-1$
+        } else if (value instanceof IAxisDomain.Range range) {
+            gen.writeStringField(TYPE, "range"); //$NON-NLS-1$
+            gen.writeNumberField("start", range.start()); //$NON-NLS-1$
+            gen.writeNumberField("end", range.end()); //$NON-NLS-1$
         } else {
             throw new IllegalArgumentException("Unsupported AxisDomain implementation: " + value.getClass()); //$NON-NLS-1$
         }