diff --git a/simpeg_drivers/components/models.py b/simpeg_drivers/components/models.py
index 3153e21d..46009499 100644
--- a/simpeg_drivers/components/models.py
+++ b/simpeg_drivers/components/models.py
@@ -499,20 +499,30 @@ def save_model(self):
                     remapped_model.reshape((-1, 3), order="F"), axis=1
                 )
 
-        self.driver.inversion_mesh.entity.add_data(
-            {f"{self.model_type}_model": {"values": remapped_model}}
-        )
         model_type = self.model_type
+        if (
+            model_type == "conductivity"
+            and getattr(self.driver.params, "model_type", None) == "Resistivity (Ohm-m)"
+        ):
+            model_type = "resistivity"
 
-        # TODO: Standardize names for upper_model and lower_model
-        if model_type in ["starting", "reference", "conductivity"]:
-            model_type += "_model"
+        self.driver.inversion_mesh.entity.add_data(
+            {f"{model_type}_model": {"values": remapped_model}}
+        )
 
     def edit_ndv_model(self, model):
         """Change values to NDV on models and save to workspace."""
         for field in ["model", "inclination", "declination"]:
+            model_type = self.model_type
+            if (
+                model_type == "conductivity"
+                and getattr(self.driver.params, "model_type", None)
+                == "Resistivity (Ohm-m)"
+            ):
+                model_type = "resistivity"
+
             data_obj = self.driver.inversion_mesh.entity.get_data(
-                f"{self.model_type}_{field}"
+                f"{model_type}_{field}"
             )
             if (
                 any(data_obj)