diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 6006f43ef59..be1195b0564 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -157,6 +157,8 @@ Other Changes
 
 * SOLR-13086: Improve the error message reported by DocumentObjectBinder when a setter is not found (Gus Heck)
 
+* SOLR-12365: Renamed class Config to XmlConfigFile (David Smiley)
+
 ==================  7.7.0 ==================
 
 Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
diff --git a/solr/core/src/java/org/apache/solr/core/Config.java b/solr/core/src/java/org/apache/solr/core/Config.java
index 11a381e3937..6852c59916d 100644
--- a/solr/core/src/java/org/apache/solr/core/Config.java
+++ b/solr/core/src/java/org/apache/solr/core/Config.java
@@ -62,9 +62,9 @@ import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
 /**
- *
+ * Wrapper around an XML DOM object to provide convenient accessors to it.  Intended for XML config files.
  */
-public class Config {
+public class Config { // formerly simply "Config"
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
   private static final XMLErrorLogger xmllog = new XMLErrorLogger(log);
 
@@ -447,18 +447,21 @@ public class Config {
      String val = getVal(path, false);
      return val!=null ? Double.parseDouble(val) : def;
    }
-   
+
+  //TODO belongs on SolrXmlConfig?
    public Version getLuceneVersion(String path) {
      return parseLuceneVersionString(getVal(path, true));
    }
-   
+
+  //TODO belongs on SolrXmlConfig?
    public Version getLuceneVersion(String path, Version def) {
      String val = getVal(path, false);
      return val!=null ? parseLuceneVersionString(val) : def;
    }
   
   private static final AtomicBoolean versionWarningAlreadyLogged = new AtomicBoolean(false);
-  
+
+  //TODO belongs on SolrXmlConfig?
   public static final Version parseLuceneVersionString(final String matchVersion) {
     final Version version;
     try {