diff --git a/comictaggerlib/renamewindow.py b/comictaggerlib/renamewindow.py
index 6addfac..c896d70 100644
--- a/comictaggerlib/renamewindow.py
+++ b/comictaggerlib/renamewindow.py
@@ -61,19 +61,19 @@ class RenameWindow(QtWidgets.QDialog):
         self.rename_list: list[str] = []
 
         self.btnSettings.clicked.connect(self.modify_settings)
-        platform = "universal" if self.options[0].filename_rename_strict else "auto"
+        platform = "universal" if self.options[0].rename_strict else "auto"
         self.renamer = FileRenamer(None, platform=platform, replacements=self.options[0].rename_replacements)
 
         self.do_preview()
 
     def config_renamer(self, ca: ComicArchive, md: GenericMetadata | None = None) -> str:
-        self.renamer.set_template(self.options[0].filename_rename_template)
-        self.renamer.set_issue_zero_padding(self.options[0].filename_rename_issue_number_padding)
-        self.renamer.set_smart_cleanup(self.options[0].filename_rename_use_smart_string_cleanup)
+        self.renamer.set_template(self.options[0].rename_template)
+        self.renamer.set_issue_zero_padding(self.options[0].rename_issue_number_padding)
+        self.renamer.set_smart_cleanup(self.options[0].rename_use_smart_string_cleanup)
         self.renamer.replacements = self.options[0].rename_replacements
 
         new_ext = ca.path.suffix  # default
-        if self.options[0].filename_rename_set_extension_based_on_archive:
+        if self.options[0].rename_set_extension_based_on_archive:
             if ca.is_sevenzip():
                 new_ext = ".cb7"
             elif ca.is_zip():
@@ -91,7 +91,7 @@ class RenameWindow(QtWidgets.QDialog):
                     self.options[0].filename_remove_publisher,
                 )
         self.renamer.set_metadata(md)
-        self.renamer.move = self.options[0].filename_rename_move_to_dir
+        self.renamer.move = self.options[0].rename_move_to_dir
         return new_ext
 
     def do_preview(self) -> None:
@@ -104,7 +104,7 @@ class RenameWindow(QtWidgets.QDialog):
             try:
                 new_name = self.renamer.determine_name(new_ext)
             except ValueError as e:
-                logger.exception("Invalid format string: %s", self.options[0].filename_rename_template)
+                logger.exception("Invalid format string: %s", self.options[0].rename_template)
                 QtWidgets.QMessageBox.critical(
                     self,
                     "Invalid format string!",
@@ -119,7 +119,7 @@ class RenameWindow(QtWidgets.QDialog):
             except Exception as e:
                 logger.exception(
                     "Formatter failure: %s metadata: %s",
-                    self.options[0].filename_rename_template,
+                    self.options[0].rename_template,
                     self.renamer.metadata,
                 )
                 QtWidgets.QMessageBox.critical(
@@ -197,7 +197,7 @@ class RenameWindow(QtWidgets.QDialog):
 
                 folder = get_rename_dir(
                     comic[0],
-                    self.options[0].filename_rename_dir if self.options[0].filename_rename_move_to_dir else None,
+                    self.options[0].rename_dir if self.options[0].rename_move_to_dir else None,
                 )
 
                 full_path = folder / comic[1]