diff --git a/parm/use_cases/model_applications/tc_and_extra_tc/TCDiag_fcstGFSO_SHIP_obsOFCL_SingleForecast.conf b/parm/use_cases/model_applications/tc_and_extra_tc/TCDiag_fcstGFSO_SHIP_obsOFCL_SingleForecast.conf
index a6a2ed670..72fa49cc1 100644
--- a/parm/use_cases/model_applications/tc_and_extra_tc/TCDiag_fcstGFSO_SHIP_obsOFCL_SingleForecast.conf
+++ b/parm/use_cases/model_applications/tc_and_extra_tc/TCDiag_fcstGFSO_SHIP_obsOFCL_SingleForecast.conf
@@ -87,12 +87,12 @@ USER_SCRIPT_COMMAND = {PARM_BASE}/use_cases/model_applications/tc_and_extra_tc/U
 # https://metplus.readthedocs.io/en/latest/Users_Guide/systemconfiguration.html#directory-and-filename-template-info
 ###
 
-TC_DIAG_DECK_INPUT_DIR = {INPUT_BASE}/model_applications/tc_and_extra_tc/TCDiag_fcstGFSO_SHIP_obsOFCL_SingleForecast/
-TC_DIAG_DECK_INPUT_TEMPLATE = tc_data/adeck/subset.a{TC_DIAG_BASIN_LOWER}{TC_DIAG_CYCLONE}{date?fmt=%Y}.dat
+TC_DIAG_DECK_INPUT_DIR = {INPUT_BASE}/model_applications/tc_and_extra_tc/TCDiag_fcstGFSO_SHIP_obsOFCL_SingleForecast/tc_data/adeck/
+TC_DIAG_DECK_INPUT_TEMPLATE = subset.a{TC_DIAG_BASIN_LOWER}{TC_DIAG_CYCLONE}{date?fmt=%Y}.dat
 
-TC_DIAG_INPUT1_DIR = {INPUT_BASE}/model_applications/tc_and_extra_tc/TCDiag_fcstGFSO_SHIP_obsOFCL_SingleForecast/
+TC_DIAG_INPUT1_DIR = {INPUT_BASE}/model_applications/tc_and_extra_tc/TCDiag_fcstGFSO_SHIP_obsOFCL_SingleForecast/model_data/grib2/gfs/
 #TC_DIAG_INPUT1_TEMPLATE = model_data/grib2/gfs/subset.gfs.0p25.t12z.pgrb2.0p25.f*
-TC_DIAG_INPUT1_TEMPLATE = model_data/grib2/gfs/subset.gfs.0p25.{init?fmt=%Y%m%d%H}.f*
+TC_DIAG_INPUT1_TEMPLATE = subset.gfs.0p25.{init?fmt=%Y%m%d%H}.f*
 
 TC_DIAG_INPUT1_DOMAIN = parent
 TC_DIAG_INPUT1_TECH_ID_LIST = AVNO
@@ -178,11 +178,14 @@ TC_DIAG_DOMAIN_INFO1_OVERRIDE_DIAGS =
 TC_PAIRS_RUNTIME_FREQ = RUN_ONCE_FOR_EACH
 
 
-TC_PAIRS_ADECK_INPUT_DIR = {INPUT_BASE}/met_test/new/hwrf/adeck
-TC_PAIRS_ADECK_TEMPLATE = {model?fmt=%s}/*{cyclone?fmt=%s}l.{date?fmt=%Y%m%d%H}.trak.hwrf.atcfunix
+#TC_PAIRS_ADECK_INPUT_DIR = {INPUT_BASE}/met_test/new/hwrf/adeck
+TC_PAIRS_ADECK_INPUT_DIR = {INPUT_BASE}/model_applications/tc_and_extra_tc/TCDiag_fcstGFSO_SHIP_obsOFCL_SingleForecast/tc_data/adeck/
+#TC_PAIRS_ADECK_TEMPLATE = {model?fmt=%s}/*{cyclone?fmt=%s}l.{date?fmt=%Y%m%d%H}.trak.hwrf.atcfunix
+TC_PAIRS_ADECK_TEMPLATE = {subset.a{TC_DIAG_BASIN_LOWER}{TC_DIAG_CYCLONE}{date?fmt=%Y}.dat
 
-TC_PAIRS_BDECK_INPUT_DIR = {INPUT_BASE}/met_test/new/hwrf/bdeck
-TC_PAIRS_BDECK_TEMPLATE = b{TC_DIAG_BASIN?fmt=%s}{TC_DIAG_CYCLONE?fmt=%s}{date?fmt=%Y}.dat
+#TC_PAIRS_BDECK_INPUT_DIR = {INPUT_BASE}/met_test/new/hwrf/bdeck
+TC_PAIRS_BDECK_INPUT_DIR = {INPUT_BASE}/model_applications/tc_and_extra_tc/TCDiag_fcstGFSO_SHIP_obsOFCL_SingleForecast/tc_data/bdeck/
+TC_PAIRS_BDECK_TEMPLATE = b{TC_DIAG_BASIN_LOWER}{TC_DIAG_CYCLONE}{date?fmt=%Y}.dat
 
 TC_PAIRS_EDECK_INPUT_DIR =
 TC_PAIRS_EDECK_TEMPLATE =
@@ -192,7 +195,7 @@ TC_PAIRS_DIAG_TEMPLATE1 =
 TC_PAIRS_DIAG_SOURCE1 =
 
 TC_PAIRS_OUTPUT_DIR = {OUTPUT_BASE}/tc_pairs
-TC_PAIRS_OUTPUT_TEMPLATE = tc_pairs_{TC_DIAG_BASIN?fmt=%s}{date?fmt=%Y%m%d%H}.dat
+TC_PAIRS_OUTPUT_TEMPLATE = tc_pairs_{TC_DIAG_BASIN_LOWER}{date?fmt=%Y%m%d%H}.dat
 
 TC_PAIRS_SKIP_IF_OUTPUT_EXISTS = no
 TC_PAIRS_READ_ALL_FILES = no