diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/FileDictionary.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/FileDictionary.java
index 7d495182fb8..b0660a9e763 100644
--- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/FileDictionary.java
+++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/FileDictionary.java
@@ -67,7 +67,7 @@ public class FileDictionary implements Dictionary {
   /**
    * Creates a dictionary based on an inputstream.
    * Using {@link #DEFAULT_FIELD_DELIMITER} as the 
-   * field seperator in a line.
+   * field separator in a line.
    * <p>
    * NOTE: content is treated as UTF-8
    */
@@ -78,7 +78,7 @@ public class FileDictionary implements Dictionary {
   /**
    * Creates a dictionary based on a reader.
    * Using {@link #DEFAULT_FIELD_DELIMITER} as the 
-   * field seperator in a line.
+   * field separator in a line.
    */
   public FileDictionary(Reader reader) {
     this(reader, DEFAULT_FIELD_DELIMITER);
@@ -86,7 +86,7 @@ public class FileDictionary implements Dictionary {
   
   /**
    * Creates a dictionary based on a reader. 
-   * Using <code>fieldDelimiter</code> to seperate out the
+   * Using <code>fieldDelimiter</code> to separate out the
    * fields in a line.
    */
   public FileDictionary(Reader reader, String fieldDelimiter) {
@@ -96,7 +96,7 @@ public class FileDictionary implements Dictionary {
   
   /**
    * Creates a dictionary based on an inputstream.
-   * Using <code>fieldDelimiter</code> to seperate out the
+   * Using <code>fieldDelimiter</code> to separate out the
    * fields in a line.
    * <p>
    * NOTE: content is treated as UTF-8
diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/SuggestField.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/SuggestField.java
index e5bdda93a6c..7f06328ee1b 100644
--- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/SuggestField.java
+++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/SuggestField.java
@@ -38,7 +38,7 @@ import org.apache.lucene.util.BytesRef;
  * Besides the usual {@link org.apache.lucene.analysis.Analyzer}s,
  * {@link CompletionAnalyzer}
  * can be used to tune suggest field only parameters
- * (e.g. preserving token seperators, preserving position increments
+ * (e.g. preserving token separators, preserving position increments
  * when converting the token stream to an automaton)
  * </p>
  * <p>
diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/request/AnalyticsStats.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/request/AnalyticsStats.java
index a9cdef908a1..771aff7db5e 100644
--- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/request/AnalyticsStats.java
+++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/request/AnalyticsStats.java
@@ -76,7 +76,7 @@ public class AnalyticsStats {
     // Get filter to all docs
     Filter filter = docs.getTopFilter();
     
-    // Computing each Analytics Request Seperately
+    // Computing each Analytics Request Separately
     for( AnalyticsRequest areq : requests ){
       // The Accumulator which will control the statistics generation
       // for the entire analytics request
diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/XPathRecordReader.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/XPathRecordReader.java
index 69c6c57c7c0..311215cb295 100644
--- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/XPathRecordReader.java
+++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/XPathRecordReader.java
@@ -145,7 +145,7 @@ public class XPathRecordReader {
     if (!xpath.startsWith("/"))
       throw new RuntimeException("xpath must start with '/' : " + xpath);
     List<String> paths = splitEscapeQuote(xpath);
-    // deal with how split behaves when seperator starts a string!
+    // deal with how split behaves when separator starts a string!
     if ("".equals(paths.get(0).trim()))
       paths.remove(0);
     rootNode.build(paths, name, multiValued, isRecord, flags);
@@ -600,19 +600,19 @@ public class XPathRecordReader {
 
 
   /**
-   * The Xpath is split into segments using the '/' as a seperator. However
+   * The Xpath is split into segments using the '/' as a separator. However
    * this method deals with special cases where there is a slash '/' character
    * inside the attribute value e.g. x/@html='text/html'. We split by '/' but 
    * then reassemble things were the '/' appears within a quoted sub-string.
    *
-   * We have already enforced that the string must begin with a seperator. This
+   * We have already enforced that the string must begin with a separator. This
    * method depends heavily on how split behaves if the string starts with the
-   * seperator or if a sequence of multiple seperator's appear. 
+   * separator or if a sequence of multiple separator's appear. 
    */
   private static List<String> splitEscapeQuote(String str) {
     List<String> result = new LinkedList<>();
     String[] ss = str.split("/");
-    for (int i=0; i<ss.length; i++) { // i=1: skip seperator at start of string
+    for (int i=0; i<ss.length; i++) { // i=1: skip separator at start of string
       StringBuilder sb = new StringBuilder();
       int quoteCount = 0;
       while (true) {
diff --git a/solr/core/src/java/org/apache/solr/internal/csv/writer/CSVConfig.java b/solr/core/src/java/org/apache/solr/internal/csv/writer/CSVConfig.java
index 354bd3c9f3b..cc802b8b02a 100644
--- a/solr/core/src/java/org/apache/solr/internal/csv/writer/CSVConfig.java
+++ b/solr/core/src/java/org/apache/solr/internal/csv/writer/CSVConfig.java
@@ -44,7 +44,7 @@ public class CSVConfig {
     private int fill;
     /** The fill char. Defaults to a space */
     private char fillChar = ' ';
-    /** The seperator character. Defaults to , */
+    /** The separator character. Defaults to , */
     private char delimiter = ',';
     /** Should we ignore the delimiter. Defaults to false */
     private boolean ignoreDelimiter = false;
diff --git a/solr/core/src/java/org/apache/solr/internal/csv/writer/CSVConfigGuesser.java b/solr/core/src/java/org/apache/solr/internal/csv/writer/CSVConfigGuesser.java
index 26c8e3f3c86..d0577ff56ca 100644
--- a/solr/core/src/java/org/apache/solr/internal/csv/writer/CSVConfigGuesser.java
+++ b/solr/core/src/java/org/apache/solr/internal/csv/writer/CSVConfigGuesser.java
@@ -107,7 +107,7 @@ public class CSVConfigGuesser {
     
     protected void analyseLines(String[] lines) {
         guessFixedWidth(lines);
-        guessFieldSeperator(lines);
+        guessFieldSeparator(lines);
     }
     
     /**
@@ -130,16 +130,16 @@ public class CSVConfigGuesser {
     }
         
 
-    protected void guessFieldSeperator(String[] lines) {
+    protected void guessFieldSeparator(String[] lines) {
         if (config.isFixedWidth()) {
-            guessFixedWidthSeperator(lines);
+            guessFixedWidthSeparator(lines);
             return;
         }
         for (int i = 0; i < lines.length; i++) {
         }
     }
     
-    protected void guessFixedWidthSeperator(String[] lines) {
+    protected void guessFixedWidthSeparator(String[] lines) {
         // keep track of the fieldlength
         int previousMatch = -1;
         for (int i = 0; i < lines[0].length(); i++) {
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestRandomFlRTGCloud.java b/solr/core/src/test/org/apache/solr/cloud/TestRandomFlRTGCloud.java
index 140fd7ec7ce..492765a1390 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestRandomFlRTGCloud.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestRandomFlRTGCloud.java
@@ -384,7 +384,7 @@ public class TestRandomFlRTGCloud extends SolrCloudTestCase {
             params.add("id",id);
           }
         } else {
-          // add one or more comma seperated ids params
+          // add one or more comma separated ids params
           params.add(buildCommaSepParams(random(), "ids", idsToRequest));
         }
       }
@@ -941,7 +941,7 @@ public class TestRandomFlRTGCloud extends SolrCloudTestCase {
   }
 
   /**
-   * Given an ordered list of values to include in a (key) param, randomly groups them (ie: comma seperated) 
+   * Given an ordered list of values to include in a (key) param, randomly groups them (ie: comma separated) 
    * into actual param key=values which are returned as a new SolrParams instance
    */
   private static SolrParams buildCommaSepParams(final Random rand, final String key, Collection<String> values) {
diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java b/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
index af3dc83b677..54472670b62 100644
--- a/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
+++ b/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
@@ -932,7 +932,7 @@ public class ZkStateReader implements Closeable {
   public static String getBaseUrlForNodeName(final String nodeName, String urlScheme) {
     final int _offset = nodeName.indexOf("_");
     if (_offset < 0) {
-      throw new IllegalArgumentException("nodeName does not contain expected '_' seperator: " + nodeName);
+      throw new IllegalArgumentException("nodeName does not contain expected '_' separator: " + nodeName);
     }
     final String hostAndPort = nodeName.substring(0,_offset);
     try {
diff --git a/solr/solrj/src/java/org/apache/solr/common/util/JsonRecordReader.java b/solr/solrj/src/java/org/apache/solr/common/util/JsonRecordReader.java
index b9766fbb31d..4dafd39e869 100644
--- a/solr/solrj/src/java/org/apache/solr/common/util/JsonRecordReader.java
+++ b/solr/solrj/src/java/org/apache/solr/common/util/JsonRecordReader.java
@@ -501,7 +501,7 @@ public class JsonRecordReader {
    * <p>
    * We have already enforced that the string must begin with a separator. This
    * method depends heavily on how split behaves if the string starts with the
-   * seperator or if a sequence of multiple separators appear.
+   * separator or if a sequence of multiple separators appear.
    */
   private static List<String> splitEscapeQuote(String str) {
     List<String> result = new LinkedList<>();
diff --git a/solr/solrj/src/java/org/apache/solr/common/util/StrUtils.java b/solr/solrj/src/java/org/apache/solr/common/util/StrUtils.java
index 73135974b1e..a20c6e2af35 100644
--- a/solr/solrj/src/java/org/apache/solr/common/util/StrUtils.java
+++ b/solr/solrj/src/java/org/apache/solr/common/util/StrUtils.java
@@ -297,7 +297,7 @@ public class StrUtils {
 
   /**
    * writes chars from item to out, backslash escaping as needed based on separator -- 
-   * but does not append the seperator itself
+   * but does not append the separator itself
    */
   public static void appendEscapedTextToBuilder(StringBuilder out, 
                                                  String item,