diff --git a/webapp/src/components/App/Singlestudy/explore/Modelization/Areas/Renewables/Fields.tsx b/webapp/src/components/App/Singlestudy/explore/Modelization/Areas/Renewables/Fields.tsx
index 0ee371d7fa..8983dde2e8 100644
--- a/webapp/src/components/App/Singlestudy/explore/Modelization/Areas/Renewables/Fields.tsx
+++ b/webapp/src/components/App/Singlestudy/explore/Modelization/Areas/Renewables/Fields.tsx
@@ -47,6 +47,7 @@ function Fields() {
           name="group"
           control={control}
           options={RENEWABLE_GROUPS}
+          startCaseLabel={false}
           sx={{
             alignSelf: "center",
           }}
diff --git a/webapp/src/components/App/Singlestudy/explore/Modelization/Areas/Renewables/Form.tsx b/webapp/src/components/App/Singlestudy/explore/Modelization/Areas/Renewables/Form.tsx
index a180b0fe05..5c3e62b81f 100644
--- a/webapp/src/components/App/Singlestudy/explore/Modelization/Areas/Renewables/Form.tsx
+++ b/webapp/src/components/App/Singlestudy/explore/Modelization/Areas/Renewables/Form.tsx
@@ -81,7 +81,6 @@ function Renewables() {
           config={{ defaultValues }}
           onSubmit={handleSubmit}
           enableUndoRedo
-          sx={{ height: "50%" }}
         >
           <Fields />
         </Form>
diff --git a/webapp/src/components/App/Singlestudy/explore/Modelization/Areas/Renewables/utils.ts b/webapp/src/components/App/Singlestudy/explore/Modelization/Areas/Renewables/utils.ts
index f3e2520aa2..8ad72eeffc 100644
--- a/webapp/src/components/App/Singlestudy/explore/Modelization/Areas/Renewables/utils.ts
+++ b/webapp/src/components/App/Singlestudy/explore/Modelization/Areas/Renewables/utils.ts
@@ -26,15 +26,15 @@ import type { ClusterWithCapacity } from "../common/clustersUtils";
 ////////////////////////////////////////////////////////////////
 
 export const RENEWABLE_GROUPS = [
-  "Wind Onshore",
-  "Wind Offshore",
-  "Solar Thermal",
-  "Solar PV",
-  "Solar Rooftop",
-  "Other RES 1",
-  "Other RES 2",
-  "Other RES 3",
-  "Other RES 4",
+  "wind onshore",
+  "wind offshore",
+  "solar thermal",
+  "solar pv",
+  "solar rooftop",
+  "other res 1",
+  "other res 2",
+  "other res 3",
+  "other res 4",
 ] as const;
 
 export const TS_INTERPRETATION_OPTIONS = [
diff --git a/webapp/src/components/App/Singlestudy/explore/Modelization/Areas/Storages/Fields.tsx b/webapp/src/components/App/Singlestudy/explore/Modelization/Areas/Storages/Fields.tsx
index 62f351772a..e3cacb065d 100644
--- a/webapp/src/components/App/Singlestudy/explore/Modelization/Areas/Storages/Fields.tsx
+++ b/webapp/src/components/App/Singlestudy/explore/Modelization/Areas/Storages/Fields.tsx
@@ -49,6 +49,7 @@ function Fields() {
           name="group"
           control={control}
           options={STORAGE_GROUPS}
+          startCaseLabel={false}
           sx={{
             alignSelf: "center",
           }}
diff --git a/webapp/src/components/App/Singlestudy/explore/Modelization/Areas/Storages/Form.tsx b/webapp/src/components/App/Singlestudy/explore/Modelization/Areas/Storages/Form.tsx
index 22899502df..4ee29080d4 100644
--- a/webapp/src/components/App/Singlestudy/explore/Modelization/Areas/Storages/Form.tsx
+++ b/webapp/src/components/App/Singlestudy/explore/Modelization/Areas/Storages/Form.tsx
@@ -95,7 +95,6 @@ function Storages() {
           }}
           onSubmit={handleSubmit}
           enableUndoRedo
-          sx={{ height: "50%" }}
         >
           <Fields />
         </Form>
diff --git a/webapp/src/components/App/Singlestudy/explore/Modelization/Areas/Storages/utils.ts b/webapp/src/components/App/Singlestudy/explore/Modelization/Areas/Storages/utils.ts
index 83bd3c60f7..3d05b9a659 100644
--- a/webapp/src/components/App/Singlestudy/explore/Modelization/Areas/Storages/utils.ts
+++ b/webapp/src/components/App/Singlestudy/explore/Modelization/Areas/Storages/utils.ts
@@ -21,15 +21,15 @@ import type { PartialExceptFor } from "../../../../../../../utils/tsUtils";
 ////////////////////////////////////////////////////////////////
 
 export const STORAGE_GROUPS = [
-  "PSP_open",
-  "PSP_closed",
-  "Pondage",
-  "Battery",
-  "Other1",
-  "Other2",
-  "Other3",
-  "Other4",
-  "Other5",
+  "psp_open",
+  "psp_closed",
+  "pondage",
+  "battery",
+  "other1",
+  "other2",
+  "other3",
+  "other4",
+  "other5",
 ] as const;
 
 ////////////////////////////////////////////////////////////////
diff --git a/webapp/src/components/App/Singlestudy/explore/Modelization/Areas/Thermal/Fields.tsx b/webapp/src/components/App/Singlestudy/explore/Modelization/Areas/Thermal/Fields.tsx
index 3aaf182b48..7d3d5bb0de 100644
--- a/webapp/src/components/App/Singlestudy/explore/Modelization/Areas/Thermal/Fields.tsx
+++ b/webapp/src/components/App/Singlestudy/explore/Modelization/Areas/Thermal/Fields.tsx
@@ -59,6 +59,7 @@ function Fields() {
           name="group"
           control={control}
           options={THERMAL_GROUPS}
+          startCaseLabel={false}
           sx={{
             alignSelf: "center",
           }}
diff --git a/webapp/src/components/App/Singlestudy/explore/Modelization/Areas/Thermal/utils.ts b/webapp/src/components/App/Singlestudy/explore/Modelization/Areas/Thermal/utils.ts
index 3a5895c8f6..6747954f6b 100644
--- a/webapp/src/components/App/Singlestudy/explore/Modelization/Areas/Thermal/utils.ts
+++ b/webapp/src/components/App/Singlestudy/explore/Modelization/Areas/Thermal/utils.ts
@@ -42,16 +42,16 @@ export const TS_GEN_MATRIX_COLS = [
 ] as const;
 
 export const THERMAL_GROUPS = [
-  "Gas",
-  "Hard Coal",
-  "Lignite",
-  "Mixed fuel",
-  "Nuclear",
-  "Oil",
-  "Other 1",
-  "Other 2",
-  "Other 3",
-  "Other 4",
+  "gas",
+  "hard coal",
+  "lignite",
+  "mixed fuel",
+  "nuclear",
+  "oil",
+  "other 1",
+  "other 2",
+  "other 3",
+  "other 4",
 ] as const;
 
 export const THERMAL_POLLUTANTS = [