diff --git a/runviewer/__main__.py b/runviewer/__main__.py
index 4cd5874..815d9a5 100644
--- a/runviewer/__main__.py
+++ b/runviewer/__main__.py
@@ -327,7 +327,7 @@ def __init__(self, exp_config):
         try:
             self.default_config_path = os.path.join(exp_config.get('DEFAULT', 'app_saved_configs'), 'runviewer')
         except LabConfig.NoOptionError:
-            exp_config.set('DEFAULT', 'app_saved_configs', os.path.join('%(labscript_suite)s', 'userlib', 'app_saved_configs', '%(experiment_name)s'))
+            exp_config.set('DEFAULT', 'app_saved_configs', os.path.join('%(labscript_suite)s', 'userlib', 'app_saved_configs', '%(apparatus_name)s'))
             self.default_config_path = os.path.join(exp_config.get('DEFAULT', 'app_saved_configs'), 'runviewer')
         if not os.path.exists(self.default_config_path):
             os.makedirs(self.default_config_path)
@@ -1643,7 +1643,7 @@ def handler(self, h5_filepath):
 
     shots_to_process_queue = Queue()
 
-    exp_config = LabConfig(required_params = {"DEFAULT": ["experiment_name"], "paths": ["shared_drive", "experiment_shot_storage"], 'ports': ['runviewer']})
+    exp_config = LabConfig(required_params = {"DEFAULT": ["apparatus_name"], "paths": ["shared_drive", "experiment_shot_storage"], 'ports': ['runviewer']})
 
     port = int(exp_config.get('ports', 'runviewer'))
     # Start experiment server