diff --git a/src/ksieveui/autocreatescripts/sieveactions/sieveaction.h b/src/ksieveui/autocreatescripts/sieveactions/sieveaction.h
--- a/src/ksieveui/autocreatescripts/sieveactions/sieveaction.h
+++ b/src/ksieveui/autocreatescripts/sieveactions/sieveaction.h
@@ -56,7 +56,7 @@
 
     void unknownTag(const QStringRef &tag, QString &error);
     void unknownTagValue(const QString &tagValue, QString &error);
-    void tooManyArgument(const QStringRef &tagName, int index, int maxValue, QString &error);
+    void tooManyArguments(const QStringRef &tagName, int index, int maxValue, QString &error);
     void serverDoesNotSupportFeatures(const QString &feature, QString &error);
 
 protected:
diff --git a/src/ksieveui/autocreatescripts/sieveactions/sieveaction.cpp b/src/ksieveui/autocreatescripts/sieveactions/sieveaction.cpp
--- a/src/ksieveui/autocreatescripts/sieveactions/sieveaction.cpp
+++ b/src/ksieveui/autocreatescripts/sieveactions/sieveaction.cpp
@@ -134,7 +134,7 @@
     error += i18n("An unknown tag value \"%1\" was found during parsing action \"%2\".", tagValue, name()) + QLatin1Char('\n');
 }
 
-void SieveAction::tooManyArgument(const QStringRef &tagName, int index, int maxValue, QString &error)
+void SieveAction::tooManyArguments(const QStringRef &tagName, int index, int maxValue, QString &error)
 {
     error += i18n("Too many argument found for \"%1\", max value is %2, number of value found %3 for %4", name(), maxValue, index, *tagName.string()) + QLatin1Char('\n');
 }
diff --git a/src/ksieveui/autocreatescripts/sieveactions/sieveactionaddheader.cpp b/src/ksieveui/autocreatescripts/sieveactions/sieveactionaddheader.cpp
--- a/src/ksieveui/autocreatescripts/sieveactions/sieveactionaddheader.cpp
+++ b/src/ksieveui/autocreatescripts/sieveactions/sieveactionaddheader.cpp
@@ -83,7 +83,7 @@
                 QLineEdit *value = w->findChild<QLineEdit *>(QStringLiteral("valueedit"));
                 value->setText(AutoCreateScriptUtil::quoteStr(element.readElementText()));
             } else {
-                tooManyArgument(tagName, index, 2, error);
+                tooManyArguments(tagName, index, 2, error);
                 qCDebug(LIBKSIEVE_LOG) << " SieveActionAddHeader::setParamWidgetValue too many argument :" << index;
             }
             ++index;
diff --git a/src/ksieveui/autocreatescripts/sieveactions/sieveactionconvert.cpp b/src/ksieveui/autocreatescripts/sieveactions/sieveactionconvert.cpp
--- a/src/ksieveui/autocreatescripts/sieveactions/sieveactionconvert.cpp
+++ b/src/ksieveui/autocreatescripts/sieveactions/sieveactionconvert.cpp
@@ -81,7 +81,7 @@
                 SelectMimeTypeComboBox *toMimeType = w->findChild<SelectMimeTypeComboBox *>(QStringLiteral("to"));
                 toMimeType->setCode(element.readElementText(), name(), error);
             } else {
-                tooManyArgument(tagName, index, 2, error);
+                tooManyArguments(tagName, index, 2, error);
                 qCDebug(LIBKSIEVE_LOG) << " SieveActionConvert::setParamWidgetValue too many argument :" << index;
             }
             ++index;
diff --git a/src/ksieveui/autocreatescripts/sieveactions/sieveactiondeleteheader.cpp b/src/ksieveui/autocreatescripts/sieveactions/sieveactiondeleteheader.cpp
--- a/src/ksieveui/autocreatescripts/sieveactions/sieveactiondeleteheader.cpp
+++ b/src/ksieveui/autocreatescripts/sieveactions/sieveactiondeleteheader.cpp
@@ -92,7 +92,7 @@
                 QLineEdit *value = w->findChild<QLineEdit *>(QStringLiteral("valueedit"));
                 value->setText(element.readElementText());
             } else {
-                tooManyArgument(tagName, index, 2, error);
+                tooManyArguments(tagName, index, 2, error);
                 qCDebug(LIBKSIEVE_LOG) << " SieveActionAddHeader::setParamWidgetValue too many argument :" << index;
             }
             ++index;
diff --git a/src/ksieveui/autocreatescripts/sieveconditions/sievecondition.h b/src/ksieveui/autocreatescripts/sieveconditions/sievecondition.h
--- a/src/ksieveui/autocreatescripts/sieveconditions/sievecondition.h
+++ b/src/ksieveui/autocreatescripts/sieveconditions/sievecondition.h
@@ -57,8 +57,8 @@
 
     void unknownTag(const QStringRef &tag, QString &error);
     void unknownTagValue(const QString &tagValue, QString &error);
-    void tooManyArgument(const QStringRef &tagName, int index, int maxValue, QString &error);
-    void tooManyArgument(const QString &tagName, int index, int maxValue, QString &error);
+    void tooManyArguments(const QStringRef &tagName, int index, int maxValue, QString &error);
+    void tooManyArguments(const QString &tagName, int index, int maxValue, QString &error);
     void serverDoesNotSupportFeatures(const QString &feature, QString &error);
 
     QString comment() const;
diff --git a/src/ksieveui/autocreatescripts/sieveconditions/sievecondition.cpp b/src/ksieveui/autocreatescripts/sieveconditions/sievecondition.cpp
--- a/src/ksieveui/autocreatescripts/sieveconditions/sievecondition.cpp
+++ b/src/ksieveui/autocreatescripts/sieveconditions/sievecondition.cpp
@@ -108,14 +108,14 @@
     error += i18n("An unknown tag value \"%1\" was found during parsing condition \"%2\".", tagValue, name()) + QLatin1Char('\n');
 }
 
-void SieveCondition::tooManyArgument(const QString &tagName, int index, int maxValue, QString &error)
+void SieveCondition::tooManyArguments(const QString &tagName, int index, int maxValue, QString &error)
 {
     error += i18n("Too many argument found for \"%1\", max value is %2, number of value found %3 for %4", name(), maxValue, (index + 1), tagName) + QLatin1Char('\n');
 }
 
-void SieveCondition::tooManyArgument(const QStringRef &tagName, int index, int maxValue, QString &error)
+void SieveCondition::tooManyArguments(const QStringRef &tagName, int index, int maxValue, QString &error)
 {
-    tooManyArgument(tagName.toString(), index, maxValue, error);
+    tooManyArguments(tagName.toString(), index, maxValue, error);
 }
 
 void SieveCondition::serverDoesNotSupportFeatures(const QString &feature, QString &error)
diff --git a/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionaddress.cpp b/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionaddress.cpp
--- a/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionaddress.cpp
+++ b/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionaddress.cpp
@@ -126,7 +126,7 @@
                 AbstractRegexpEditorLineEdit *edit = w->findChild<AbstractRegexpEditorLineEdit *>(QStringLiteral("editaddress"));
                 edit->setCode(AutoCreateScriptUtil::quoteStr(element.readElementText()));
             } else {
-                tooManyArgument(tagName, indexStr, 2, error);
+                tooManyArguments(tagName, indexStr, 2, error);
                 qCDebug(LIBKSIEVE_LOG) << " SieveConditionAddress::setParamWidgetValue too many argument :" << index;
             }
             ++indexStr;
@@ -138,7 +138,7 @@
                 AbstractRegexpEditorLineEdit *edit = w->findChild<AbstractRegexpEditorLineEdit *>(QStringLiteral("editaddress"));
                 edit->setCode(AutoCreateScriptUtil::listValueToStr(element));
             } else {
-                tooManyArgument(tagName, indexStr, 2, error);
+                tooManyArguments(tagName, indexStr, 2, error);
                 qCDebug(LIBKSIEVE_LOG) << " SieveConditionAddress::setParamWidgetValue too many argument :" << index;
             }
             ++indexStr;
@@ -176,7 +176,7 @@
             selectAddressPart->setCode(AutoCreateScriptUtil::tagValue(lstTagValue.at(1)), name(), error);
         }
     } else if (lstTagValue.count() > 2) {
-        tooManyArgument(QStringLiteral("tag"), lstTagValue.count(), 2, error);
+        tooManyArguments(QStringLiteral("tag"), lstTagValue.count(), 2, error);
         qCDebug(LIBKSIEVE_LOG) << "SieveConditionAddress::setParamWidgetValue too many argument :" << lstTagValue.count();
     }
 
diff --git a/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionbody.cpp b/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionbody.cpp
--- a/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionbody.cpp
+++ b/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionbody.cpp
@@ -116,7 +116,7 @@
             } else if (index == 1) {
                 tagValueList << AutoCreateScriptUtil::tagValueWithCondition(tagValue, notCondition);
             } else {
-                tooManyArgument(tagName, index, 2, error);
+                tooManyArguments(tagName, index, 2, error);
                 qCDebug(LIBKSIEVE_LOG) << " SieveConditionBody::setParamWidgetValue too many argument " << index;
             }
             ++index;
diff --git a/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionconvert.cpp b/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionconvert.cpp
--- a/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionconvert.cpp
+++ b/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionconvert.cpp
@@ -120,7 +120,7 @@
                 SelectMimeTypeComboBox *toMimeType = w->findChild<SelectMimeTypeComboBox *>(QStringLiteral("to"));
                 toMimeType->setCode(element.readElementText(), name(), error);
             } else {
-                tooManyArgument(tagName, index, 2, error);
+                tooManyArguments(tagName, index, 2, error);
                 qCDebug(LIBKSIEVE_LOG) << " SieveActionConvert::setParamWidgetValue too many argument :" << index;
             }
             ++index;
diff --git a/src/ksieveui/autocreatescripts/sieveconditions/sieveconditioncurrentdate.cpp b/src/ksieveui/autocreatescripts/sieveconditions/sieveconditioncurrentdate.cpp
--- a/src/ksieveui/autocreatescripts/sieveconditions/sieveconditioncurrentdate.cpp
+++ b/src/ksieveui/autocreatescripts/sieveconditions/sieveconditioncurrentdate.cpp
@@ -104,7 +104,7 @@
             } else if (index == 1) {
                 value = element.readElementText();
             } else {
-                tooManyArgument(tagName, index, 2, error);
+                tooManyArguments(tagName, index, 2, error);
                 qCDebug(LIBKSIEVE_LOG) << " SieveConditionCurrentDate::setParamWidgetValue too many argument :" << index;
             }
             ++index;
diff --git a/src/ksieveui/autocreatescripts/sieveconditions/sieveconditiondate.cpp b/src/ksieveui/autocreatescripts/sieveconditions/sieveconditiondate.cpp
--- a/src/ksieveui/autocreatescripts/sieveconditions/sieveconditiondate.cpp
+++ b/src/ksieveui/autocreatescripts/sieveconditions/sieveconditiondate.cpp
@@ -121,7 +121,7 @@
             } else if (index == 2) {
                 value = element.readElementText();
             } else {
-                tooManyArgument(tagName, index, 3, error);
+                tooManyArguments(tagName, index, 3, error);
                 qCDebug(LIBKSIEVE_LOG) << " SieveConditionDate::setParamWidgetValue too many argument :" << index;
             }
             ++index;
diff --git a/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionenvelope.cpp b/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionenvelope.cpp
--- a/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionenvelope.cpp
+++ b/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionenvelope.cpp
@@ -141,7 +141,7 @@
                 SelectMatchTypeComboBox *selectMatchCombobox = w->findChild<SelectMatchTypeComboBox *>(QStringLiteral("matchtypecombobox"));
                 selectMatchCombobox->setCode(AutoCreateScriptUtil::tagValueWithCondition(tagValue, notCondition), name(), error);
             } else {
-                tooManyArgument(tagName, indexTag, 2, error);
+                tooManyArguments(tagName, indexTag, 2, error);
                 qCDebug(LIBKSIEVE_LOG) << "SieveConditionEnvelope::setParamWidgetValue too many argument :" << indexTag;
             }
             ++indexTag;
@@ -153,7 +153,7 @@
                 AbstractRegexpEditorLineEdit *edit = w->findChild<AbstractRegexpEditorLineEdit *>(QStringLiteral("editaddress"));
                 edit->setCode(AutoCreateScriptUtil::quoteStr(element.readElementText()));
             } else {
-                tooManyArgument(tagName, indexStr, 2, error);
+                tooManyArguments(tagName, indexStr, 2, error);
                 qCDebug(LIBKSIEVE_LOG) << "SieveConditionEnvelope::setParamWidgetValue too many argument indexStr " << indexStr;
             }
             ++indexStr;
diff --git a/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionenvironment.cpp b/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionenvironment.cpp
--- a/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionenvironment.cpp
+++ b/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionenvironment.cpp
@@ -119,7 +119,7 @@
                 QLineEdit *value = w->findChild<QLineEdit *>(QStringLiteral("value"));
                 value->setText(AutoCreateScriptUtil::quoteStr(element.readElementText()));
             } else {
-                tooManyArgument(tagName, index, 2, error);
+                tooManyArguments(tagName, index, 2, error);
                 qCDebug(LIBKSIEVE_LOG) << " SieveConditionEnvironment::setParamWidgetValue to many argument " << index;
             }
             ++index;
diff --git a/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionheader.cpp b/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionheader.cpp
--- a/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionheader.cpp
+++ b/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionheader.cpp
@@ -113,7 +113,7 @@
                 QString st = AutoCreateScriptUtil::quoteStr(element.readElementText(), true);
                 value->setCode(st);
             } else {
-                tooManyArgument(tagName, index, 2, error);
+                tooManyArguments(tagName, index, 2, error);
                 qCDebug(LIBKSIEVE_LOG) << " SieveConditionHeader::setParamWidgetValue too many argument " << index;
             }
             ++index;
@@ -126,7 +126,7 @@
                 AbstractRegexpEditorLineEdit *value = w->findChild<AbstractRegexpEditorLineEdit *>(QStringLiteral("value"));
                 value->setCode(AutoCreateScriptUtil::listValueToStr(element));
             } else {
-                tooManyArgument(tagName, index, 2, error);
+                tooManyArguments(tagName, index, 2, error);
                 qCDebug(LIBKSIEVE_LOG) << " SieveConditionHeader::setParamWidgetValue too many argument " << index;
             }
             ++index;
diff --git a/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionmetadata.cpp b/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionmetadata.cpp
--- a/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionmetadata.cpp
+++ b/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionmetadata.cpp
@@ -156,7 +156,7 @@
                 break;
             }
             default:
-                tooManyArgument(tagName, index, 3, error);
+                tooManyArguments(tagName, index, 3, error);
                 qCDebug(LIBKSIEVE_LOG) << " SieveConditionMetaData::setParamWidgetValue too many argument " << index;
                 break;
             }
diff --git a/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionmetadataexists.cpp b/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionmetadataexists.cpp
--- a/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionmetadataexists.cpp
+++ b/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionmetadataexists.cpp
@@ -105,7 +105,7 @@
                 QLineEdit *value = w->findChild<QLineEdit *>(QStringLiteral("value"));
                 value->setText(AutoCreateScriptUtil::quoteStr(tagValue));
             } else {
-                tooManyArgument(tagName, index, 2, error);
+                tooManyArguments(tagName, index, 2, error);
                 qCDebug(LIBKSIEVE_LOG) << " SieveConditionServerMetaDataExists::setParamWidgetValue to many attribute " << index;
             }
             ++index;
diff --git a/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionservermetadata.cpp b/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionservermetadata.cpp
--- a/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionservermetadata.cpp
+++ b/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionservermetadata.cpp
@@ -155,7 +155,7 @@
                 break;
             }
             default:
-                tooManyArgument(tagName, index, 3, error);
+                tooManyArguments(tagName, index, 3, error);
                 qCDebug(LIBKSIEVE_LOG) << " SieveConditionServerMetaData::setParamWidgetValue too many argument " << index;
                 break;
             }