diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 043f7d44833..88c81975282 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -129,7 +129,9 @@ Upgrading from Solr 5.0
   
 * Tika's runtime dependency of 'jhighlight' was removed as the latter was found to 
   contain some LGPL-only code. Until that's resolved by Tika, you can download the
-  .jar yourself and place it under contrib/extraction/lib.  
+  .jar yourself and place it under contrib/extraction/lib.
+    
+* The _text catch-all field in data_driven_schema_configs has been renamed to _text_.
 
 Detailed Change List
 ----------------------
@@ -488,6 +490,9 @@ Other Changes
 * SOLR-7202: Remove deprecated string action types in Overseer and OverseerCollectionProcessor -
   "deletecollection", "createcollection", "reloadcollection", "removecollection", "removeshard".
   (Varun Thacker, shalin)
+  
+* SOLR-7290: Rename catchall _text field in data_driven_schema_configs
+  to _text_ (Steve Rowe) 
 
 ==================  5.0.0 ==================
 
diff --git a/solr/server/solr/configsets/data_driven_schema_configs/conf/managed-schema b/solr/server/solr/configsets/data_driven_schema_configs/conf/managed-schema
index f2f19d3543f..f3792d4783a 100644
--- a/solr/server/solr/configsets/data_driven_schema_configs/conf/managed-schema
+++ b/solr/server/solr/configsets/data_driven_schema_configs/conf/managed-schema
@@ -106,20 +106,20 @@
    -->
 
     <!-- In this data_driven_schema_configs configset, only three fields are pre-declared: 
-         id, _version_, and _text.  All other fields will be type guessed and added via the
+         id, _version_, and _text_.  All other fields will be type guessed and added via the
          "add-unknown-fields-to-the-schema" update request processor chain declared 
          in solrconfig.xml.
          
          Note that many dynamic fields are also defined - you can used them to specify a 
          field's type via field naming conventions - see below.
   
-  WARNING: The _text catch-all field will significantly increase your index size.
+  WARNING: The _text_ catch-all field will significantly increase your index size.
            If you don't need it, consider removing it and the corresponding copyField directive.
       -->
     <field name="id" type="string" indexed="true" stored="true" required="true" multiValued="false" />
     <field name="_version_" type="long" indexed="true" stored="true"/>
-    <field name="_text" type="text_general" indexed="true" stored="false" multiValued="true"/>
-    <copyField source="*" dest="_text"/>
+    <field name="_text_" type="text_general" indexed="true" stored="false" multiValued="true"/>
+    <copyField source="*" dest="_text_"/>
 
 
     <!-- Dynamic field definitions allow using convention over configuration
diff --git a/solr/server/solr/configsets/data_driven_schema_configs/conf/solrconfig.xml b/solr/server/solr/configsets/data_driven_schema_configs/conf/solrconfig.xml
index 12f05dbdb2a..d9c90001474 100644
--- a/solr/server/solr/configsets/data_driven_schema_configs/conf/solrconfig.xml
+++ b/solr/server/solr/configsets/data_driven_schema_configs/conf/solrconfig.xml
@@ -868,7 +868,7 @@
 
   <initParams path="/update/**,/query,/select,/tvrh,/elevate,/spell,/browse">
     <lst name="defaults">
-      <str name="df">_text</str>
+      <str name="df">_text_</str>
     </lst>
   </initParams>
 
@@ -889,7 +889,7 @@
     <lst name="defaults">
       <str name="lowernames">true</str>
       <str name="fmap.meta">ignored_</str>
-      <str name="fmap.content">_text</str>
+      <str name="fmap.content">_text_</str>
     </lst>
   </requestHandler>