diff --git a/src/configdialog.cpp b/src/configdialog.cpp
index 610e1e60d..ba2a6f348 100644
--- a/src/configdialog.cpp
+++ b/src/configdialog.cpp
@@ -527,7 +527,7 @@ void ConfigDialog::on_deleteButton_clicked() {
   foreach (item, itemList)
     selectedRows.insert(item->row());
   // get a list, and sort it big to small
-  QList<int> rows = selectedRows.toList();
+  QList<int> rows = selectedRows.values();
   std::sort(rows.begin(), rows.end());
   // now actually do the removing:
   foreach (int row, rows)
diff --git a/src/configdialog.h b/src/configdialog.h
index 24e2f0479..a0f162b07 100644
--- a/src/configdialog.h
+++ b/src/configdialog.h
@@ -34,7 +34,7 @@ class ConfigDialog : public QDialog {
   QHash<QString, QString> getProfiles();
   void wizard();
   void genKey(QString, QDialog *);
-  void useTrayIcon(bool useTrayIdon);
+  void useTrayIcon(bool useSystray);
   void useGit(bool useGit);
   void useOtp(bool useOtp);
   void useQrencode(bool useQrencode);
diff --git a/src/imitatepass.h b/src/imitatepass.h
index b00c08bb8..4bfd3a94e 100644
--- a/src/imitatepass.h
+++ b/src/imitatepass.h
@@ -52,10 +52,10 @@ class ImitatePass : public Pass, private simpleTransaction {
   virtual void GitPush() Q_DECL_OVERRIDE;
   virtual void Show(QString file) Q_DECL_OVERRIDE;
   virtual void OtpGenerate(QString file) Q_DECL_OVERRIDE;
-  virtual void Insert(QString file, QString value,
+  virtual void Insert(QString file, QString newValue,
                       bool overwrite = false) Q_DECL_OVERRIDE;
   virtual void Remove(QString file, bool isDir = false) Q_DECL_OVERRIDE;
-  virtual void Init(QString path, const QList<UserInfo> &list) Q_DECL_OVERRIDE;
+  virtual void Init(QString path, const QList<UserInfo> &users) Q_DECL_OVERRIDE;
 
   void reencryptPath(const QString &dir);
 signals:
diff --git a/src/pass.h b/src/pass.h
index ae20986b5..3ef3c7dbb 100644
--- a/src/pass.h
+++ b/src/pass.h
@@ -54,7 +54,7 @@ class Pass : public QObject {
   virtual QString Generate_b(unsigned int length, const QString &charset);
 
   void GenerateGPGKeys(QString batch);
-  QList<UserInfo> listKeys(QStringList keystring, bool secret = false);
+  QList<UserInfo> listKeys(QStringList keystrings, bool secret = false);
   QList<UserInfo> listKeys(QString keystring = "", bool secret = false);
   void updateEnv();
   static QStringList getRecipientList(QString for_file);
diff --git a/src/qtpass.h b/src/qtpass.h
index 064edfce6..07e36839e 100644
--- a/src/qtpass.h
+++ b/src/qtpass.h
@@ -54,7 +54,7 @@ private slots:
   void onKeyGenerationComplete(const QString &p_output,
                                const QString &p_errout);
 
-  void showInTextBrowser(QString toShow, QString prefix = QString(),
+  void showInTextBrowser(QString output, QString prefix = QString(),
                          QString postfix = QString());
 };
 
diff --git a/src/realpass.h b/src/realpass.h
index abf96f1a4..3fe8cddaf 100644
--- a/src/realpass.h
+++ b/src/realpass.h
@@ -8,7 +8,7 @@
     \brief Wrapper for executing pass to handle the password-store
 */
 class RealPass : public Pass {
-  void executePass(PROCESS id, const QStringList &arg,
+  void executePass(PROCESS id, const QStringList &args,
                    QString input = QString(), bool readStdout = true,
                    bool readStderr = true);
 
@@ -21,7 +21,7 @@ class RealPass : public Pass {
   virtual void GitPush() Q_DECL_OVERRIDE;
   virtual void Show(QString file) Q_DECL_OVERRIDE;
   virtual void OtpGenerate(QString file) Q_DECL_OVERRIDE;
-  virtual void Insert(QString file, QString value,
+  virtual void Insert(QString file, QString newValue,
                       bool overwrite = false) Q_DECL_OVERRIDE;
   virtual void Remove(QString file, bool isDir = false) Q_DECL_OVERRIDE;
   virtual void Init(QString path, const QList<UserInfo> &users) Q_DECL_OVERRIDE;