diff --git a/src/doc-files/main.png b/src/doc-files/main.png
index 6dd1aec..45c1198 100644
Binary files a/src/doc-files/main.png and b/src/doc-files/main.png differ
diff --git a/src/eu/steffo/cleaver/gui/doc-files/cleaverframe.png b/src/eu/steffo/cleaver/gui/doc-files/cleaverframe.png
index 6dd1aec..45c1198 100644
Binary files a/src/eu/steffo/cleaver/gui/doc-files/cleaverframe.png and b/src/eu/steffo/cleaver/gui/doc-files/cleaverframe.png differ
diff --git a/src/eu/steffo/cleaver/gui/panels/rows/option/CryptRow.java b/src/eu/steffo/cleaver/gui/panels/rows/option/CryptRow.java
index 5f1cc5b..8d6398f 100644
--- a/src/eu/steffo/cleaver/gui/panels/rows/option/CryptRow.java
+++ b/src/eu/steffo/cleaver/gui/panels/rows/option/CryptRow.java
@@ -26,14 +26,14 @@ public class CryptRow extends OptionRow {
     protected final JSeparator separator;
 
     /**
-     * A label with "Key" written on it.
+     * A label with "Password" written on it.
      */
-    protected final JLabel keyLabel;
+    protected final JLabel passwordLabel;
 
     /**
      * The {@link JTextField} where the user can input the desired encryption key for the files, in form of a {@link String}.
      */
-    protected final JTextField keyTextField;
+    protected final JTextField passwordTextField;
 
     /**
      * Construct a CryptRow.
@@ -54,13 +54,13 @@ public class CryptRow extends OptionRow {
 
         this.add(Box.createHorizontalStrut(8));
 
-        keyLabel = new JLabel("Key");
-        this.add(keyLabel);
+        passwordLabel = new JLabel("Password");
+        this.add(passwordLabel);
 
         this.add(Box.createHorizontalStrut(8));
 
-        keyTextField = new JTextField();
-        this.add(keyTextField);
+        passwordTextField = new JTextField();
+        this.add(passwordTextField);
 
         this.add(Box.createHorizontalStrut(8));
 
@@ -75,7 +75,7 @@ public class CryptRow extends OptionRow {
         if(!cryptCheckBox.isSelected()) {
             return null;
         }
-        return new PasswordConfig(keyTextField.getText());
+        return new PasswordConfig(passwordTextField.getText());
     }
 
     @Override
@@ -88,7 +88,7 @@ public class CryptRow extends OptionRow {
      * Refresh the enabled/disabled and editable/non-editable status of all components in the SplitRow.
      */
     protected void update() {
-        keyTextField.setEnabled(cryptCheckBox.isEnabled());
-        keyTextField.setEditable(cryptCheckBox.isSelected());
+        passwordTextField.setEnabled(cryptCheckBox.isEnabled());
+        passwordTextField.setEditable(cryptCheckBox.isSelected());
     }
 }
diff --git a/src/eu/steffo/cleaver/gui/panels/rows/option/KeyRow.java b/src/eu/steffo/cleaver/gui/panels/rows/option/KeyRow.java
index f325b7c..1514c07 100644
--- a/src/eu/steffo/cleaver/gui/panels/rows/option/KeyRow.java
+++ b/src/eu/steffo/cleaver/gui/panels/rows/option/KeyRow.java
@@ -15,14 +15,14 @@ import javax.swing.*;
  */
 public class KeyRow extends OptionRow {
     /**
-     * A label with "Encryption key" written on it.
+     * A label with "Password" written on it.
      */
-    protected final JLabel keyLabel;
+    protected final JLabel passwordLabel;
 
     /**
      * The text field where the user can input the encryption key.
      */
-    protected final JTextField keyTextField;
+    protected final JTextField passwordTextField;
 
     /**
      * A label with "(if required)" written on it.
@@ -37,13 +37,13 @@ public class KeyRow extends OptionRow {
 
         this.add(Box.createHorizontalStrut(8));
 
-        keyLabel = new JLabel("Encryption key");
-        this.add(keyLabel);
+        passwordLabel = new JLabel("Password");
+        this.add(passwordLabel);
 
         this.add(Box.createHorizontalStrut(8));
 
-        keyTextField = new JTextField();
-        this.add(keyTextField);
+        passwordTextField = new JTextField();
+        this.add(passwordTextField);
 
         this.add(Box.createHorizontalStrut(8));
 
@@ -56,15 +56,15 @@ public class KeyRow extends OptionRow {
     }
 
     /**
-     * @return The encryption key inserted in the {@link #keyTextField}.
+     * @return The encryption key inserted in the {@link #passwordTextField}.
      */
     public String getKey() {
-        return keyTextField.getText();
+        return passwordTextField.getText();
     }
 
     @Override
     public void setEditable(boolean value) {
-        keyTextField.setEditable(value);
+        passwordTextField.setEditable(value);
         this.update();
     }
 
@@ -72,6 +72,6 @@ public class KeyRow extends OptionRow {
      * Refresh the enabled/disabled and editable/non-editable status of all components in the KeyRow.
      */
     protected void update() {
-        keyTextField.setEnabled(keyTextField.isEditable());
+        passwordTextField.setEnabled(passwordTextField.isEditable());
     }
 }
diff --git a/src/eu/steffo/cleaver/gui/panels/rows/option/doc-files/cryptrow.png b/src/eu/steffo/cleaver/gui/panels/rows/option/doc-files/cryptrow.png
index 33cf0fb..df4b3b6 100644
Binary files a/src/eu/steffo/cleaver/gui/panels/rows/option/doc-files/cryptrow.png and b/src/eu/steffo/cleaver/gui/panels/rows/option/doc-files/cryptrow.png differ
diff --git a/src/eu/steffo/cleaver/gui/panels/rows/option/doc-files/keyrow.png b/src/eu/steffo/cleaver/gui/panels/rows/option/doc-files/keyrow.png
index c8b97b4..a5db016 100644
Binary files a/src/eu/steffo/cleaver/gui/panels/rows/option/doc-files/keyrow.png and b/src/eu/steffo/cleaver/gui/panels/rows/option/doc-files/keyrow.png differ