diff --git a/video_prediction_tools/utils/runscript_generator/config_utils.py b/video_prediction_tools/utils/runscript_generator/config_utils.py
index e29ab9457615cbb6641aa27e0d5b9da2ac9bdc9f..4740f81e0b16519c6cc15394b14bdea77921e056 100755
--- a/video_prediction_tools/utils/runscript_generator/config_utils.py
+++ b/video_prediction_tools/utils/runscript_generator/config_utils.py
@@ -31,9 +31,9 @@ class Config_runscript_base:
         self.VIRT_ENV_NAME = venv_name
         # runscript related attributes
         if lhpc:
-            self.runscript_dir = "../HPC_scripts"
+            self.runscript_dir = "../JSC_scripts"
         else:
-            self.runscript_dir = "../nonHPC_scripts"
+            self.runscript_dir = "../HPC_scripts"
 
         self.long_name_wrk_step = None
         self.rscrpt_tmpl_prefix = None
diff --git a/video_prediction_tools/utils/runscript_generator/setup_runscript_templates.sh b/video_prediction_tools/utils/runscript_generator/setup_runscript_templates.sh
index f47f6dcb390db9a14f09570e4e0d354aa7d50d9b..e89b6ba55790be1e3eca1db99faa14a6ad0c8cd0 100755
--- a/video_prediction_tools/utils/runscript_generator/setup_runscript_templates.sh
+++ b/video_prediction_tools/utils/runscript_generator/setup_runscript_templates.sh
@@ -47,7 +47,7 @@ else
 fi
 
 echo "Start setting up templates under nonHPC_scripts/..."
-for f in "${BASE_DIR}"/nonHPC_scripts/*template.sh; do
+for f in "${BASE_DIR}"/HPC_scripts/*template.sh; do
   echo "Setting up ${f}..."
   fnew=${f%%.*}_${USER}.sh
   cp "${f}" "${fnew}"
@@ -56,7 +56,7 @@ done
 echo "Done!"
 
 echo "Start setting up templates under HPC_scripts/"
-for f in "${BASE_DIR}"/HPC_scripts/*template.sh; do
+for f in "${BASE_DIR}"/JSC_scripts/*template.sh; do
   echo "Setting up ${f}..."
   fnew=${f%%.*}_${USER}.sh
   cp "${f}" "${fnew}"