diff --git a/ccpp/physics_namelists/input_GFS_v17_p8_ugwpv1 b/ccpp/physics_namelists/input_GFS_v17_p8_ugwpv1.nml
similarity index 100%
rename from ccpp/physics_namelists/input_GFS_v17_p8_ugwpv1
rename to ccpp/physics_namelists/input_GFS_v17_p8_ugwpv1.nml
diff --git a/ccpp/suites/suite_SCM_GFS_v17_p8_ugwpv1.xml b/ccpp/suites/suite_SCM_GFS_v17_p8_ugwpv1.xml
index 6c823ece..865fe47f 100644
--- a/ccpp/suites/suite_SCM_GFS_v17_p8_ugwpv1.xml
+++ b/ccpp/suites/suite_SCM_GFS_v17_p8_ugwpv1.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<suite name="SCM_GFS_v17_ugwpv1" version="1">
+<suite name="SCM_GFS_v17_p8_ugwpv1" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
     <subcycle loop="1">
diff --git a/ccpp/suites/suite_SCM_GFS_v17_p8_ugwpv1_ps.xml b/ccpp/suites/suite_SCM_GFS_v17_p8_ugwpv1_ps.xml
index 2c080fb9..cd62b628 100644
--- a/ccpp/suites/suite_SCM_GFS_v17_p8_ugwpv1_ps.xml
+++ b/ccpp/suites/suite_SCM_GFS_v17_p8_ugwpv1_ps.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<suite name="SCM_GFS_v17_ugwpv1_ps" version="1">
+<suite name="SCM_GFS_v17_p8_ugwpv1_ps" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
     <subcycle loop="1">