diff --git a/python/gui/qgsoptionsdialogbase.sip b/python/gui/qgsoptionsdialogbase.sip
index aa620898258..c04073ce7d2 100644
--- a/python/gui/qgsoptionsdialogbase.sip
+++ b/python/gui/qgsoptionsdialogbase.sip
@@ -128,8 +128,8 @@ class QgsOptionsDialogBase : QDialog
 
   protected slots:
     virtual void updateOptionsListVerticalTabs();
-    virtual void optionsStackedWidget_CurrentChanged( int indx );
-    virtual void optionsStackedWidget_WidgetRemoved( int indx );
+    virtual void optionsStackedWidget_CurrentChanged( int index );
+    virtual void optionsStackedWidget_WidgetRemoved( int index );
 
     void warnAboutMissingObjects();
 
diff --git a/src/app/pluginmanager/qgspluginmanager.h b/src/app/pluginmanager/qgspluginmanager.h
index c65f341423c..af9c9fbf12f 100644
--- a/src/app/pluginmanager/qgspluginmanager.h
+++ b/src/app/pluginmanager/qgspluginmanager.h
@@ -172,7 +172,7 @@ class QgsPluginManager : public QgsOptionsDialogBase, private Ui::QgsPluginManag
     void showHelp();
 
     //! Reimplement QgsOptionsDialogBase method to prevent modifying the tab list by signals from the stacked widget
-    void optionsStackedWidget_CurrentChanged( int indx ) override { Q_UNUSED( indx ) };
+    void optionsStackedWidget_CurrentChanged( int index ) override { Q_UNUSED( index ) };
 
     //! Only show plugins from selected repository (e.g. for inspection)
     void setRepositoryFilter();
diff --git a/src/gui/qgsoptionsdialogbase.cpp b/src/gui/qgsoptionsdialogbase.cpp
index e1784b8e100..3e223024f9b 100644
--- a/src/gui/qgsoptionsdialogbase.cpp
+++ b/src/gui/qgsoptionsdialogbase.cpp
@@ -356,24 +356,24 @@ void QgsOptionsDialogBase::updateOptionsListVerticalTabs()
     mOptListWidget->setWordWrap( true );
 }
 
-void QgsOptionsDialogBase::optionsStackedWidget_CurrentChanged( int indx )
+void QgsOptionsDialogBase::optionsStackedWidget_CurrentChanged( int index )
 {
   mOptListWidget->blockSignals( true );
-  mOptListWidget->setCurrentRow( indx );
+  mOptListWidget->setCurrentRow( index );
   mOptListWidget->blockSignals( false );
 
   updateWindowTitle();
 }
 
-void QgsOptionsDialogBase::optionsStackedWidget_WidgetRemoved( int indx )
+void QgsOptionsDialogBase::optionsStackedWidget_WidgetRemoved( int index )
 {
   // will need to take item first, if widgets are set for item in future
-  delete mOptListWidget->item( indx );
+  delete mOptListWidget->item( index );
 
   QList<QPair< QgsSearchHighlightOptionWidget *, int > >::iterator it = mRegisteredSearchWidgets.begin();
   while ( it != mRegisteredSearchWidgets.end() )
   {
-    if ( ( *it ).second == indx )
+    if ( ( *it ).second == index )
       it = mRegisteredSearchWidgets.erase( it );
     else
       ++it;
diff --git a/src/gui/qgsoptionsdialogbase.h b/src/gui/qgsoptionsdialogbase.h
index 707a4020996..1bd0bbeb774 100644
--- a/src/gui/qgsoptionsdialogbase.h
+++ b/src/gui/qgsoptionsdialogbase.h
@@ -159,8 +159,8 @@ class GUI_EXPORT QgsOptionsDialogBase : public QDialog
 
   protected slots:
     virtual void updateOptionsListVerticalTabs();
-    virtual void optionsStackedWidget_CurrentChanged( int indx );
-    virtual void optionsStackedWidget_WidgetRemoved( int indx );
+    virtual void optionsStackedWidget_CurrentChanged( int index );
+    virtual void optionsStackedWidget_WidgetRemoved( int index );
 
     void warnAboutMissingObjects();