diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4f46e30f9b1..48e1767b555 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -35,6 +35,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 - We merged the functionality "Append contents from a BibTeX library into the currently viewed library" into the "Import into database" functionality. Fixes [#6049](https://github.com/JabRef/jabref/issues/6049).
 - We changed the directory where fulltext downloads are stored to the directory set in the import-tab in preferences. [#6381](https://github.com/JabRef/jabref/pull/6381)
 - We improved the error message for invalid jstyles. [#6303](https://github.com/JabRef/jabref/issues/6303)
+- We changed the section name of 'Advanced' to 'Network' in the preferences and removed some obsolete options.[#6489](https://github.com/JabRef/jabref/pull/6489)
 - We improved the context menu of the column "Linked identifiers" of the main table, by truncating their texts, if they are too long. [#6499](https://github.com/JabRef/jabref/issues/6499)
 
 ### Fixed
diff --git a/src/main/java/org/jabref/gui/bibtexkeypattern/BibtexKeyPatternDialog.java b/src/main/java/org/jabref/gui/bibtexkeypattern/BibtexKeyPatternDialog.java
index d73a0682ae3..fcafab1638e 100644
--- a/src/main/java/org/jabref/gui/bibtexkeypattern/BibtexKeyPatternDialog.java
+++ b/src/main/java/org/jabref/gui/bibtexkeypattern/BibtexKeyPatternDialog.java
@@ -19,7 +19,7 @@ public BibtexKeyPatternDialog(BasePanel panel) {
         this.bibtexKeyPatternPanel = new BibtexKeyPatternPanel(panel);
         this.panel = panel;
         this.metaData = panel.getBibDatabaseContext().getMetaData();
-        AbstractBibtexKeyPattern keyPattern = metaData.getCiteKeyPattern(Globals.prefs.getKeyPattern());
+        AbstractBibtexKeyPattern keyPattern = metaData.getCiteKeyPattern(Globals.prefs.getGlobalBibtexKeyPattern());
         bibtexKeyPatternPanel.setValues(keyPattern);
         init();
     }
diff --git a/src/main/java/org/jabref/gui/bibtexkeypattern/BibtexKeyPatternPanel.java b/src/main/java/org/jabref/gui/bibtexkeypattern/BibtexKeyPatternPanel.java
index 6637e5327f2..3d5356e5ef5 100644
--- a/src/main/java/org/jabref/gui/bibtexkeypattern/BibtexKeyPatternPanel.java
+++ b/src/main/java/org/jabref/gui/bibtexkeypattern/BibtexKeyPatternPanel.java
@@ -118,7 +118,7 @@ private void buildGUI() {
     }
 
     public DatabaseBibtexKeyPattern getKeyPatternAsDatabaseBibtexKeyPattern() {
-        DatabaseBibtexKeyPattern res = new DatabaseBibtexKeyPattern(Globals.prefs.getKeyPattern());
+        DatabaseBibtexKeyPattern res = new DatabaseBibtexKeyPattern(Globals.prefs.getGlobalBibtexKeyPattern());
         fillPatternUsingPanelData(res);
         return res;
     }
diff --git a/src/main/java/org/jabref/gui/bibtexkeypattern/GenerateBibtexKeySingleAction.java b/src/main/java/org/jabref/gui/bibtexkeypattern/GenerateBibtexKeySingleAction.java
index 25c5196ac37..7e8501dbcd8 100644
--- a/src/main/java/org/jabref/gui/bibtexkeypattern/GenerateBibtexKeySingleAction.java
+++ b/src/main/java/org/jabref/gui/bibtexkeypattern/GenerateBibtexKeySingleAction.java
@@ -25,7 +25,7 @@ public GenerateBibtexKeySingleAction(BibEntry entry, BibDatabaseContext database
         this.preferencesService = preferencesService;
         this.undoManager = undoManager;
 
-        if (preferencesService.getBibtexKeyPatternPreferences().avoidOverwritingCiteKey()) {
+        if (preferencesService.getBibtexKeyPatternPreferences().shouldAvoidOverwriteCiteKey()) {
             this.executable.bind(entry.getCiteKeyBinding().isEmpty());
         }
     }
diff --git a/src/main/java/org/jabref/gui/preferences/BibtexKeyPatternTabView.java b/src/main/java/org/jabref/gui/preferences/BibtexKeyPatternTabView.java
index a3f24f006ed..37b2614412a 100644
--- a/src/main/java/org/jabref/gui/preferences/BibtexKeyPatternTabView.java
+++ b/src/main/java/org/jabref/gui/preferences/BibtexKeyPatternTabView.java
@@ -39,7 +39,7 @@ public BibtexKeyPatternTabView(JabRefPreferences preferences) {
 
         bibtexKeyPatternTable = new BibtexKeyPatternPanel(preferences,
                 Globals.entryTypesManager.getAllTypes(preferences.getDefaultBibDatabaseMode()),
-                preferences.getKeyPattern());
+                preferences.getGlobalBibtexKeyPattern());
 
         ViewLoader.view(this)
                   .root(this)
diff --git a/src/main/java/org/jabref/gui/preferences/BibtexKeyPatternTabViewModel.java b/src/main/java/org/jabref/gui/preferences/BibtexKeyPatternTabViewModel.java
index 515bcb256aa..6832a029ee4 100644
--- a/src/main/java/org/jabref/gui/preferences/BibtexKeyPatternTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/BibtexKeyPatternTabViewModel.java
@@ -16,46 +16,51 @@
 import org.jabref.gui.DialogService;
 import org.jabref.gui.commonfxcontrols.BibtexKeyPatternPanelItemModel;
 import org.jabref.gui.commonfxcontrols.BibtexKeyPatternPanelViewModel;
+import org.jabref.logic.bibtexkeypattern.BibtexKeyPatternPreferences;
 import org.jabref.model.bibtexkeypattern.GlobalBibtexKeyPattern;
-import org.jabref.preferences.JabRefPreferences;
+import org.jabref.preferences.PreferencesService;
 
 public class BibtexKeyPatternTabViewModel implements PreferenceTabViewModel {
 
-    private BooleanProperty overwriteAllowProperty = new SimpleBooleanProperty();
-    private BooleanProperty overwriteWarningProperty = new SimpleBooleanProperty();
-    private BooleanProperty generateOnSaveProperty = new SimpleBooleanProperty();
-    private BooleanProperty letterStartAProperty = new SimpleBooleanProperty();
-    private BooleanProperty letterStartBProperty = new SimpleBooleanProperty();
-    private BooleanProperty letterAlwaysAddProperty = new SimpleBooleanProperty();
-    private StringProperty keyPatternRegexProperty = new SimpleStringProperty();
-    private StringProperty keyPatternReplacementProperty = new SimpleStringProperty();
-    private StringProperty unwantedCharactersProperty = new SimpleStringProperty();
+    private final BooleanProperty overwriteAllowProperty = new SimpleBooleanProperty();
+    private final BooleanProperty overwriteWarningProperty = new SimpleBooleanProperty();
+    private final BooleanProperty generateOnSaveProperty = new SimpleBooleanProperty();
+    private final BooleanProperty letterStartAProperty = new SimpleBooleanProperty();
+    private final BooleanProperty letterStartBProperty = new SimpleBooleanProperty();
+    private final BooleanProperty letterAlwaysAddProperty = new SimpleBooleanProperty();
+    private final StringProperty keyPatternRegexProperty = new SimpleStringProperty();
+    private final StringProperty keyPatternReplacementProperty = new SimpleStringProperty();
+    private final StringProperty unwantedCharactersProperty = new SimpleStringProperty();
 
     // The list and the default properties are being overwritten by the bound properties of the tableView, but to
     // prevent an NPE on storing the preferences before lazy-loading of the setValues, they need to be initialized.
-    private ListProperty<BibtexKeyPatternPanelItemModel> patternListProperty = new SimpleListProperty<>(FXCollections.observableArrayList());
-    private ObjectProperty<BibtexKeyPatternPanelItemModel> defaultKeyPatternProperty = new SimpleObjectProperty<>(
+    private final ListProperty<BibtexKeyPatternPanelItemModel> patternListProperty = new SimpleListProperty<>(FXCollections.observableArrayList());
+    private final ObjectProperty<BibtexKeyPatternPanelItemModel> defaultKeyPatternProperty = new SimpleObjectProperty<>(
             new BibtexKeyPatternPanelItemModel(new BibtexKeyPatternPanelViewModel.DefaultEntryType(), ""));
 
     private final DialogService dialogService;
-    private final JabRefPreferences preferences;
+    private final PreferencesService preferences;
+    private final BibtexKeyPatternPreferences initialBibtexKeyPatternPreferences;
 
-    public BibtexKeyPatternTabViewModel(DialogService dialogService, JabRefPreferences preferences) {
+    public BibtexKeyPatternTabViewModel(DialogService dialogService, PreferencesService preferences) {
         this.dialogService = dialogService;
         this.preferences = preferences;
+        this.initialBibtexKeyPatternPreferences = preferences.getBibtexKeyPatternPreferences();
     }
 
     @Override
     public void setValues() {
-        overwriteAllowProperty.setValue(!preferences.getBoolean(JabRefPreferences.AVOID_OVERWRITING_KEY));
-        overwriteWarningProperty.setValue(preferences.getBoolean(JabRefPreferences.WARN_BEFORE_OVERWRITING_KEY));
-        generateOnSaveProperty.setValue(preferences.getBoolean(JabRefPreferences.GENERATE_KEYS_BEFORE_SAVING));
+        overwriteAllowProperty.setValue(!initialBibtexKeyPatternPreferences.shouldAvoidOverwriteCiteKey());
+        overwriteWarningProperty.setValue(initialBibtexKeyPatternPreferences.shouldWarnBeforeOverwriteCiteKey());
+        generateOnSaveProperty.setValue(initialBibtexKeyPatternPreferences.shouldGenerateCiteKeysBeforeSaving());
 
-        if (preferences.getBoolean(JabRefPreferences.KEY_GEN_ALWAYS_ADD_LETTER)) {
+        if (initialBibtexKeyPatternPreferences.getKeySuffix()
+                == BibtexKeyPatternPreferences.KeySuffix.ALWAYS) {
             letterAlwaysAddProperty.setValue(true);
             letterStartAProperty.setValue(false);
             letterStartBProperty.setValue(false);
-        } else if (preferences.getBoolean(JabRefPreferences.KEY_GEN_FIRST_LETTER_A)) {
+        } else if (initialBibtexKeyPatternPreferences.getKeySuffix()
+                == BibtexKeyPatternPreferences.KeySuffix.SECOND_WITH_A) {
             letterAlwaysAddProperty.setValue(false);
             letterStartAProperty.setValue(true);
             letterStartBProperty.setValue(false);
@@ -65,38 +70,15 @@ public void setValues() {
             letterStartBProperty.setValue(true);
         }
 
-        keyPatternRegexProperty.setValue(preferences.get(JabRefPreferences.KEY_PATTERN_REGEX));
-        keyPatternReplacementProperty.setValue(preferences.get(JabRefPreferences.KEY_PATTERN_REPLACEMENT));
-        unwantedCharactersProperty.setValue(preferences.get(JabRefPreferences.UNWANTED_BIBTEX_KEY_CHARACTERS));
+        keyPatternRegexProperty.setValue(initialBibtexKeyPatternPreferences.getKeyPatternRegex());
+        keyPatternReplacementProperty.setValue(initialBibtexKeyPatternPreferences.getKeyPatternReplacement());
+        unwantedCharactersProperty.setValue(initialBibtexKeyPatternPreferences.getUnwantedCharacters());
     }
 
     @Override
     public void storeSettings() {
-        preferences.put(JabRefPreferences.DEFAULT_BIBTEX_KEY_PATTERN, defaultKeyPatternProperty.getValue().getPattern());
-        preferences.putBoolean(JabRefPreferences.AVOID_OVERWRITING_KEY, !overwriteAllowProperty.getValue());
-        preferences.putBoolean(JabRefPreferences.WARN_BEFORE_OVERWRITING_KEY, overwriteWarningProperty.getValue());
-        preferences.putBoolean(JabRefPreferences.GENERATE_KEYS_BEFORE_SAVING, generateOnSaveProperty.getValue());
-
-        if (letterAlwaysAddProperty.getValue()) {
-            preferences.putBoolean(JabRefPreferences.KEY_GEN_ALWAYS_ADD_LETTER, true);
-            preferences.putBoolean(JabRefPreferences.KEY_GEN_FIRST_LETTER_A, false);
-        } else if (letterStartAProperty.getValue()) {
-            preferences.putBoolean(JabRefPreferences.KEY_GEN_ALWAYS_ADD_LETTER, false);
-            preferences.putBoolean(JabRefPreferences.KEY_GEN_FIRST_LETTER_A, true);
-        } else if (letterStartBProperty.getValue()) {
-            preferences.putBoolean(JabRefPreferences.KEY_GEN_ALWAYS_ADD_LETTER, false);
-            preferences.putBoolean(JabRefPreferences.KEY_GEN_FIRST_LETTER_A, false);
-        } else {
-            // No Radioitem selected, should not happen, but if, make KEY_GEN_FIRST_LETTER_A default
-            preferences.putBoolean(JabRefPreferences.KEY_GEN_ALWAYS_ADD_LETTER, false);
-            preferences.putBoolean(JabRefPreferences.KEY_GEN_FIRST_LETTER_A, true);
-        }
-
-        preferences.put(JabRefPreferences.KEY_PATTERN_REGEX, keyPatternRegexProperty.getValue());
-        preferences.put(JabRefPreferences.KEY_PATTERN_REPLACEMENT, keyPatternReplacementProperty.getValue());
-        preferences.put(JabRefPreferences.UNWANTED_BIBTEX_KEY_CHARACTERS, unwantedCharactersProperty.getValue());
-
-        GlobalBibtexKeyPattern newKeyPattern = GlobalBibtexKeyPattern.fromPattern(preferences.get(JabRefPreferences.DEFAULT_BIBTEX_KEY_PATTERN));
+        GlobalBibtexKeyPattern newKeyPattern =
+                new GlobalBibtexKeyPattern(initialBibtexKeyPatternPreferences.getKeyPattern().getDefaultValue());
         patternListProperty.forEach(item -> {
             String patternString = item.getPattern();
             if (!item.getEntryType().getName().equals("default")) {
@@ -111,7 +93,25 @@ public void storeSettings() {
             // at the end of the pattern
             newKeyPattern.setDefaultValue(defaultKeyPatternProperty.getValue().getPattern());
         }
-        preferences.putKeyPattern(newKeyPattern);
+
+        BibtexKeyPatternPreferences.KeySuffix keySuffix = BibtexKeyPatternPreferences.KeySuffix.ALWAYS;
+
+        if (letterStartAProperty.getValue()) {
+            keySuffix = BibtexKeyPatternPreferences.KeySuffix.SECOND_WITH_A;
+        } else if (letterStartBProperty.getValue()) {
+            keySuffix = BibtexKeyPatternPreferences.KeySuffix.SECOND_WITH_B;
+        }
+
+        preferences.storeBibtexKeyPatternPreferences(new BibtexKeyPatternPreferences(
+                !overwriteAllowProperty.getValue(),
+                overwriteWarningProperty.getValue(),
+                generateOnSaveProperty.getValue(),
+                keySuffix,
+                keyPatternRegexProperty.getValue(),
+                keyPatternReplacementProperty.getValue(),
+                unwantedCharactersProperty.getValue(),
+                newKeyPattern,
+                initialBibtexKeyPatternPreferences.getKeywordDelimiter()));
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/preferences/AdvancedTab.fxml b/src/main/java/org/jabref/gui/preferences/NetworkTab.fxml
similarity index 86%
rename from src/main/java/org/jabref/gui/preferences/AdvancedTab.fxml
rename to src/main/java/org/jabref/gui/preferences/NetworkTab.fxml
index 57bf6241d0c..77c3f00a629 100644
--- a/src/main/java/org/jabref/gui/preferences/AdvancedTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/NetworkTab.fxml
@@ -12,8 +12,8 @@
 <?import org.controlsfx.control.textfield.CustomPasswordField?>
 <fx:root prefWidth="650.0" spacing="10.0" type="VBox"
          xmlns="http://javafx.com/javafx/8.0.212" xmlns:fx="http://javafx.com/fxml/1"
-         fx:controller="org.jabref.gui.preferences.AdvancedTabView">
-    <Label styleClass="titleHeader" text="%Advanced"/>
+         fx:controller="org.jabref.gui.preferences.NetworkTabView">
+    <Label styleClass="titleHeader" text="%Network"/>
     <Label styleClass="sectionHeader" text="%Remote operation"/>
     <Label fx:id="remoteLabel"
            text="%This feature lets new files be opened or imported into an already running instance of JabRef instead of opening a new instance. For instance, this is useful when you open a file in JabRef from your web browser. Note that this will prevent you from running more than one instance of JabRef at a time."
@@ -24,12 +24,7 @@
         <Button fx:id="remoteHelp" prefWidth="20.0"/>
     </HBox>
 
-    <Label styleClass="sectionHeader" text="%Import conversions"/>
-    <CheckBox fx:id="useCaseKeeper" text="%Add {} to specified title words on search to keep the correct case"/>
-    <CheckBox fx:id="useUnitFormatter"
-              text="%Format units by adding non-breaking separators and keeping the correct case on search"/>
-
-    <Label styleClass="sectionHeader" text="%Network"/>
+    <Label styleClass="sectionHeader" text="%Proxy configuration"/>
     <GridPane maxHeight="-Infinity" maxWidth="-Infinity" hgap="10.0" vgap="10.0">
         <columnConstraints>
             <ColumnConstraints hgrow="SOMETIMES"/>
diff --git a/src/main/java/org/jabref/gui/preferences/AdvancedTabView.java b/src/main/java/org/jabref/gui/preferences/NetworkTabView.java
similarity index 90%
rename from src/main/java/org/jabref/gui/preferences/AdvancedTabView.java
rename to src/main/java/org/jabref/gui/preferences/NetworkTabView.java
index 432bd7442fd..245d5f3ed5b 100644
--- a/src/main/java/org/jabref/gui/preferences/AdvancedTabView.java
+++ b/src/main/java/org/jabref/gui/preferences/NetworkTabView.java
@@ -23,13 +23,11 @@
 import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
 import org.controlsfx.control.textfield.CustomPasswordField;
 
-public class AdvancedTabView extends AbstractPreferenceTabView<AdvancedTabViewModel> implements PreferencesTab {
+public class NetworkTabView extends AbstractPreferenceTabView<NetworkTabViewModel> implements PreferencesTab {
     @FXML private Label remoteLabel;
     @FXML private CheckBox remoteServer;
     @FXML private TextField remotePort;
     @FXML private Button remoteHelp;
-    @FXML private CheckBox useCaseKeeper;
-    @FXML private CheckBox useUnitFormatter;
 
     @FXML private CheckBox proxyUse;
     @FXML private Label proxyHostnameLabel;
@@ -48,7 +46,7 @@ public class AdvancedTabView extends AbstractPreferenceTabView<AdvancedTabViewMo
 
     private final ControlsFxVisualizer validationVisualizer = new ControlsFxVisualizer();
 
-    public AdvancedTabView(JabRefPreferences preferences) {
+    public NetworkTabView(JabRefPreferences preferences) {
         this.preferences = preferences;
 
         ViewLoader.view(this)
@@ -58,20 +56,17 @@ public AdvancedTabView(JabRefPreferences preferences) {
 
     @Override
     public String getTabName() {
-        return Localization.lang("Advanced");
+        return Localization.lang("Network");
     }
 
     public void initialize() {
-        this.viewModel = new AdvancedTabViewModel(dialogService, preferences);
+        this.viewModel = new NetworkTabViewModel(dialogService, preferences);
 
         remoteLabel.setVisible(preferences.getBoolean(JabRefPreferences.SHOW_ADVANCED_HINTS));
         remoteServer.selectedProperty().bindBidirectional(viewModel.remoteServerProperty());
         remotePort.textProperty().bindBidirectional(viewModel.remotePortProperty());
         remotePort.disableProperty().bind(remoteServer.selectedProperty().not());
 
-        useCaseKeeper.selectedProperty().bindBidirectional(viewModel.useCaseKeeperProperty());
-        useUnitFormatter.selectedProperty().bindBidirectional(viewModel.useUnitFormatterProperty());
-
         proxyUse.selectedProperty().bindBidirectional(viewModel.proxyUseProperty());
         proxyHostnameLabel.disableProperty().bind(proxyUse.selectedProperty().not());
         proxyHostname.textProperty().bindBidirectional(viewModel.proxyHostnameProperty());
diff --git a/src/main/java/org/jabref/gui/preferences/AdvancedTabViewModel.java b/src/main/java/org/jabref/gui/preferences/NetworkTabViewModel.java
similarity index 86%
rename from src/main/java/org/jabref/gui/preferences/AdvancedTabViewModel.java
rename to src/main/java/org/jabref/gui/preferences/NetworkTabViewModel.java
index c9e69686a65..80f7d71b5cf 100644
--- a/src/main/java/org/jabref/gui/preferences/AdvancedTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/NetworkTabViewModel.java
@@ -18,7 +18,7 @@
 import org.jabref.logic.remote.RemotePreferences;
 import org.jabref.logic.remote.RemoteUtil;
 import org.jabref.model.strings.StringUtil;
-import org.jabref.preferences.JabRefPreferences;
+import org.jabref.preferences.PreferencesService;
 
 import de.saxsys.mvvmfx.utils.validation.CompositeValidator;
 import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator;
@@ -26,11 +26,9 @@
 import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
 import de.saxsys.mvvmfx.utils.validation.Validator;
 
-public class AdvancedTabViewModel implements PreferenceTabViewModel {
+public class NetworkTabViewModel implements PreferenceTabViewModel {
     private final BooleanProperty remoteServerProperty = new SimpleBooleanProperty();
     private final StringProperty remotePortProperty = new SimpleStringProperty("");
-    private final BooleanProperty useCaseKeeperProperty = new SimpleBooleanProperty();
-    private final BooleanProperty useUnitFormatterProperty = new SimpleBooleanProperty();
     private final BooleanProperty proxyUseProperty = new SimpleBooleanProperty();
     private final StringProperty proxyHostnameProperty = new SimpleStringProperty("");
     private final StringProperty proxyPortProperty = new SimpleStringProperty("");
@@ -45,13 +43,13 @@ public class AdvancedTabViewModel implements PreferenceTabViewModel {
     private final Validator proxyPasswordValidator;
 
     private final DialogService dialogService;
-    private final JabRefPreferences preferences;
+    private final PreferencesService preferences;
     private final RemotePreferences remotePreferences;
     private final ProxyPreferences proxyPreferences;
 
     private final List<String> restartWarning = new ArrayList<>();
 
-    public AdvancedTabViewModel(DialogService dialogService, JabRefPreferences preferences) {
+    public NetworkTabViewModel(DialogService dialogService, PreferencesService preferences) {
         this.dialogService = dialogService;
         this.preferences = preferences;
         this.remotePreferences = preferences.getRemotePreferences();
@@ -68,7 +66,7 @@ public AdvancedTabViewModel(DialogService dialogService, JabRefPreferences prefe
                     }
                 },
                 ValidationMessage.error(String.format("%s > %s %n %n %s",
-                        Localization.lang("Advanced"),
+                        Localization.lang("Network"),
                         Localization.lang("Remote operation"),
                         Localization.lang("You must enter an integer value in the interval 1025-65535"))));
 
@@ -76,32 +74,32 @@ public AdvancedTabViewModel(DialogService dialogService, JabRefPreferences prefe
                 proxyHostnameProperty,
                 input -> !StringUtil.isNullOrEmpty(input),
                 ValidationMessage.error(String.format("%s > %s %n %n %s",
-                        Localization.lang("Advanced"),
                         Localization.lang("Network"),
+                        Localization.lang("Proxy configuration"),
                         Localization.lang("Please specify a hostname"))));
 
         proxyPortValidator = new FunctionBasedValidator<>(
                 proxyPortProperty,
                 input -> getPortAsInt(input).isPresent(),
                 ValidationMessage.error(String.format("%s > %s %n %n %s",
-                        Localization.lang("Advanced"),
                         Localization.lang("Network"),
+                        Localization.lang("Proxy configuration"),
                         Localization.lang("Please specify a port"))));
 
         proxyUsernameValidator = new FunctionBasedValidator<>(
                 proxyUsernameProperty,
                 input -> !StringUtil.isNullOrEmpty(input),
                 ValidationMessage.error(String.format("%s > %s %n %n %s",
-                        Localization.lang("Advanced"),
                         Localization.lang("Network"),
+                        Localization.lang("Proxy configuration"),
                         Localization.lang("Please specify a username"))));
 
         proxyPasswordValidator = new FunctionBasedValidator<>(
                 proxyPasswordProperty,
                 input -> input.length() > 0,
                 ValidationMessage.error(String.format("%s > %s %n %n %s",
-                        Localization.lang("Advanced"),
                         Localization.lang("Network"),
+                        Localization.lang("Proxy configuration"),
                         Localization.lang("Please specify a password"))));
     }
 
@@ -109,9 +107,6 @@ public void setValues() {
         remoteServerProperty.setValue(remotePreferences.useRemoteServer());
         remotePortProperty.setValue(String.valueOf(remotePreferences.getPort()));
 
-        useCaseKeeperProperty.setValue(preferences.getBoolean(JabRefPreferences.USE_CASE_KEEPER_ON_SEARCH));
-        useUnitFormatterProperty.setValue(preferences.getBoolean(JabRefPreferences.USE_UNIT_FORMATTER_ON_SEARCH));
-
         proxyUseProperty.setValue(proxyPreferences.isUseProxy());
         proxyHostnameProperty.setValue(proxyPreferences.getHostname());
         proxyPortProperty.setValue(proxyPreferences.getPort());
@@ -122,10 +117,6 @@ public void setValues() {
 
     public void storeSettings() {
         storeRemoteSettings();
-
-        preferences.putBoolean(JabRefPreferences.USE_CASE_KEEPER_ON_SEARCH, useCaseKeeperProperty.getValue());
-        preferences.putBoolean(JabRefPreferences.USE_UNIT_FORMATTER_ON_SEARCH, useUnitFormatterProperty.getValue());
-
         storeProxySettings();
     }
 
@@ -151,7 +142,7 @@ private void storeRemoteSettings() {
             Globals.REMOTE_LISTENER.stop();
         }
 
-        preferences.setRemotePreferences(newRemotePreferences);
+        preferences.storeRemotePreferences(newRemotePreferences);
     }
 
     private void storeProxySettings() {
@@ -237,14 +228,6 @@ public StringProperty remotePortProperty() {
         return remotePortProperty;
     }
 
-    public BooleanProperty useCaseKeeperProperty() {
-        return useCaseKeeperProperty;
-    }
-
-    public BooleanProperty useUnitFormatterProperty() {
-        return useUnitFormatterProperty;
-    }
-
     public BooleanProperty proxyUseProperty() {
         return proxyUseProperty;
     }
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java b/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java
index 509437938a8..c2d4d2fa30c 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java
@@ -55,7 +55,7 @@ public PreferencesDialogViewModel(DialogService dialogService, JabRefFrame frame
                 new ExportSortingTabView(preferences),
                 new NameFormatterTabView(preferences),
                 new XmpPrivacyTabView(preferences),
-                new AdvancedTabView(preferences),
+                new NetworkTabView(preferences),
                 new AppearanceTabView(preferences)
         );
     }
@@ -141,6 +141,7 @@ private void updateAfterPreferenceChanges() {
         XmpPreferences xmpPreferences = preferences.getXMPPreferences();
         Globals.exportFactory = ExporterFactory.create(customExporters, layoutPreferences, savePreferences, xmpPreferences);
         preferences.updateEntryEditorTabList();
+        preferences.updateGlobalBibtexKeyPattern();
     }
 
     /**
diff --git a/src/main/java/org/jabref/gui/preferences/PreviewTabViewModel.java b/src/main/java/org/jabref/gui/preferences/PreviewTabViewModel.java
index c168f8ef2ac..cff7c8c32b4 100644
--- a/src/main/java/org/jabref/gui/preferences/PreviewTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/PreviewTabViewModel.java
@@ -61,12 +61,15 @@ public class PreviewTabViewModel implements PreferenceTabViewModel {
     private final BooleanProperty selectedIsEditableProperty = new SimpleBooleanProperty(false);
     private final ObjectProperty<PreviewLayout> layoutProperty = new SimpleObjectProperty<>();
     private final StringProperty sourceTextProperty = new SimpleStringProperty("");
+
     private final DialogService dialogService;
     private final JabRefPreferences preferences;
     private final PreviewPreferences previewPreferences;
     private final TaskExecutor taskExecutor;
+
+    private final Validator chosenListValidator;
+
     private final CustomLocalDragboard localDragboard;
-    private Validator chosenListValidator;
     private ListProperty<PreviewLayout> dragSourceList = null;
     private ObjectProperty<MultipleSelectionModel<PreviewLayout>> dragSourceSelectionModel = null;
 
diff --git a/src/main/java/org/jabref/gui/shared/SharedDatabaseUIManager.java b/src/main/java/org/jabref/gui/shared/SharedDatabaseUIManager.java
index 469f33afd0c..eaed38b2ba4 100644
--- a/src/main/java/org/jabref/gui/shared/SharedDatabaseUIManager.java
+++ b/src/main/java/org/jabref/gui/shared/SharedDatabaseUIManager.java
@@ -141,7 +141,7 @@ public BasePanel openNewSharedDatabaseTab(DBMSConnectionProperties dbmsConnectio
 
         BibDatabaseContext bibDatabaseContext = new BibDatabaseContext();
         bibDatabaseContext.setMode(Globals.prefs.getDefaultBibDatabaseMode());
-        DBMSSynchronizer synchronizer = new DBMSSynchronizer(bibDatabaseContext, Globals.prefs.getKeywordDelimiter(), Globals.prefs.getKeyPattern(), Globals.getFileUpdateMonitor());
+        DBMSSynchronizer synchronizer = new DBMSSynchronizer(bibDatabaseContext, Globals.prefs.getKeywordDelimiter(), Globals.prefs.getGlobalBibtexKeyPattern(), Globals.getFileUpdateMonitor());
         bibDatabaseContext.convertToSharedDatabase(synchronizer);
 
         dbmsSynchronizer = bibDatabaseContext.getDBMSSynchronizer();
@@ -157,7 +157,7 @@ public void openSharedDatabaseFromParserResult(ParserResult parserResult)
 
         Optional<String> sharedDatabaseIDOptional = parserResult.getDatabase().getSharedDatabaseID();
 
-        if (!sharedDatabaseIDOptional.isPresent()) {
+        if (sharedDatabaseIDOptional.isEmpty()) {
             throw new NotASharedDatabaseException();
         }
 
@@ -166,7 +166,7 @@ public void openSharedDatabaseFromParserResult(ParserResult parserResult)
 
         BibDatabaseContext bibDatabaseContext = new BibDatabaseContext();
         bibDatabaseContext.setMode(Globals.prefs.getDefaultBibDatabaseMode());
-        DBMSSynchronizer synchronizer = new DBMSSynchronizer(bibDatabaseContext, Globals.prefs.getKeywordDelimiter(), Globals.prefs.getKeyPattern(), Globals.getFileUpdateMonitor());
+        DBMSSynchronizer synchronizer = new DBMSSynchronizer(bibDatabaseContext, Globals.prefs.getKeywordDelimiter(), Globals.prefs.getGlobalBibtexKeyPattern(), Globals.getFileUpdateMonitor());
         bibDatabaseContext.convertToSharedDatabase(synchronizer);
 
         bibDatabaseContext.getDatabase().setSharedDatabaseID(sharedDatabaseID);
diff --git a/src/main/java/org/jabref/logic/bibtex/comparator/MetaDataDiff.java b/src/main/java/org/jabref/logic/bibtex/comparator/MetaDataDiff.java
index 1f637c46189..37778ecf137 100644
--- a/src/main/java/org/jabref/logic/bibtex/comparator/MetaDataDiff.java
+++ b/src/main/java/org/jabref/logic/bibtex/comparator/MetaDataDiff.java
@@ -47,7 +47,7 @@ public List<String> getDifferences(JabRefPreferences preferences) {
         if (!Objects.equals(originalMetaData.getSaveOrderConfig(), newMetaData.getSaveOrderConfig())) {
             changes.add(Localization.lang("Save sort order"));
         }
-        if (!Objects.equals(originalMetaData.getCiteKeyPattern(preferences.getKeyPattern()), newMetaData.getCiteKeyPattern(preferences.getKeyPattern()))) {
+        if (!Objects.equals(originalMetaData.getCiteKeyPattern(preferences.getGlobalBibtexKeyPattern()), newMetaData.getCiteKeyPattern(preferences.getGlobalBibtexKeyPattern()))) {
             changes.add(Localization.lang("Key patterns"));
         }
         if (!Objects.equals(originalMetaData.getUserFileDirectories(), newMetaData.getUserFileDirectories())) {
diff --git a/src/main/java/org/jabref/logic/bibtexkeypattern/BibtexKeyGenerator.java b/src/main/java/org/jabref/logic/bibtexkeypattern/BibtexKeyGenerator.java
index 39ad6e96f87..302414dbc51 100644
--- a/src/main/java/org/jabref/logic/bibtexkeypattern/BibtexKeyGenerator.java
+++ b/src/main/java/org/jabref/logic/bibtexkeypattern/BibtexKeyGenerator.java
@@ -56,8 +56,18 @@ static String generateKey(BibEntry entry, String pattern) {
     static String generateKey(BibEntry entry, String pattern, BibDatabase database) {
         GlobalBibtexKeyPattern keyPattern = new GlobalBibtexKeyPattern(Collections.emptyList());
         keyPattern.setDefaultValue("[" + pattern + "]");
-        return new BibtexKeyGenerator(keyPattern, database, new BibtexKeyPatternPreferences("", "", false, true, keyPattern, ',', false, DEFAULT_UNWANTED_CHARACTERS))
-                .generateKey(entry);
+        BibtexKeyPatternPreferences patternPreferences = new BibtexKeyPatternPreferences(
+                false,
+                false,
+                false,
+                BibtexKeyPatternPreferences.KeySuffix.SECOND_WITH_A,
+                "",
+                "",
+                DEFAULT_UNWANTED_CHARACTERS,
+                keyPattern,
+                ',');
+
+        return new BibtexKeyGenerator(keyPattern, database, patternPreferences).generateKey(entry);
     }
 
     /**
@@ -148,8 +158,11 @@ public String generateKey(BibEntry entry) {
             occurrences--; // No change, so we can accept one dupe.
         }
 
-        boolean alwaysAddLetter = bibtexKeyPatternPreferences.isAlwaysAddLetter();
-        boolean firstLetterA = bibtexKeyPatternPreferences.isFirstLetterA();
+        boolean alwaysAddLetter = bibtexKeyPatternPreferences.getKeySuffix()
+                == BibtexKeyPatternPreferences.KeySuffix.ALWAYS;
+
+        boolean firstLetterA = bibtexKeyPatternPreferences.getKeySuffix()
+                == BibtexKeyPatternPreferences.KeySuffix.SECOND_WITH_A;
 
         String newKey;
         if (!alwaysAddLetter && (occurrences == 0)) {
diff --git a/src/main/java/org/jabref/logic/bibtexkeypattern/BibtexKeyPatternPreferences.java b/src/main/java/org/jabref/logic/bibtexkeypattern/BibtexKeyPatternPreferences.java
index d5681c08216..920510c975d 100644
--- a/src/main/java/org/jabref/logic/bibtexkeypattern/BibtexKeyPatternPreferences.java
+++ b/src/main/java/org/jabref/logic/bibtexkeypattern/BibtexKeyPatternPreferences.java
@@ -4,48 +4,65 @@
 
 public class BibtexKeyPatternPreferences {
 
+    public enum KeySuffix {
+        ALWAYS,         // CiteKeyA, CiteKeyB, CiteKeyC ...
+        SECOND_WITH_A,  // CiteKey, CiteKeyA, CiteKeyB ...
+        SECOND_WITH_B   // CiteKey, CiteKeyB, CiteKeyC ...
+    }
+
+    private final boolean shouldAvoidOverwriteCiteKey;
+    private final boolean shouldWarnBeforeOverwriteCiteKey;
+    private final boolean shouldGenerateCiteKeysBeforeSaving;
+    private final KeySuffix keySuffix;
     private final String keyPatternRegex;
     private final String keyPatternReplacement;
-    private final boolean alwaysAddLetter;
-    private final boolean firstLetterA;
+    private final String unwantedCharacters;
     private final GlobalBibtexKeyPattern keyPattern;
-    private Character keywordDelimiter;
-    private boolean avoidOverwritingCiteKey;
-    private String unwantedCharacters;
+    private final Character keywordDelimiter;
 
-    public BibtexKeyPatternPreferences(String keyPatternRegex,
+    public BibtexKeyPatternPreferences(boolean shouldAvoidOverwriteCiteKey,
+                                       boolean shouldWarnBeforeOverwriteCiteKey,
+                                       boolean shouldGenerateCiteKeysBeforeSaving,
+                                       KeySuffix keySuffix,
+                                       String keyPatternRegex,
                                        String keyPatternReplacement,
-                                       boolean alwaysAddLetter,
-                                       boolean firstLetterA,
+                                       String unwantedCharacters,
                                        GlobalBibtexKeyPattern keyPattern,
-                                       Character keywordDelimiter,
-                                       boolean avoidOverwritingCiteKey,
-                                       String unwantedCharacters) {
+                                       Character keywordDelimiter) {
 
+        this.shouldAvoidOverwriteCiteKey = shouldAvoidOverwriteCiteKey;
+        this.shouldWarnBeforeOverwriteCiteKey = shouldWarnBeforeOverwriteCiteKey;
+        this.shouldGenerateCiteKeysBeforeSaving = shouldGenerateCiteKeysBeforeSaving;
+        this.keySuffix = keySuffix;
         this.keyPatternRegex = keyPatternRegex;
         this.keyPatternReplacement = keyPatternReplacement;
-        this.alwaysAddLetter = alwaysAddLetter;
-        this.firstLetterA = firstLetterA;
+        this.unwantedCharacters = unwantedCharacters;
         this.keyPattern = keyPattern;
         this.keywordDelimiter = keywordDelimiter;
-        this.avoidOverwritingCiteKey = avoidOverwritingCiteKey;
-        this.unwantedCharacters = unwantedCharacters;
     }
 
-    public String getKeyPatternRegex() {
-        return keyPatternRegex;
+    public boolean shouldAvoidOverwriteCiteKey() {
+        return shouldAvoidOverwriteCiteKey;
     }
 
-    public String getKeyPatternReplacement() {
-        return keyPatternReplacement;
+    public boolean shouldWarnBeforeOverwriteCiteKey() {
+        return shouldWarnBeforeOverwriteCiteKey;
+    }
+
+    public boolean shouldGenerateCiteKeysBeforeSaving() {
+        return shouldGenerateCiteKeysBeforeSaving;
     }
 
-    public boolean isAlwaysAddLetter() {
-        return alwaysAddLetter;
+    public KeySuffix getKeySuffix() {
+        return keySuffix;
     }
 
-    public boolean isFirstLetterA() {
-        return firstLetterA;
+    public String getKeyPatternRegex() {
+        return keyPatternRegex;
+    }
+
+    public String getKeyPatternReplacement() {
+        return keyPatternReplacement;
     }
 
     public String getUnwantedCharacters() {
@@ -59,8 +76,4 @@ public GlobalBibtexKeyPattern getKeyPattern() {
     public Character getKeywordDelimiter() {
         return keywordDelimiter;
     }
-
-    public boolean avoidOverwritingCiteKey() {
-        return avoidOverwritingCiteKey;
-    }
 }
diff --git a/src/main/java/org/jabref/logic/exporter/BibDatabaseWriter.java b/src/main/java/org/jabref/logic/exporter/BibDatabaseWriter.java
index 4492d052095..7918947c6d0 100644
--- a/src/main/java/org/jabref/logic/exporter/BibDatabaseWriter.java
+++ b/src/main/java/org/jabref/logic/exporter/BibDatabaseWriter.java
@@ -94,7 +94,7 @@ private static List<Comparator<BibEntry>> getSaveComparators(MetaData metaData,
         // ones. This is a necessary requirement for BibTeX to be able to resolve referenced entries correctly.
         comparators.add(new CrossRefEntryComparator());
 
-        if (!saveOrder.isPresent()) {
+        if (saveOrder.isEmpty()) {
             // entries will be sorted based on their internal IDs
             comparators.add(new IdComparator());
         } else {
@@ -189,7 +189,7 @@ public void savePartOfDatabase(BibDatabaseContext bibDatabaseContext, List<BibEn
         List<BibEntry> sortedEntries = getSortedEntries(bibDatabaseContext, entries, preferences);
         List<FieldChange> saveActionChanges = applySaveActions(sortedEntries, bibDatabaseContext.getMetaData());
         saveActionsFieldChanges.addAll(saveActionChanges);
-        if (preferences.generateBibtexKeysBeforeSaving()) {
+        if (preferences.getBibtexKeyPatternPreferences().shouldGenerateCiteKeysBeforeSaving()) {
             List<FieldChange> keyChanges = generateBibtexKeys(bibDatabaseContext, sortedEntries);
             saveActionsFieldChanges.addAll(keyChanges);
         }
@@ -209,7 +209,7 @@ public void savePartOfDatabase(BibDatabaseContext bibDatabaseContext, List<BibEn
 
         if (preferences.getSaveType() != SavePreferences.DatabaseSaveType.PLAIN_BIBTEX) {
             // Write meta data.
-            writeMetaData(bibDatabaseContext.getMetaData(), preferences.getGlobalCiteKeyPattern());
+            writeMetaData(bibDatabaseContext.getMetaData(), preferences.getBibtexKeyPatternPreferences().getKeyPattern());
 
             // Write type definitions, if any:
             writeEntryTypeDefinitions(typesToWrite);
diff --git a/src/main/java/org/jabref/logic/exporter/SavePreferences.java b/src/main/java/org/jabref/logic/exporter/SavePreferences.java
index fa9fd438ad4..4cd58a85058 100644
--- a/src/main/java/org/jabref/logic/exporter/SavePreferences.java
+++ b/src/main/java/org/jabref/logic/exporter/SavePreferences.java
@@ -4,7 +4,6 @@
 
 import org.jabref.logic.bibtex.FieldWriterPreferences;
 import org.jabref.logic.bibtexkeypattern.BibtexKeyPatternPreferences;
-import org.jabref.model.bibtexkeypattern.GlobalBibtexKeyPattern;
 import org.jabref.model.metadata.SaveOrderConfig;
 
 public class SavePreferences {
@@ -20,14 +19,18 @@ public class SavePreferences {
     private final DatabaseSaveType saveType;
     private final boolean takeMetadataSaveOrderInAccount;
     private final FieldWriterPreferences fieldWriterPreferences;
-    private final GlobalBibtexKeyPattern globalCiteKeyPattern;
-    private final Boolean generateBibtexKeysBeforeSaving;
     private final BibtexKeyPatternPreferences bibtexKeyPatternPreferences;
 
-    private SavePreferences(Boolean saveInOriginalOrder, SaveOrderConfig saveOrder, Charset encoding, Boolean makeBackup,
-                            DatabaseSaveType saveType, Boolean takeMetadataSaveOrderInAccount, Boolean reformatFile,
-                            FieldWriterPreferences fieldWriterPreferences, GlobalBibtexKeyPattern globalCiteKeyPattern,
-                            Boolean generateBibtexKeysBeforeSaving, BibtexKeyPatternPreferences bibtexKeyPatternPreferences) {
+    private SavePreferences(Boolean saveInOriginalOrder,
+                            SaveOrderConfig saveOrder,
+                            Charset encoding,
+                            Boolean makeBackup,
+                            DatabaseSaveType saveType,
+                            Boolean takeMetadataSaveOrderInAccount,
+                            Boolean reformatFile,
+                            FieldWriterPreferences fieldWriterPreferences,
+                            BibtexKeyPatternPreferences bibtexKeyPatternPreferences) {
+
         this.saveInOriginalOrder = saveInOriginalOrder;
         this.saveOrder = saveOrder;
         this.encoding = encoding;
@@ -36,16 +39,27 @@ private SavePreferences(Boolean saveInOriginalOrder, SaveOrderConfig saveOrder,
         this.takeMetadataSaveOrderInAccount = takeMetadataSaveOrderInAccount;
         this.reformatFile = reformatFile;
         this.fieldWriterPreferences = fieldWriterPreferences;
-        this.globalCiteKeyPattern = globalCiteKeyPattern;
-        this.generateBibtexKeysBeforeSaving = generateBibtexKeysBeforeSaving;
         this.bibtexKeyPatternPreferences = bibtexKeyPatternPreferences;
     }
 
-    public SavePreferences(Boolean saveInOriginalOrder, SaveOrderConfig saveOrder, Charset encoding,
-                           DatabaseSaveType saveType, Boolean takeMetadataSaveOrderInAccount, Boolean reformatFile,
-                           FieldWriterPreferences fieldWriterPreferences, GlobalBibtexKeyPattern globalCiteKeyPattern,
-                           Boolean generateBibtexKeysBeforeSaving, BibtexKeyPatternPreferences bibtexKeyPatternPreferences) {
-        this(saveInOriginalOrder, saveOrder, encoding, true, saveType, takeMetadataSaveOrderInAccount, reformatFile, fieldWriterPreferences, globalCiteKeyPattern, generateBibtexKeysBeforeSaving, bibtexKeyPatternPreferences);
+    public SavePreferences(Boolean saveInOriginalOrder,
+                           SaveOrderConfig saveOrder,
+                           Charset encoding,
+                           DatabaseSaveType saveType,
+                           Boolean takeMetadataSaveOrderInAccount,
+                           Boolean reformatFile,
+                           FieldWriterPreferences fieldWriterPreferences,
+                           BibtexKeyPatternPreferences bibtexKeyPatternPreferences) {
+
+        this(saveInOriginalOrder,
+                saveOrder,
+                encoding,
+                true,
+                saveType,
+                takeMetadataSaveOrderInAccount,
+                reformatFile,
+                fieldWriterPreferences,
+                bibtexKeyPatternPreferences);
     }
 
     public Boolean takeMetadataSaveOrderInAccount() {
@@ -61,9 +75,16 @@ public boolean isSaveInOriginalOrder() {
     }
 
     public SavePreferences withSaveInOriginalOrder(Boolean newSaveInOriginalOrder) {
-        return new SavePreferences(newSaveInOriginalOrder, this.saveOrder, this.encoding, this.makeBackup, this.saveType,
-                this.takeMetadataSaveOrderInAccount, this.reformatFile, this.fieldWriterPreferences,
-                this.globalCiteKeyPattern, this.generateBibtexKeysBeforeSaving, this.bibtexKeyPatternPreferences);
+        return new SavePreferences(
+                newSaveInOriginalOrder,
+                this.saveOrder,
+                this.encoding,
+                this.makeBackup,
+                this.saveType,
+                this.takeMetadataSaveOrderInAccount,
+                this.reformatFile,
+                this.fieldWriterPreferences,
+                this.bibtexKeyPatternPreferences);
     }
 
     public boolean makeBackup() {
@@ -76,9 +97,16 @@ public boolean makeBackup() {
      * @param newMakeBackup whether a backup (.bak file) should be made
      */
     public SavePreferences withMakeBackup(Boolean newMakeBackup) {
-        return new SavePreferences(this.saveInOriginalOrder, this.saveOrder, this.encoding, newMakeBackup, this.saveType,
-                this.takeMetadataSaveOrderInAccount, this.reformatFile, this.fieldWriterPreferences,
-                this.globalCiteKeyPattern, this.generateBibtexKeysBeforeSaving, this.bibtexKeyPatternPreferences);
+        return new SavePreferences(
+                this.saveInOriginalOrder,
+                this.saveOrder,
+                this.encoding,
+                newMakeBackup,
+                this.saveType,
+                this.takeMetadataSaveOrderInAccount,
+                this.reformatFile,
+                this.fieldWriterPreferences,
+                this.bibtexKeyPatternPreferences);
     }
 
     public Charset getEncoding() {
@@ -86,9 +114,16 @@ public Charset getEncoding() {
     }
 
     public SavePreferences withEncoding(Charset newEncoding) {
-        return new SavePreferences(this.saveInOriginalOrder, this.saveOrder, newEncoding, this.makeBackup, this.saveType,
-                this.takeMetadataSaveOrderInAccount, this.reformatFile, this.fieldWriterPreferences,
-                this.globalCiteKeyPattern, this.generateBibtexKeysBeforeSaving, this.bibtexKeyPatternPreferences);
+        return new SavePreferences(
+                this.saveInOriginalOrder,
+                this.saveOrder,
+                newEncoding,
+                this.makeBackup,
+                this.saveType,
+                this.takeMetadataSaveOrderInAccount,
+                this.reformatFile,
+                this.fieldWriterPreferences,
+                this.bibtexKeyPatternPreferences);
     }
 
     public DatabaseSaveType getSaveType() {
@@ -96,9 +131,16 @@ public DatabaseSaveType getSaveType() {
     }
 
     public SavePreferences withSaveType(DatabaseSaveType newSaveType) {
-        return new SavePreferences(this.saveInOriginalOrder, this.saveOrder, this.encoding, this.makeBackup, newSaveType,
-                this.takeMetadataSaveOrderInAccount, this.reformatFile, this.fieldWriterPreferences,
-                this.globalCiteKeyPattern, this.generateBibtexKeysBeforeSaving, this.bibtexKeyPatternPreferences);
+        return new SavePreferences(
+                this.saveInOriginalOrder,
+                this.saveOrder,
+                this.encoding,
+                this.makeBackup,
+                newSaveType,
+                this.takeMetadataSaveOrderInAccount,
+                this.reformatFile,
+                this.fieldWriterPreferences,
+                this.bibtexKeyPatternPreferences);
     }
 
     public Boolean isReformatFile() {
@@ -106,23 +148,22 @@ public Boolean isReformatFile() {
     }
 
     public SavePreferences withReformatFile(boolean newReformatFile) {
-        return new SavePreferences(this.saveInOriginalOrder, this.saveOrder, this.encoding, this.makeBackup,
-                this.saveType, this.takeMetadataSaveOrderInAccount, newReformatFile, this.fieldWriterPreferences,
-                this.globalCiteKeyPattern, this.generateBibtexKeysBeforeSaving, this.bibtexKeyPatternPreferences);
+        return new SavePreferences(
+                this.saveInOriginalOrder,
+                this.saveOrder,
+                this.encoding,
+                this.makeBackup,
+                this.saveType,
+                this.takeMetadataSaveOrderInAccount,
+                newReformatFile,
+                this.fieldWriterPreferences,
+                this.bibtexKeyPatternPreferences);
     }
 
     public FieldWriterPreferences getFieldWriterPreferences() {
         return fieldWriterPreferences;
     }
 
-    public GlobalBibtexKeyPattern getGlobalCiteKeyPattern() {
-        return globalCiteKeyPattern;
-    }
-
-    public Boolean generateBibtexKeysBeforeSaving() {
-        return generateBibtexKeysBeforeSaving;
-    }
-
     public BibtexKeyPatternPreferences getBibtexKeyPatternPreferences() {
         return bibtexKeyPatternPreferences;
     }
diff --git a/src/main/java/org/jabref/migrations/PreferencesMigrations.java b/src/main/java/org/jabref/migrations/PreferencesMigrations.java
index 38a2bc700ab..7434cbde93d 100644
--- a/src/main/java/org/jabref/migrations/PreferencesMigrations.java
+++ b/src/main/java/org/jabref/migrations/PreferencesMigrations.java
@@ -300,7 +300,7 @@ private static void migrateTypedKeyPrefs(JabRefPreferences prefs, Preferences ol
         for (String key : oldPatternPrefs.keys()) {
             keyPattern.addBibtexKeyPattern(EntryTypeFactory.parse(key), oldPatternPrefs.get(key, null));
         }
-        prefs.putKeyPattern(keyPattern);
+        prefs.storeGlobalBibtexKeyPattern(keyPattern);
     }
 
     static void upgradePreviewStyleFromReviewToComment(JabRefPreferences prefs) {
diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index 4e12bce0c23..ee37f1802fa 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -245,8 +245,6 @@ public class JabRefPreferences implements PreferencesService {
     public static final String ALLOW_FILE_AUTO_OPEN_BROWSE = "allowFileAutoOpenBrowse";
     public static final String CUSTOM_TAB_NAME = "customTabName_";
     public static final String CUSTOM_TAB_FIELDS = "customTabFields_";
-    public static final String USE_UNIT_FORMATTER_ON_SEARCH = "useUnitFormatterOnSearch";
-    public static final String USE_CASE_KEEPER_ON_SEARCH = "useCaseKeeperOnSearch";
     public static final String ASK_AUTO_NAMING_PDFS_AGAIN = "AskAutoNamingPDFsAgain";
     public static final String CLEANUP = "CleanUp";
     public static final String CLEANUP_FORMATTERS = "CleanUpFormatters";
@@ -388,7 +386,7 @@ public class JabRefPreferences implements PreferencesService {
     // string to be formatted and possible formatter arguments.
     public List<String> fileDirForDatabase;
     private final Preferences prefs;
-    private GlobalBibtexKeyPattern keyPattern;
+    private GlobalBibtexKeyPattern globalBibtexKeyPattern;
     // Object containing info about customized entry editor tabs.
     private Map<String, Set<Field>> tabList;
 
@@ -638,8 +636,6 @@ private JabRefPreferences() {
         String defaultExpression = "**/.*[bibtexkey].*\\\\.[extension]";
         defaults.put(AUTOLINK_REG_EXP_SEARCH_EXPRESSION_KEY, defaultExpression);
         defaults.put(AUTOLINK_USE_REG_EXP_SEARCH_KEY, Boolean.FALSE);
-        defaults.put(USE_CASE_KEEPER_ON_SEARCH, Boolean.TRUE);
-        defaults.put(USE_UNIT_FORMATTER_ON_SEARCH, Boolean.TRUE);
 
         defaults.put(USE_DEFAULT_CONSOLE_APPLICATION, Boolean.TRUE);
         defaults.put(USE_DEFAULT_FILE_BROWSER_APPLICATION, Boolean.TRUE);
@@ -996,58 +992,6 @@ public void flush() {
         }
     }
 
-    /**
-     * Fetches key patterns from preferences. The implementation doesn't cache the results
-     *
-     * @return LabelPattern containing all keys. Returned LabelPattern has no parent
-     */
-    public GlobalBibtexKeyPattern getKeyPattern() {
-        keyPattern = GlobalBibtexKeyPattern.fromPattern(get(DEFAULT_BIBTEX_KEY_PATTERN));
-        Preferences pre = Preferences.userNodeForPackage(PREFS_BASE_CLASS).node(BIBTEX_KEY_PATTERNS_NODE);
-        try {
-            String[] keys = pre.keys();
-            if (keys.length > 0) {
-                for (String key : keys) {
-                    keyPattern.addBibtexKeyPattern(EntryTypeFactory.parse(key), pre.get(key, null));
-                }
-            }
-        } catch (BackingStoreException ex) {
-            LOGGER.info("BackingStoreException in JabRefPreferences.getKeyPattern", ex);
-        }
-        return keyPattern;
-    }
-
-    /**
-     * Adds the given key pattern to the preferences
-     *
-     * @param pattern the pattern to store
-     */
-    public void putKeyPattern(GlobalBibtexKeyPattern pattern) {
-        keyPattern = pattern;
-
-        // Store overridden definitions to Preferences.
-        Preferences pre = Preferences.userNodeForPackage(PREFS_BASE_CLASS).node(BIBTEX_KEY_PATTERNS_NODE);
-        try {
-            pre.clear(); // We remove all old entries.
-        } catch (BackingStoreException ex) {
-            LOGGER.info("BackingStoreException in JabRefPreferences.putKeyPattern", ex);
-        }
-
-        for (EntryType entryType : pattern.getAllKeys()) {
-            if (!pattern.isDefaultValue(entryType)) {
-                // no default value
-                // the first entry in the array is the full pattern
-                // see org.jabref.logic.labelPattern.BibtexKeyGenerator.split(String)
-                pre.put(entryType.getName(), pattern.getValue(entryType).get(0));
-            }
-        }
-    }
-
-    private void clearKeyPatterns() throws BackingStoreException {
-        Preferences pre = Preferences.userNodeForPackage(PREFS_BASE_CLASS).node(BIBTEX_KEY_PATTERNS_NODE);
-        pre.clear();
-    }
-
     public void storeBibEntryTypes(List<BibEntryType> BibEntryTypes, BibDatabaseMode bibDatabaseMode) {
         Preferences prefsNode = getPrefsNodeForCustomizedEntryTypes(bibDatabaseMode);
 
@@ -1254,8 +1198,6 @@ public SavePreferences loadForExportFromPreferences() {
                 false,
                 this.getBoolean(JabRefPreferences.REFORMAT_FILE_ON_SAVE_AND_EXPORT),
                 this.getFieldWriterPreferences(),
-                this.getKeyPattern(),
-                getBoolean(JabRefPreferences.GENERATE_KEYS_BEFORE_SAVING),
                 getBibtexKeyPatternPreferences());
     }
 
@@ -1268,8 +1210,6 @@ public SavePreferences loadForSaveFromPreferences() {
                 true,
                 this.getBoolean(JabRefPreferences.REFORMAT_FILE_ON_SAVE_AND_EXPORT),
                 this.getFieldWriterPreferences(),
-                this.getKeyPattern(),
-                getBoolean(JabRefPreferences.GENERATE_KEYS_BEFORE_SAVING),
                 getBibtexKeyPatternPreferences());
     }
 
@@ -1281,19 +1221,6 @@ public ExporterFactory getExporterFactory(JournalAbbreviationRepository abbrevia
         return ExporterFactory.create(customFormats, layoutPreferences, savePreferences, xmpPreferences);
     }
 
-    @Override
-    public BibtexKeyPatternPreferences getBibtexKeyPatternPreferences() {
-        return new BibtexKeyPatternPreferences(
-                get(KEY_PATTERN_REGEX),
-                get(KEY_PATTERN_REPLACEMENT),
-                getBoolean(KEY_GEN_ALWAYS_ADD_LETTER),
-                getBoolean(KEY_GEN_FIRST_LETTER_A),
-                getKeyPattern(),
-                getKeywordDelimiter(),
-                getBoolean(AVOID_OVERWRITING_KEY),
-                get(UNWANTED_BIBTEX_KEY_CHARACTERS));
-    }
-
     @Override
     public LayoutFormatterPreferences getLayoutFormatterPreferences(JournalAbbreviationRepository repository) {
         return new LayoutFormatterPreferences(
@@ -1407,25 +1334,6 @@ public PreviewPreferences getPreviewPreferences() {
         return new PreviewPreferences(layouts, cyclePos, panelHeight, style, styleDefault, showAsTab);
     }
 
-    public void storeProxyPreferences(ProxyPreferences proxyPreferences) {
-        putBoolean(PROXY_USE, proxyPreferences.isUseProxy());
-        put(PROXY_HOSTNAME, proxyPreferences.getHostname());
-        put(PROXY_PORT, proxyPreferences.getPort());
-        putBoolean(PROXY_USE_AUTHENTICATION, proxyPreferences.isUseAuthentication());
-        put(PROXY_USERNAME, proxyPreferences.getUsername());
-        put(PROXY_PASSWORD, proxyPreferences.getPassword());
-    }
-
-    public ProxyPreferences getProxyPreferences() {
-        Boolean useProxy = getBoolean(PROXY_USE);
-        String hostname = get(PROXY_HOSTNAME);
-        String port = get(PROXY_PORT);
-        Boolean useAuthentication = getBoolean(PROXY_USE_AUTHENTICATION);
-        String username = get(PROXY_USERNAME);
-        String password = get(PROXY_PASSWORD);
-        return new ProxyPreferences(useProxy, hostname, port, useAuthentication, username, password);
-    }
-
     public ProtectedTermsPreferences getProtectedTermsPreferences() {
         return new ProtectedTermsPreferences(
                 getStringList(PROTECTED_TERMS_ENABLED_INTERNAL),
@@ -1499,15 +1407,6 @@ public void setCleanupPreset(CleanupPreset cleanupPreset) {
         putStringList(JabRefPreferences.CLEANUP_FORMATTERS, cleanupPreset.getFormatterCleanups().getAsStringList(OS.NEWLINE));
     }
 
-    public RemotePreferences getRemotePreferences() {
-        return new RemotePreferences(getInt(REMOTE_SERVER_PORT), getBoolean(USE_REMOTE_SERVER));
-    }
-
-    public void setRemotePreferences(RemotePreferences remotePreferences) {
-        putInt(REMOTE_SERVER_PORT, remotePreferences.getPort());
-        putBoolean(USE_REMOTE_SERVER, remotePreferences.useRemoteServer());
-    }
-
     @Override
     public void storeExportSaveOrder(SaveOrderConfig config) {
         putBoolean(EXPORT_PRIMARY_SORT_DESCENDING, config.getSortCriteria().get(0).descending);
@@ -2117,6 +2016,164 @@ public void storeEntryEditorPreferences(EntryEditorPreferences preferences) {
         putBoolean(VALIDATE_IN_ENTRY_EDITOR, preferences.isEnableValidation());
     }
 
+    //*************************************************************************************************************
+    // Network preferences
+    //*************************************************************************************************************
+
+    public RemotePreferences getRemotePreferences() {
+        return new RemotePreferences(getInt(REMOTE_SERVER_PORT), getBoolean(USE_REMOTE_SERVER));
+    }
+
+    public void storeRemotePreferences(RemotePreferences remotePreferences) {
+        putInt(REMOTE_SERVER_PORT, remotePreferences.getPort());
+        putBoolean(USE_REMOTE_SERVER, remotePreferences.useRemoteServer());
+    }
+
+    public ProxyPreferences getProxyPreferences() {
+        Boolean useProxy = getBoolean(PROXY_USE);
+        String hostname = get(PROXY_HOSTNAME);
+        String port = get(PROXY_PORT);
+        Boolean useAuthentication = getBoolean(PROXY_USE_AUTHENTICATION);
+        String username = get(PROXY_USERNAME);
+        String password = get(PROXY_PASSWORD);
+        return new ProxyPreferences(useProxy, hostname, port, useAuthentication, username, password);
+    }
+
+    public void storeProxyPreferences(ProxyPreferences proxyPreferences) {
+        putBoolean(PROXY_USE, proxyPreferences.isUseProxy());
+        put(PROXY_HOSTNAME, proxyPreferences.getHostname());
+        put(PROXY_PORT, proxyPreferences.getPort());
+        putBoolean(PROXY_USE_AUTHENTICATION, proxyPreferences.isUseAuthentication());
+        put(PROXY_USERNAME, proxyPreferences.getUsername());
+        put(PROXY_PASSWORD, proxyPreferences.getPassword());
+    }
+
+    //*************************************************************************************************************
+    // BibtexKeyPatternPreferences
+    //*************************************************************************************************************
+
+    /**
+     * Creates the GlobalBibtexKeyPattern
+     *
+     * @return GlobalBibtexKeyPattern containing all keys without a parent AbstractKeyPattern
+     */
+    @Override
+    public GlobalBibtexKeyPattern getGlobalBibtexKeyPattern() {
+        if (this.globalBibtexKeyPattern == null) {
+            updateGlobalBibtexKeyPattern();
+        }
+        return this.globalBibtexKeyPattern;
+    }
+
+    @Override
+    public void updateGlobalBibtexKeyPattern() {
+        this.globalBibtexKeyPattern = GlobalBibtexKeyPattern.fromPattern(get(DEFAULT_BIBTEX_KEY_PATTERN));
+        Preferences preferences = Preferences.userNodeForPackage(PREFS_BASE_CLASS).node(BIBTEX_KEY_PATTERNS_NODE);
+        try {
+            String[] keys = preferences.keys();
+            if (keys.length > 0) {
+                for (String key : keys) {
+                    this.globalBibtexKeyPattern.addBibtexKeyPattern(
+                            EntryTypeFactory.parse(key),
+                            preferences.get(key, null));
+                }
+            }
+        } catch (BackingStoreException ex) {
+            LOGGER.info("BackingStoreException in JabRefPreferences.getKeyPattern", ex);
+        }
+    }
+
+    /**
+     * Adds the given key pattern to the preferences
+     *
+     * @param pattern the pattern to store
+     */
+    public void storeGlobalBibtexKeyPattern(GlobalBibtexKeyPattern pattern) {
+        this.globalBibtexKeyPattern = pattern;
+
+        if ((this.globalBibtexKeyPattern.getDefaultValue() == null)
+                || this.globalBibtexKeyPattern.getDefaultValue().isEmpty()) {
+            put(DEFAULT_BIBTEX_KEY_PATTERN, "");
+        } else {
+            put(DEFAULT_BIBTEX_KEY_PATTERN, globalBibtexKeyPattern.getDefaultValue().get(0));
+        }
+
+        // Store overridden definitions to Preferences.
+        Preferences preferences = Preferences.userNodeForPackage(PREFS_BASE_CLASS).node(BIBTEX_KEY_PATTERNS_NODE);
+        try {
+            preferences.clear(); // We remove all old entries.
+        } catch (BackingStoreException ex) {
+            LOGGER.info("BackingStoreException in JabRefPreferences::putKeyPattern", ex);
+        }
+
+        for (EntryType entryType : pattern.getAllKeys()) {
+            if (!pattern.isDefaultValue(entryType)) {
+                // first entry in the map is the full pattern
+                preferences.put(entryType.getName(), pattern.getValue(entryType).get(0));
+            }
+        }
+
+        updateGlobalBibtexKeyPattern();
+    }
+
+    private void clearKeyPatterns() throws BackingStoreException {
+        Preferences preferences = Preferences.userNodeForPackage(PREFS_BASE_CLASS).node(BIBTEX_KEY_PATTERNS_NODE);
+        preferences.clear();
+        updateGlobalBibtexKeyPattern();
+    }
+
+    @Override
+    public BibtexKeyPatternPreferences getBibtexKeyPatternPreferences() {
+        BibtexKeyPatternPreferences.KeySuffix keySuffix =
+                BibtexKeyPatternPreferences.KeySuffix.SECOND_WITH_B;
+
+        if (getBoolean(KEY_GEN_ALWAYS_ADD_LETTER)) {
+            keySuffix = BibtexKeyPatternPreferences.KeySuffix.ALWAYS;
+        } else if (getBoolean(KEY_GEN_FIRST_LETTER_A)) {
+            keySuffix = BibtexKeyPatternPreferences.KeySuffix.SECOND_WITH_A;
+        }
+
+        return new BibtexKeyPatternPreferences(
+                getBoolean(AVOID_OVERWRITING_KEY),
+                getBoolean(WARN_BEFORE_OVERWRITING_KEY),
+                getBoolean(GENERATE_KEYS_BEFORE_SAVING),
+                keySuffix,
+                get(KEY_PATTERN_REGEX),
+                get(KEY_PATTERN_REPLACEMENT),
+                get(UNWANTED_BIBTEX_KEY_CHARACTERS),
+                getGlobalBibtexKeyPattern(),
+                getKeywordDelimiter());
+    }
+
+    @Override
+    public void storeBibtexKeyPatternPreferences(BibtexKeyPatternPreferences preferences) {
+        putBoolean(AVOID_OVERWRITING_KEY, preferences.shouldAvoidOverwriteCiteKey());
+        putBoolean(WARN_BEFORE_OVERWRITING_KEY, preferences.shouldWarnBeforeOverwriteCiteKey());
+        putBoolean(GENERATE_KEYS_BEFORE_SAVING, preferences.shouldGenerateCiteKeysBeforeSaving());
+
+        switch (preferences.getKeySuffix()) {
+            case ALWAYS:
+                putBoolean(KEY_GEN_ALWAYS_ADD_LETTER, true);
+                putBoolean(KEY_GEN_FIRST_LETTER_A, false);
+                break;
+            case SECOND_WITH_A:
+                putBoolean(KEY_GEN_ALWAYS_ADD_LETTER, false);
+                putBoolean(KEY_GEN_FIRST_LETTER_A, true);
+                break;
+            default:
+            case SECOND_WITH_B:
+                putBoolean(KEY_GEN_ALWAYS_ADD_LETTER, false);
+                putBoolean(KEY_GEN_FIRST_LETTER_A, false);
+                break;
+        }
+
+        put(KEY_PATTERN_REGEX, preferences.getKeyPatternRegex());
+        put(KEY_PATTERN_REPLACEMENT, preferences.getKeyPatternReplacement());
+        put(UNWANTED_BIBTEX_KEY_CHARACTERS, preferences.getUnwantedCharacters());
+
+        storeGlobalBibtexKeyPattern(preferences.getKeyPattern());
+    }
+
     //*************************************************************************************************************
     // ToDo: Misc preferences
     //*************************************************************************************************************
diff --git a/src/main/java/org/jabref/preferences/PreferencesService.java b/src/main/java/org/jabref/preferences/PreferencesService.java
index 4fe99106905..266ab5fccf8 100644
--- a/src/main/java/org/jabref/preferences/PreferencesService.java
+++ b/src/main/java/org/jabref/preferences/PreferencesService.java
@@ -21,12 +21,15 @@
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.l10n.Language;
 import org.jabref.logic.layout.LayoutFormatterPreferences;
+import org.jabref.logic.net.ProxyPreferences;
 import org.jabref.logic.openoffice.OpenOfficePreferences;
 import org.jabref.logic.preferences.OwnerPreferences;
 import org.jabref.logic.preferences.TimestampPreferences;
 import org.jabref.logic.protectedterms.ProtectedTermsLoader;
+import org.jabref.logic.remote.RemotePreferences;
 import org.jabref.logic.util.io.AutoLinkPreferences;
 import org.jabref.logic.xmp.XmpPreferences;
+import org.jabref.model.bibtexkeypattern.GlobalBibtexKeyPattern;
 import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.entry.BibEntryType;
 import org.jabref.model.entry.field.Field;
@@ -71,8 +74,6 @@ public interface PreferencesService {
 
     void storeCustomExportFormats(List<TemplateExporter> exporters);
 
-    BibtexKeyPatternPreferences getBibtexKeyPatternPreferences();
-
     LayoutFormatterPreferences getLayoutFormatterPreferences(JournalAbbreviationRepository repository);
 
     ImportFormatPreferences getImportFormatPreferences();
@@ -165,6 +166,30 @@ public interface PreferencesService {
 
     void storeEntryEditorPreferences(EntryEditorPreferences preferences);
 
+    //*************************************************************************************************************
+    // Network preferences
+    //*************************************************************************************************************
+
+    RemotePreferences getRemotePreferences();
+
+    void storeRemotePreferences(RemotePreferences remotePreferences);
+
+    ProxyPreferences getProxyPreferences();
+
+    void storeProxyPreferences(ProxyPreferences proxyPreferences);
+
+    //*************************************************************************************************************
+    // BibtexKeyPatternPreferences
+    //*************************************************************************************************************
+
+    GlobalBibtexKeyPattern getGlobalBibtexKeyPattern();
+
+    void updateGlobalBibtexKeyPattern();
+
+    BibtexKeyPatternPreferences getBibtexKeyPatternPreferences();
+
+    void storeBibtexKeyPatternPreferences(BibtexKeyPatternPreferences preferences);
+
     //*************************************************************************************************************
     // ToDo: Misc preferences
     //*************************************************************************************************************
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index d9e9532dd8a..75aed9cc1f1 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -49,7 +49,6 @@ Added\ group\ "%0".=Added group "%0".
 
 Added\ string=Added string
 
-Advanced=Advanced
 All\ entries=All entries
 
 Always\ reformat\ BIB\ file\ on\ save\ and\ export=Always reformat BIB file on save and export
@@ -1193,14 +1192,11 @@ Your\ style\ file\ specifies\ the\ character\ format\ '%0',\ which\ is\ undefine
 Your\ style\ file\ specifies\ the\ paragraph\ format\ '%0',\ which\ is\ undefined\ in\ your\ current\ OpenOffice/LibreOffice\ document.=Your style file specifies the paragraph format '%0', which is undefined in your current OpenOffice/LibreOffice document.
 
 Searching...=Searching...
-Add\ {}\ to\ specified\ title\ words\ on\ search\ to\ keep\ the\ correct\ case=Add {} to specified title words on search to keep the correct case
-Import\ conversions=Import conversions
 Please\ enter\ a\ search\ string=Please enter a search string
 Please\ open\ or\ start\ a\ new\ library\ before\ searching=Please open or start a new library before searching
 
 Canceled\ merging\ entries=Canceled merging entries
 
-Format\ units\ by\ adding\ non-breaking\ separators\ and\ keeping\ the\ correct\ case\ on\ search=Format units by adding non-breaking separators and keeping the correct case on search
 Merge\ entries=Merge entries
 Merged\ entries=Merged entries
 None=None
@@ -1221,6 +1217,7 @@ Please\ specify\ a\ port=Please specify a port
 Please\ specify\ a\ username=Please specify a username
 Please\ specify\ a\ password=Please specify a password
 
+Proxy\ configuration=Proxy configuration
 Use\ custom\ proxy\ configuration=Use custom proxy configuration
 Proxy\ requires\ authentication=Proxy requires authentication
 Attention\:\ Password\ is\ stored\ in\ plain\ text\!=Attention: Password is stored in plain text!
diff --git a/src/test/java/org/jabref/gui/exporter/SaveDatabaseActionTest.java b/src/test/java/org/jabref/gui/exporter/SaveDatabaseActionTest.java
index f4a91bae18e..12a463a5171 100644
--- a/src/test/java/org/jabref/gui/exporter/SaveDatabaseActionTest.java
+++ b/src/test/java/org/jabref/gui/exporter/SaveDatabaseActionTest.java
@@ -17,6 +17,7 @@
 import org.jabref.gui.util.FileDialogConfiguration;
 import org.jabref.logic.bibtex.FieldContentFormatterPreferences;
 import org.jabref.logic.bibtex.FieldWriterPreferences;
+import org.jabref.logic.bibtexkeypattern.BibtexKeyPatternPreferences;
 import org.jabref.logic.exporter.SavePreferences;
 import org.jabref.model.bibtexkeypattern.GlobalBibtexKeyPattern;
 import org.jabref.model.database.BibDatabase;
@@ -112,8 +113,9 @@ private SaveDatabaseAction createSaveDatabaseActionForBibDatabase(BibDatabase da
         when(savePreferences.getEncoding()).thenReturn(StandardCharsets.UTF_8);
         when(savePreferences.getFieldWriterPreferences()).thenReturn(fieldWriterPreferences);
         GlobalBibtexKeyPattern emptyGlobalBibtexKeyPattern = GlobalBibtexKeyPattern.fromPattern("");
-        when(savePreferences.getGlobalCiteKeyPattern()).thenReturn(emptyGlobalBibtexKeyPattern);
         when(metaData.getCiteKeyPattern(any(GlobalBibtexKeyPattern.class))).thenReturn(emptyGlobalBibtexKeyPattern);
+        when(savePreferences.getBibtexKeyPatternPreferences()).thenReturn(mock(BibtexKeyPatternPreferences.class));
+        when(savePreferences.getBibtexKeyPatternPreferences().getKeyPattern()).thenReturn(emptyGlobalBibtexKeyPattern);
         when(dbContext.getDatabasePath()).thenReturn(Optional.of(file));
         when(dbContext.getLocation()).thenReturn(DatabaseLocation.LOCAL);
         when(dbContext.getDatabase()).thenReturn(database);
@@ -144,7 +146,7 @@ public void saveKeepsChangedFlag() throws Exception {
 
         assertEquals(database
                         .getEntries().stream()
-                        .map(entry -> entry.hasChanged()).filter(changed -> false).collect(Collectors.toList()),
+                        .map(BibEntry::hasChanged).filter(changed -> false).collect(Collectors.toList()),
                 Collections.emptyList());
     }
 
diff --git a/src/test/java/org/jabref/logic/bibtexkeypattern/MakeLabelWithDatabaseTest.java b/src/test/java/org/jabref/logic/bibtexkeypattern/MakeLabelWithDatabaseTest.java
index 9cd3e451b87..cb93968acc3 100644
--- a/src/test/java/org/jabref/logic/bibtexkeypattern/MakeLabelWithDatabaseTest.java
+++ b/src/test/java/org/jabref/logic/bibtexkeypattern/MakeLabelWithDatabaseTest.java
@@ -33,7 +33,16 @@ void setUp() {
         database.insertEntry(entry);
         pattern = GlobalBibtexKeyPattern.fromPattern("[auth][year]");
         bibtexKeyPattern = new DatabaseBibtexKeyPattern(pattern);
-        preferences = new BibtexKeyPatternPreferences("", "", false, true, pattern, ',', false, DEFAULT_UNWANTED_CHARACTERS);
+        preferences = new BibtexKeyPatternPreferences(
+                false,
+                false,
+                false,
+                BibtexKeyPatternPreferences.KeySuffix.SECOND_WITH_A,
+                "",
+                "",
+                DEFAULT_UNWANTED_CHARACTERS,
+                pattern,
+                ',');
     }
 
     @Test
@@ -55,14 +64,33 @@ void generateDefaultKeyAlreadyExistsDuplicatesStartAtA() {
 
     @Test
     void generateDefaultKeyAlwaysLetter() {
-        preferences = new BibtexKeyPatternPreferences("", "", true, true, pattern, ',', false, DEFAULT_UNWANTED_CHARACTERS);
+        preferences = new BibtexKeyPatternPreferences(
+                false,
+                false,
+                false,
+                BibtexKeyPatternPreferences.KeySuffix.ALWAYS,
+                "",
+                "",
+                DEFAULT_UNWANTED_CHARACTERS,
+                pattern,
+                ',');
+
         new BibtexKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
         assertEquals(Optional.of("Doe2016a"), entry.getCiteKeyOptional());
     }
 
     @Test
     void generateDefaultKeyAlwaysLetterAlreadyExistsDuplicatesStartAtB() {
-        preferences = new BibtexKeyPatternPreferences("", "", true, true, pattern, ',', false, DEFAULT_UNWANTED_CHARACTERS);
+        preferences = new BibtexKeyPatternPreferences(
+                false,
+                false,
+                false,
+                BibtexKeyPatternPreferences.KeySuffix.ALWAYS,
+                "",
+                "",
+                DEFAULT_UNWANTED_CHARACTERS,
+                pattern,
+                ',');
 
         BibtexKeyGenerator keyGenerator = new BibtexKeyGenerator(bibtexKeyPattern, database, preferences);
         keyGenerator.generateAndSetKey(entry);
@@ -75,14 +103,33 @@ void generateDefaultKeyAlwaysLetterAlreadyExistsDuplicatesStartAtB() {
 
     @Test
     void generateDefaultKeyStartDuplicatesAtB() {
-        preferences = new BibtexKeyPatternPreferences("", "", false, false, pattern, ',', false, DEFAULT_UNWANTED_CHARACTERS);
+        preferences = new BibtexKeyPatternPreferences(
+                false,
+                false,
+                false,
+                BibtexKeyPatternPreferences.KeySuffix.SECOND_WITH_B,
+                "",
+                "",
+                DEFAULT_UNWANTED_CHARACTERS,
+                pattern,
+                ',');
+
         new BibtexKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
         assertEquals(Optional.of("Doe2016"), entry.getCiteKeyOptional());
     }
 
     @Test
     void generateDefaultKeyAlreadyExistsDuplicatesStartAtB() {
-        preferences = new BibtexKeyPatternPreferences("", "", false, false, pattern, ',', false, DEFAULT_UNWANTED_CHARACTERS);
+        preferences = new BibtexKeyPatternPreferences(
+                false,
+                false,
+                false,
+                BibtexKeyPatternPreferences.KeySuffix.SECOND_WITH_B,
+                "",
+                "",
+                DEFAULT_UNWANTED_CHARACTERS,
+                pattern,
+                ',');
 
         BibtexKeyGenerator keyGenerator = new BibtexKeyGenerator(bibtexKeyPattern, database, preferences);
         keyGenerator.generateAndSetKey(entry);
@@ -93,6 +140,7 @@ void generateDefaultKeyAlreadyExistsDuplicatesStartAtB() {
         assertEquals(Optional.of("Doe2016b"), entry2.getCiteKeyOptional());
     }
 
+    @SuppressWarnings("OptionalGetWithoutIsPresent")
     @Test
     void generateDefaultKeyAlreadyExistsManyDuplicates() {
         BibtexKeyGenerator keyGenerator = new BibtexKeyGenerator(bibtexKeyPattern, database, preferences);
@@ -111,6 +159,7 @@ void generateDefaultKeyAlreadyExistsManyDuplicates() {
         assertEquals(Optional.of("Doe2016a"), entry3.getCiteKeyOptional());
     }
 
+    @SuppressWarnings("OptionalGetWithoutIsPresent")
     @Test
     void generateDefaultKeyFirstTwoAlreadyExists() {
         BibtexKeyGenerator keyGenerator = new BibtexKeyGenerator(bibtexKeyPattern, database, preferences);
@@ -371,7 +420,17 @@ void generateKeyAuthNMLargeMReallyReturnsEmptyString() {
 
     @Test
     void generateKeyRegExReplace() {
-        preferences = new BibtexKeyPatternPreferences("2", "3", false, true, pattern, ',', false, DEFAULT_UNWANTED_CHARACTERS);
+        preferences = new BibtexKeyPatternPreferences(
+                false,
+                false,
+                false,
+                BibtexKeyPatternPreferences.KeySuffix.SECOND_WITH_A,
+                "2",
+                "3",
+                DEFAULT_UNWANTED_CHARACTERS,
+                pattern,
+                ',');
+
         bibtexKeyPattern.setDefaultValue("[auth][year]");
         entry.setField(StandardField.AUTHOR, "John Doe and Donald Smith and Will Wonder");
         new BibtexKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
diff --git a/src/test/java/org/jabref/logic/integrity/IntegrityCheckTest.java b/src/test/java/org/jabref/logic/integrity/IntegrityCheckTest.java
index 1c45d40a5f5..1401fcf08b9 100644
--- a/src/test/java/org/jabref/logic/integrity/IntegrityCheckTest.java
+++ b/src/test/java/org/jabref/logic/integrity/IntegrityCheckTest.java
@@ -34,7 +34,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 
 /**
@@ -197,14 +197,15 @@ private void assertCorrect(BibDatabaseContext context, boolean allowIntegerEditi
     private BibtexKeyPatternPreferences createBibtexKeyPatternPreferences() {
         final GlobalBibtexKeyPattern keyPattern = GlobalBibtexKeyPattern.fromPattern("[auth][year]");
         return new BibtexKeyPatternPreferences(
-                "",
-                "",
                 false,
                 false,
-                keyPattern,
-                ',',
                 false,
-                BibtexKeyGenerator.DEFAULT_UNWANTED_CHARACTERS);
+                BibtexKeyPatternPreferences.KeySuffix.SECOND_WITH_B,
+                "",
+                "",
+                BibtexKeyGenerator.DEFAULT_UNWANTED_CHARACTERS,
+                keyPattern,
+                ',');
     }
 
     private BibDatabaseContext withMode(BibDatabaseContext context, BibDatabaseMode mode) {