diff --git a/gui/src/aaregui/panels/file_path_panel.py b/gui/src/aaregui/panels/file_path_panel.py
index 8a4c469d..ff53b828 100644
--- a/gui/src/aaregui/panels/file_path_panel.py
+++ b/gui/src/aaregui/panels/file_path_panel.py
@@ -16,6 +16,9 @@ class FilePathPanel(QWidget):
         self.__sample_name = "sample"
         self.__sample_id = -1
         self.__dewar_pos = "None"
+        self.__puck_name = "Manual"
+        self.__puck_pos = 0
+
         self.__filename = ""
         self.__formatted_date = datetime.now().strftime('%y%m%d')
 
@@ -28,13 +31,13 @@ class FilePathPanel(QWidget):
         grid_layout.addWidget(self.save_file_checkbox, 1, 0, 1, 2)
 
         grid_layout.addWidget(QLabel("Directory", parent=self), 2, 0)
-        self.directory_edit = QLineEdit("{date}", parent=self)
+        self.directory_edit = QLineEdit("{date}/{puck}/{pos}", parent=self)
         self.directory_edit.setStyleSheet("background-color: rgb(255, 255, 255);")
         self.directory_edit.setToolTip("Provide subdirectory for your files, you can use \"{date}\" as macro for date.")
         grid_layout.addWidget(self.directory_edit, 2, 1)
 
         grid_layout.addWidget(QLabel("File prefix", parent=self), 3, 0)
-        self.file_prefix_edit = QLineEdit("{sample_name}", parent=self)
+        self.file_prefix_edit = QLineEdit("{sample}", parent=self)
         self.file_prefix_edit.setStyleSheet("background-color: rgb(255, 255, 255);")
         grid_layout.addWidget(self.file_prefix_edit, 3, 1)
 
@@ -82,7 +85,9 @@ class FilePathPanel(QWidget):
 
         self.__filename +=  f"_{run_number:03d}"
         self.__filename = self.__filename.replace('{date}', self.__formatted_date)
-        self.__filename = self.__filename.replace('{sample_name}', self.__sample_name)
+        self.__filename = self.__filename.replace('{sample}', self.__sample_name)
+        self.__filename = self.__filename.replace('{puck}', self.__puck_name)
+        self.__filename = self.__filename.replace('{pos}', f"{self.__puck_pos}")
         self.__filename = self.__filename.replace('{sample_id}', f"{self.__sample_id}")
 
         self.file_name_label.setText(self.__filename + "_master.h5")
@@ -120,10 +125,16 @@ class FilePathPanel(QWidget):
             self.__sample_id = -1
             self.__sample_name = "sample"
             self.__dewar_pos = "None"
+            self.__puck_name = "Manual"
+            self.__puck_pos = 0
         else:
             self.__sample_name = status.sample.sample_name
             self.__dewar_pos = status.sample.loc_str()
-
+            self.__puck_name = status.sample.puck_name
+            if status.sample.location is not None:
+                self.__puck_pos = status.sample.location.pos
+            else:
+                self.__puck_pos = 0
             self.update_filename()
 
             sample_id_old = self.__sample_id