diff --git a/contrib/analyzers/common/src/java/org/apache/lucene/analysis/br/BrazilianAnalyzer.java b/contrib/analyzers/common/src/java/org/apache/lucene/analysis/br/BrazilianAnalyzer.java
index 81cbf032798..f4991dc7991 100644
--- a/contrib/analyzers/common/src/java/org/apache/lucene/analysis/br/BrazilianAnalyzer.java
+++ b/contrib/analyzers/common/src/java/org/apache/lucene/analysis/br/BrazilianAnalyzer.java
@@ -131,12 +131,10 @@ public final class BrazilianAnalyzer extends Analyzer {
    *          lucene compatibility version
    * @param stopwords
    *          a stopword set
-   * @param stemExclutionSet
-   *          a stemming exclusion set
    */
-  public BrazilianAnalyzer(Version matchVersion, Set<?> stopset,
+  public BrazilianAnalyzer(Version matchVersion, Set<?> stopwords,
       Set<?> stemExclusionSet) {
-    this(matchVersion, stopset);
+    this(matchVersion, stopwords);
     excltable = CharArraySet.unmodifiableSet(CharArraySet
         .copy(stemExclusionSet));
   }
diff --git a/contrib/analyzers/common/src/java/org/apache/lucene/analysis/cz/CzechAnalyzer.java b/contrib/analyzers/common/src/java/org/apache/lucene/analysis/cz/CzechAnalyzer.java
index 4af2858886e..c9e6eff8717 100644
--- a/contrib/analyzers/common/src/java/org/apache/lucene/analysis/cz/CzechAnalyzer.java
+++ b/contrib/analyzers/common/src/java/org/apache/lucene/analysis/cz/CzechAnalyzer.java
@@ -104,7 +104,7 @@ public final class CzechAnalyzer extends Analyzer {
 	/**
    * Builds an analyzer with the given stop words and stemming exclusion words
    * 
-   * @param matchversion
+   * @param matchVersion
    *          lucene compatibility version
    * @param stopwords
    *          a stopword set
diff --git a/contrib/analyzers/common/src/java/org/apache/lucene/analysis/de/GermanAnalyzer.java b/contrib/analyzers/common/src/java/org/apache/lucene/analysis/de/GermanAnalyzer.java
index 1dee9042bcb..6848106db0a 100644
--- a/contrib/analyzers/common/src/java/org/apache/lucene/analysis/de/GermanAnalyzer.java
+++ b/contrib/analyzers/common/src/java/org/apache/lucene/analysis/de/GermanAnalyzer.java
@@ -111,7 +111,7 @@ public class GermanAnalyzer extends Analyzer {
   /**
    * Builds an analyzer with the given stop words 
    * 
-   * @param matchversion
+   * @param matchVersion
    *          lucene compatibility version
    * @param stopwords
    *          a stopword set
@@ -123,11 +123,11 @@ public class GermanAnalyzer extends Analyzer {
   /**
    * Builds an analyzer with the given stop words
    * 
-   * @param matchversion
+   * @param matchVersion
    *          lucene compatibility version
    * @param stopwords
    *          a stopword set
-   * @param stemExclutionSet
+   * @param stemExclusionSet
    *          a stemming exclusion set
    */
   public GermanAnalyzer(Version matchVersion, Set<?> stopwords, Set<?> stemExclusionSet) {
diff --git a/contrib/analyzers/common/src/java/org/apache/lucene/analysis/el/GreekAnalyzer.java b/contrib/analyzers/common/src/java/org/apache/lucene/analysis/el/GreekAnalyzer.java
index c25ff6f2a4b..86f2b263673 100644
--- a/contrib/analyzers/common/src/java/org/apache/lucene/analysis/el/GreekAnalyzer.java
+++ b/contrib/analyzers/common/src/java/org/apache/lucene/analysis/el/GreekAnalyzer.java
@@ -87,7 +87,7 @@ public final class GreekAnalyzer extends Analyzer
     /**
      * Builds an analyzer with the given stop words 
      * 
-     * @param matchversion
+     * @param matchVersion
      *          lucene compatibility version
      * @param stopwords
      *          a stopword set
diff --git a/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fa/PersianAnalyzer.java b/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fa/PersianAnalyzer.java
index 2c782deaaa2..77c7bf5ef20 100644
--- a/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fa/PersianAnalyzer.java
+++ b/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fa/PersianAnalyzer.java
@@ -120,7 +120,7 @@ public final class PersianAnalyzer extends Analyzer {
   /**
    * Builds an analyzer with the given stop words 
    * 
-   * @param matchversion
+   * @param matchVersion
    *          lucene compatibility version
    * @param stopwords
    *          a stopword set
diff --git a/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fr/FrenchAnalyzer.java b/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fr/FrenchAnalyzer.java
index 5fd41ae0642..c2fd83b47b1 100644
--- a/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fr/FrenchAnalyzer.java
+++ b/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fr/FrenchAnalyzer.java
@@ -64,7 +64,7 @@ public final class FrenchAnalyzer extends Analyzer {
    * Extended list of typical French stopwords.
    * @deprecated use {@link #getDefaultStopSet()} instead
    */
-  // TODO make this final in 3.1
+  // TODO make this private in 3.1
   public final static String[] FRENCH_STOP_WORDS = {
     "a", "afin", "ai", "ainsi", "après", "attendu", "au", "aujourd", "auquel", "aussi",
     "autre", "autres", "aux", "auxquelles", "auxquels", "avait", "avant", "avec", "avoir",
@@ -126,7 +126,7 @@ public final class FrenchAnalyzer extends Analyzer {
   /**
    * Builds an analyzer with the given stop words
    * 
-   * @param matchversion
+   * @param matchVersion
    *          lucene compatibility version
    * @param stopwords
    *          a stopword set
@@ -138,7 +138,7 @@ public final class FrenchAnalyzer extends Analyzer {
   /**
    * Builds an analyzer with the given stop words
    * 
-   * @param matchversion
+   * @param matchVersion
    *          lucene compatibility version
    * @param stopwords
    *          a stopword set
diff --git a/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ru/RussianAnalyzer.java b/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ru/RussianAnalyzer.java
index 1485ec08cf2..72b3d7b94cd 100644
--- a/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ru/RussianAnalyzer.java
+++ b/contrib/analyzers/common/src/java/org/apache/lucene/analysis/ru/RussianAnalyzer.java
@@ -85,7 +85,7 @@ public final class RussianAnalyzer extends Analyzer
     /**
      * Builds an analyzer with the given stop words
      * 
-     * @param matchversion
+     * @param matchVersion
      *          lucene compatibility version
      * @param stopwords
      *          a stopword set