diff --git a/source/net/yacy/cora/federate/solr/responsewriter/GSAResponseWriter.java b/source/net/yacy/cora/federate/solr/responsewriter/GSAResponseWriter.java
index 28641d2b7..9db3c7874 100644
--- a/source/net/yacy/cora/federate/solr/responsewriter/GSAResponseWriter.java
+++ b/source/net/yacy/cora/federate/solr/responsewriter/GSAResponseWriter.java
@@ -87,9 +87,9 @@ public class GSAResponseWriter implements QueryResponseWriter {
         };
     private static final Set<String> SOLR_FIELDS = new HashSet<String>();
     static {
-        field2tag.put(YaCySchema.language_s.name(), GSAToken.LANG.name());
+        field2tag.put(YaCySchema.language_s.getSolrFieldName(), GSAToken.LANG.name());
         SOLR_FIELDS.addAll(field2tag.keySet());
-        for (YaCySchema field: extrafields) SOLR_FIELDS.add(field.name());
+        for (YaCySchema field: extrafields) SOLR_FIELDS.add(field.getSolrFieldName());
     }
 
     private static class ResHead {
@@ -112,7 +112,7 @@ public class GSAResponseWriter implements QueryResponseWriter {
         }
         public String toSolr() {
             if ("date".equals(this.action)) {
-                return YaCySchema.last_modified.name() + " " + (("D".equals(this.direction) ? "desc" : "asc"));
+                return YaCySchema.last_modified.getSolrFieldName() + " " + (("D".equals(this.direction) ? "desc" : "asc"));
             }
             return null;
         }
@@ -231,50 +231,50 @@ public class GSAResponseWriter implements QueryResponseWriter {
                 }
 
                 // if the rule is not generic, use the specific here
-                if (YaCySchema.id.name().equals(fieldName)) {
+                if (YaCySchema.id.getSolrFieldName().equals(fieldName)) {
                     urlhash = value.stringValue();
                     continue;
                 }
-                if (YaCySchema.sku.name().equals(fieldName)) {
+                if (YaCySchema.sku.getSolrFieldName().equals(fieldName)) {
                     OpensearchResponseWriter.solitaireTag(writer, GSAToken.U.name(), value.stringValue());
                     OpensearchResponseWriter.solitaireTag(writer, GSAToken.UE.name(), value.stringValue());
                     continue;
                 }
-                if (YaCySchema.title.name().equals(fieldName)) {
+                if (YaCySchema.title.getSolrFieldName().equals(fieldName)) {
                     OpensearchResponseWriter.solitaireTag(writer, GSAToken.T.name(), highlight(value.stringValue(), query));
                     texts.add(value.stringValue());
                     continue;
                 }
-                if (YaCySchema.description.name().equals(fieldName)) {
+                if (YaCySchema.description.getSolrFieldName().equals(fieldName)) {
                     description = value.stringValue();
                     texts.add(description);
                     continue;
                 }
-                if (YaCySchema.last_modified.name().equals(fieldName)) {
+                if (YaCySchema.last_modified.getSolrFieldName().equals(fieldName)) {
                     Date d = new Date(Long.parseLong(value.stringValue()));
                     writer.write("<FS NAME=\"date\" VALUE=\"" + HeaderFramework.formatGSAFS(d) + "\"/>");
-                    //OpensearchResponseWriter.solitaireTag(writer, GSAToken.CACHE_LAST_MODIFIED.name(), HeaderFramework.formatRFC1123(d));
+                    //OpensearchResponseWriter.solitaireTag(writer, GSAToken.CACHE_LAST_MODIFIED.getSolrFieldName(), HeaderFramework.formatRFC1123(d));
                     texts.add(value.stringValue());
                     continue;
                 }
-                if (YaCySchema.load_date_dt.name().equals(fieldName)) {
+                if (YaCySchema.load_date_dt.getSolrFieldName().equals(fieldName)) {
                     Date d = new Date(Long.parseLong(value.stringValue()));
                     OpensearchResponseWriter.solitaireTag(writer, GSAToken.CRAWLDATE.name(), HeaderFramework.formatRFC1123(d));
                     texts.add(value.stringValue());
                     continue;
                 }
-                if (YaCySchema.text_t.name().equals(fieldName)) {
+                if (YaCySchema.text_t.getSolrFieldName().equals(fieldName)) {
                     texts.add(value.stringValue());
                     continue;
                 }
-                if (YaCySchema.h1_txt.name().equals(fieldName) || YaCySchema.h2_txt.name().equals(fieldName) ||
-                    YaCySchema.h3_txt.name().equals(fieldName) || YaCySchema.h4_txt.name().equals(fieldName) ||
-                    YaCySchema.h5_txt.name().equals(fieldName) || YaCySchema.h6_txt.name().equals(fieldName)) {
+                if (YaCySchema.h1_txt.getSolrFieldName().equals(fieldName) || YaCySchema.h2_txt.getSolrFieldName().equals(fieldName) ||
+                    YaCySchema.h3_txt.getSolrFieldName().equals(fieldName) || YaCySchema.h4_txt.getSolrFieldName().equals(fieldName) ||
+                    YaCySchema.h5_txt.getSolrFieldName().equals(fieldName) || YaCySchema.h6_txt.getSolrFieldName().equals(fieldName)) {
                     // because these are multi-valued fields, there can be several of each
                     texts.add(value.stringValue());
                     continue;
                 }
-                if (YaCySchema.size_i.name().equals(fieldName)) {
+                if (YaCySchema.size_i.getSolrFieldName().equals(fieldName)) {
                     size = value.stringValue() != null && value.stringValue().length() > 0 ? Integer.parseInt(value.stringValue()) : -1;
                     continue;
                 }
diff --git a/source/net/yacy/cora/federate/solr/responsewriter/JsonResponseWriter.java b/source/net/yacy/cora/federate/solr/responsewriter/JsonResponseWriter.java
index 456922f9b..7ec2b2521 100644
--- a/source/net/yacy/cora/federate/solr/responsewriter/JsonResponseWriter.java
+++ b/source/net/yacy/cora/federate/solr/responsewriter/JsonResponseWriter.java
@@ -56,9 +56,9 @@ public class JsonResponseWriter implements QueryResponseWriter {
     // define a list of simple YaCySchema -> json Token matchings
     private static final Map<String, String> field2tag = new HashMap<String, String>();
     static {
-        field2tag.put(YaCySchema.url_protocol_s.name(), "protocol");
-        field2tag.put(YaCySchema.host_s.name(), "host");
-        field2tag.put(YaCySchema.url_file_ext_s.name(), "ext");
+        field2tag.put(YaCySchema.url_protocol_s.getSolrFieldName(), "protocol");
+        field2tag.put(YaCySchema.host_s.getSolrFieldName(), "host");
+        field2tag.put(YaCySchema.url_file_ext_s.getSolrFieldName(), "ext");
     }
      
     private String title;
@@ -142,7 +142,7 @@ public class JsonResponseWriter implements QueryResponseWriter {
                 }
                 
                 // some special handling here
-                if (YaCySchema.sku.name().equals(fieldName)) {
+                if (YaCySchema.sku.getSolrFieldName().equals(fieldName)) {
                     String u = value.stringValue();
                     try {
                         url = new MultiProtocolURI(u);
@@ -151,31 +151,31 @@ public class JsonResponseWriter implements QueryResponseWriter {
                     } catch (MalformedURLException e) {}
                     continue;
                 }
-                if (YaCySchema.title.name().equals(fieldName)) {
+                if (YaCySchema.title.getSolrFieldName().equals(fieldName)) {
                     title = value.stringValue();
                     texts.add(title);
                     continue;
                 }
-                if (YaCySchema.description.name().equals(fieldName)) {
+                if (YaCySchema.description.getSolrFieldName().equals(fieldName)) {
                     description = value.stringValue();
                     texts.add(description);
                     continue;
                 }
-                if (YaCySchema.id.name().equals(fieldName)) {
+                if (YaCySchema.id.getSolrFieldName().equals(fieldName)) {
                     urlhash = value.stringValue();
                     solitaireTag(writer, "guid", urlhash);
                     continue;
                 }
-                if (YaCySchema.url_paths_sxt.name().equals(fieldName)) {
+                if (YaCySchema.url_paths_sxt.getSolrFieldName().equals(fieldName)) {
                     path.append('/').append(value.stringValue());
                     continue;
                 }
-                if (YaCySchema.last_modified.name().equals(fieldName)) {
+                if (YaCySchema.last_modified.getSolrFieldName().equals(fieldName)) {
                     Date d = new Date(Long.parseLong(value.stringValue()));
                     solitaireTag(writer, "pubDate", HeaderFramework.formatRFC1123(d));
                     continue;
                 }
-                if (YaCySchema.size_i.name().equals(fieldName)) {
+                if (YaCySchema.size_i.getSolrFieldName().equals(fieldName)) {
                     int size = value.stringValue() != null && value.stringValue().length() > 0 ? Integer.parseInt(value.stringValue()) : -1;
                     int sizekb = size / 1024;
                     int sizemb = sizekb / 1024;
@@ -183,13 +183,13 @@ public class JsonResponseWriter implements QueryResponseWriter {
                     solitaireTag(writer, "sizename", sizemb > 0 ? (Integer.toString(sizemb) + " mbyte") : sizekb > 0 ? (Integer.toString(sizekb) + " kbyte") : (Integer.toString(size) + " byte"));
                     continue;
                 }
-                if (YaCySchema.text_t.name().equals(fieldName)) {
+                if (YaCySchema.text_t.getSolrFieldName().equals(fieldName)) {
                     texts.add(value.stringValue());
                     continue;
                 }
-                if (YaCySchema.h1_txt.name().equals(fieldName) || YaCySchema.h2_txt.name().equals(fieldName) ||
-                    YaCySchema.h3_txt.name().equals(fieldName) || YaCySchema.h4_txt.name().equals(fieldName) ||
-                    YaCySchema.h5_txt.name().equals(fieldName) || YaCySchema.h6_txt.name().equals(fieldName)) {
+                if (YaCySchema.h1_txt.getSolrFieldName().equals(fieldName) || YaCySchema.h2_txt.getSolrFieldName().equals(fieldName) ||
+                    YaCySchema.h3_txt.getSolrFieldName().equals(fieldName) || YaCySchema.h4_txt.getSolrFieldName().equals(fieldName) ||
+                    YaCySchema.h5_txt.getSolrFieldName().equals(fieldName) || YaCySchema.h6_txt.getSolrFieldName().equals(fieldName)) {
                     // because these are multi-valued fields, there can be several of each
                     texts.add(value.stringValue());
                     continue;
@@ -211,11 +211,11 @@ public class JsonResponseWriter implements QueryResponseWriter {
         writer.write(",\n\"navigation\":[\n");
 
         @SuppressWarnings("unchecked")
-        NamedList<Integer> hosts = facetFields == null ? null : (NamedList<Integer>) facetFields.get(YaCySchema.host_s.name());
+        NamedList<Integer> hosts = facetFields == null ? null : (NamedList<Integer>) facetFields.get(YaCySchema.host_s.getSolrFieldName());
         @SuppressWarnings("unchecked")
-        NamedList<Integer> exts = facetFields == null ? null : (NamedList<Integer>) facetFields.get(YaCySchema.url_file_ext_s.name());
+        NamedList<Integer> exts = facetFields == null ? null : (NamedList<Integer>) facetFields.get(YaCySchema.url_file_ext_s.getSolrFieldName());
         @SuppressWarnings("unchecked")
-        NamedList<Integer> prots = facetFields == null ? null : (NamedList<Integer>) facetFields.get(YaCySchema.url_protocol_s.name());
+        NamedList<Integer> prots = facetFields == null ? null : (NamedList<Integer>) facetFields.get(YaCySchema.url_protocol_s.getSolrFieldName());
         
         writer.write("{\"facetname\":\"filetypes\",\"displayname\":\"Filetypes\",\"type\":\"String\",\"min\":\"0\",\"max\":\"0\",\"mean\":\"0\",\"elements\":[]},\n".toCharArray());
         writer.write("{\"facetname\":\"protocols\",\"displayname\":\"Protocol\",\"type\":\"String\",\"min\":\"0\",\"max\":\"0\",\"mean\":\"0\",\"elements\":[]},\n".toCharArray());
diff --git a/source/net/yacy/cora/federate/solr/responsewriter/OpensearchResponseWriter.java b/source/net/yacy/cora/federate/solr/responsewriter/OpensearchResponseWriter.java
index 979ad2266..b89833f38 100644
--- a/source/net/yacy/cora/federate/solr/responsewriter/OpensearchResponseWriter.java
+++ b/source/net/yacy/cora/federate/solr/responsewriter/OpensearchResponseWriter.java
@@ -59,11 +59,11 @@ public class OpensearchResponseWriter implements QueryResponseWriter {
         };
     static final Set<String> SOLR_FIELDS = new HashSet<String>();
     static {
-        field2tag.put(YaCySchema.sku.name(), RSSMessage.Token.link.name());
-        field2tag.put(YaCySchema.publisher_t.name(), DublinCore.Publisher.getURIref());
-        field2tag.put(YaCySchema.author.name(), DublinCore.Creator.getURIref());
+        field2tag.put(YaCySchema.sku.getSolrFieldName(), RSSMessage.Token.link.name());
+        field2tag.put(YaCySchema.publisher_t.getSolrFieldName(), DublinCore.Publisher.getURIref());
+        field2tag.put(YaCySchema.author.getSolrFieldName(), DublinCore.Creator.getURIref());
         SOLR_FIELDS.addAll(field2tag.keySet());
-        for (YaCySchema field: extrafields) SOLR_FIELDS.add(field.name());
+        for (YaCySchema field: extrafields) SOLR_FIELDS.add(field.getSolrFieldName());
     }
 
     private String title;
@@ -167,34 +167,34 @@ public class OpensearchResponseWriter implements QueryResponseWriter {
                 }
 
                 // if the rule is not generic, use the specific here
-                if (YaCySchema.id.name().equals(fieldName)) {
+                if (YaCySchema.id.getSolrFieldName().equals(fieldName)) {
                     urlhash = value.stringValue();
                     solitaireTag(writer, RSSMessage.Token.guid.name(), urlhash, "isPermaLink=\"false\"");
                     continue;
                 }
-                if (YaCySchema.title.name().equals(fieldName)) {
+                if (YaCySchema.title.getSolrFieldName().equals(fieldName)) {
                     title = value.stringValue();
                     texts.add(title);
                     continue;
                 }
-                if (YaCySchema.last_modified.name().equals(fieldName)) {
+                if (YaCySchema.last_modified.getSolrFieldName().equals(fieldName)) {
                     Date d = new Date(Long.parseLong(value.stringValue()));
                     solitaireTag(writer, RSSMessage.Token.pubDate.name(), HeaderFramework.formatRFC1123(d));
                     continue;
                 }
-                if (YaCySchema.description.name().equals(fieldName)) {
+                if (YaCySchema.description.getSolrFieldName().equals(fieldName)) {
                     description = value.stringValue();
                     solitaireTag(writer, DublinCore.Description.getURIref(), description);
                     texts.add(description);
                     continue;
                 }
-                if (YaCySchema.text_t.name().equals(fieldName)) {
+                if (YaCySchema.text_t.getSolrFieldName().equals(fieldName)) {
                     texts.add(value.stringValue());
                     continue;
                 }
-                if (YaCySchema.h1_txt.name().equals(fieldName) || YaCySchema.h2_txt.name().equals(fieldName) ||
-                    YaCySchema.h3_txt.name().equals(fieldName) || YaCySchema.h4_txt.name().equals(fieldName) ||
-                    YaCySchema.h5_txt.name().equals(fieldName) || YaCySchema.h6_txt.name().equals(fieldName)) {
+                if (YaCySchema.h1_txt.getSolrFieldName().equals(fieldName) || YaCySchema.h2_txt.getSolrFieldName().equals(fieldName) ||
+                    YaCySchema.h3_txt.getSolrFieldName().equals(fieldName) || YaCySchema.h4_txt.getSolrFieldName().equals(fieldName) ||
+                    YaCySchema.h5_txt.getSolrFieldName().equals(fieldName) || YaCySchema.h6_txt.getSolrFieldName().equals(fieldName)) {
                     // because these are multi-valued fields, there can be several of each
                     texts.add(value.stringValue());
                     continue;