diff --git a/tests/ci/ci.test b/tests/ci/ci.test
index c1ebb3278b..bf8c8abd07 100644
--- a/tests/ci/ci.test
+++ b/tests/ci/ci.test
@@ -1,3 +1,3 @@
-fv3_ccpp_control
+fv3_control
 thr mpi dcp rst bit dbg
 ci-test-weather
diff --git a/tests/utest b/tests/utest
index 6dd1394290..4ba5c5bbfa 100755
--- a/tests/utest
+++ b/tests/utest
@@ -32,11 +32,11 @@ usage() {
   echo
   echo "  Examples"
   echo
-  echo "    'utest -n fv3_ccpp_control' tests all for fv3_ccpp_control"
-  echo "    'utest -n fv3_ccpp_control -c rst' tests restart for fv3_ccpp_control"
-  echo "    'utest -n fv3_ccpp_gfdlmp -c mpi,thr' tests mpi and threading for fv3_ccpp_gfdlmp"
-  echo "    'utest -n fv3_ccpp_gfdlmp -c bit' tests bit for fv3_ccpp_gfdlmp"
-  echo "    'utest -n fv3_ccpp_satmedmf -c dcp,dbg,rst' tests decomposition, debug, restart for fv3_ccpp_satmedmf"
+  echo "    'utest -n fv3_control' tests all for fv3_control"
+  echo "    'utest -n fv3_control -c rst' tests restart for fv3_control"
+  echo "    'utest -n fv3_gfdlmp -c mpi,thr' tests mpi and threading for fv3_gfdlmp"
+  echo "    'utest -n fv3_gfdlmp -c bit' tests bit for fv3_gfdlmp"
+  echo "    'utest -n fv3_satmedmf -c dcp,dbg,rst' tests decomposition, debug, restart for fv3_satmedmf"
   echo
   #set -x
 }
diff --git a/tests/utest.bld b/tests/utest.bld
index 90814bc59e..a2852dbeb9 100644
--- a/tests/utest.bld
+++ b/tests/utest.bld
@@ -1,22 +1,22 @@
-fv3_ccpp_control              | SUITES=FV3_GFS_2017
-fv3_ccpp_wrtGauss_netcdf_esmf | SUITES=FV3_GFS_2017
-fv3_ccpp_wrtGauss_netcdf      | SUITES=FV3_GFS_2017
-fv3_ccpp_wrtGlatlon_netcdf    | SUITES=FV3_GFS_2017
-fv3_ccpp_wrtGauss_nemsio      | SUITES=FV3_GFS_2017
-fv3_ccpp_stochy               | SUITES=FV3_GFS_2017
-fv3_ccpp_iau                  | SUITES=FV3_GFS_2017
-fv3_ccpp_ca                   | SUITES=FV3_GFS_2017
-fv3_ccpp_lheatstrg            | SUITES=FV3_GFS_2017
-fv3_ccpp_gfdlmprad            | SUITES=FV3_GFS_2017,FV3_GFS_2017_gfdlmp WW3=Y
-fv3_ccpp_atmwav               | SUITES=FV3_GFS_2017,FV3_GFS_2017_gfdlmp WW3=Y
-fv3_ccpp_multigases           | SUITES=FV3_GFS_2017_fv3wam 32BIT=Y MULTI_GASES=Y
-fv3_ccpp_gfdlmp               | SUITES=FV3_GFS_2017_gfdlmp
-fv3_ccpp_gfdlmprad_gwd        | SUITES=FV3_GFS_2017_gfdlmp
-fv3_ccpp_gfdlmprad_noahmp     | SUITES=FV3_GFS_2017_gfdlmp_noahmp
-fv3_ccpp_csawmg               | SUITES=FV3_GFS_2017_csawmg
-fv3_ccpp_satmedmf             | SUITES=FV3_GFS_2017_satmedmf
-fv3_ccpp_satmedmfq            | SUITES=FV3_GFS_2017_satmedmfq
-fv3_ccpp_gfsv16_csawmg        | SUITES=FV3_GFS_v16_csawmg
-fv3_ccpp_gfsv16_csawmgt       | SUITES=FV3_GFS_v16_csawmg
-fv3_ccpp_gocart_clm           | SUITES=FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_noahmp,FV3_GFS_v16_flake
-fv3_ccpp_gfs_v16_flake        | SUITES=FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_noahmp,FV3_GFS_v16_flake
+fv3_control              | SUITES=FV3_GFS_2017
+fv3_wrtGauss_netcdf_esmf | SUITES=FV3_GFS_2017
+fv3_wrtGauss_netcdf      | SUITES=FV3_GFS_2017
+fv3_wrtGlatlon_netcdf    | SUITES=FV3_GFS_2017
+fv3_wrtGauss_nemsio      | SUITES=FV3_GFS_2017
+fv3_stochy               | SUITES=FV3_GFS_2017
+fv3_iau                  | SUITES=FV3_GFS_2017
+fv3_ca                   | SUITES=FV3_GFS_2017
+fv3_lheatstrg            | SUITES=FV3_GFS_2017
+fv3_gfdlmprad            | SUITES=FV3_GFS_2017,FV3_GFS_2017_gfdlmp WW3=Y
+fv3_gfdlmprad_atmwav     | SUITES=FV3_GFS_2017,FV3_GFS_2017_gfdlmp WW3=Y
+fv3_multigases           | SUITES=FV3_GFS_2017_fv3wam 32BIT=Y MULTI_GASES=Y REPRO=Y
+fv3_gfdlmp               | SUITES=FV3_GFS_2017_gfdlmp, FV3_GFS_2017_gfdlmp_noahmp
+fv3_gfdlmprad_gwd        | SUITES=FV3_GFS_2017_gfdlmp, FV3_GFS_2017_gfdlmp_noahmp
+fv3_gfdlmprad_noahmp     | SUITES=FV3_GFS_2017_gfdlmp, FV3_GFS_2017_gfdlmp_noahmp
+fv3_csawmg               | SUITES=FV3_GFS_2017_csawmg
+fv3_satmedmf             | SUITES=FV3_GFS_2017_satmedmf
+fv3_satmedmfq            | SUITES=FV3_GFS_2017_satmedmfq
+fv3_gfsv16_csawmg        | SUITES=FV3_GFS_v16_csawmg
+fv3_gfsv16_csawmgt       | SUITES=FV3_GFS_v16_csawmg
+fv3_gocart_clm           | SUITES=FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_noahmp,FV3_GFS_v16_flake
+fv3_gfs_v16_flake        | SUITES=FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_noahmp,FV3_GFS_v16_flake