diff --git a/parm/stage/fv3_cold.yaml.j2 b/parm/stage/atmosphere_cold.yaml.j2
similarity index 100%
rename from parm/stage/fv3_cold.yaml.j2
rename to parm/stage/atmosphere_cold.yaml.j2
diff --git a/parm/stage/fv3_nest.yaml.j2 b/parm/stage/atmosphere_nest.yaml.j2
similarity index 100%
rename from parm/stage/fv3_nest.yaml.j2
rename to parm/stage/atmosphere_nest.yaml.j2
diff --git a/parm/stage/fv3_warm.yaml.j2 b/parm/stage/atmosphere_warm.yaml.j2
similarity index 100%
rename from parm/stage/fv3_warm.yaml.j2
rename to parm/stage/atmosphere_warm.yaml.j2
diff --git a/ush/python/pygfs/task/stage.py b/ush/python/pygfs/task/stage.py
index bd300c4bc3..31b23f10a5 100644
--- a/ush/python/pygfs/task/stage.py
+++ b/ush/python/pygfs/task/stage.py
@@ -54,9 +54,9 @@ def determine_stage(self, stage_dict: Dict[str, Any]) -> List[str]:
         stage_sets = []
 
         if stage_dict.EXP_WARM_START:
-            stage_sets.append("fv3_warm.yaml.j2")
+            stage_sets.append("atmosphere_warm.yaml.j2")
         else:
-            stage_sets.append("fv3_cold.yaml.j2")
+            stage_sets.append("atmosphere_cold.yaml.j2")
 
         if stage_dict.DO_WAVE:
             stage_sets.append("wave.yaml.j2")
@@ -68,7 +68,7 @@ def determine_stage(self, stage_dict: Dict[str, Any]) -> List[str]:
             stage_sets.append("ice.yaml.j2")
 
         if stage_dict.DO_NEST:
-            stage_sets.append("fv3_nest.yaml.j2")
+            stage_sets.append("atmosphere_nest.yaml.j2")
 
         return stage_sets