diff --git a/etc/zebradb/lang_defs/en/sort-string.chr b/etc/zebradb/lang_defs/en/sort-string-utf.chr
similarity index 100%
rename from etc/zebradb/lang_defs/en/sort-string.chr
rename to etc/zebradb/lang_defs/en/sort-string-utf.chr
diff --git a/etc/zebradb/lang_defs/fr/sort-string.chr b/etc/zebradb/lang_defs/fr/sort-string-utf.chr
similarity index 100%
rename from etc/zebradb/lang_defs/fr/sort-string.chr
rename to etc/zebradb/lang_defs/fr/sort-string-utf.chr
diff --git a/etc/zebradb/marc_defs/marc21/authorities.abs b/etc/zebradb/marc_defs/marc21/authorities/record.abs
similarity index 100%
rename from etc/zebradb/marc_defs/marc21/authorities.abs
rename to etc/zebradb/marc_defs/marc21/authorities/record.abs
diff --git a/etc/zebradb/marc_defs/marc21/biblios.abs b/etc/zebradb/marc_defs/marc21/biblios/record.abs
similarity index 100%
rename from etc/zebradb/marc_defs/marc21/biblios.abs
rename to etc/zebradb/marc_defs/marc21/biblios/record.abs
diff --git a/etc/zebradb/marc_defs/unimarc/authorities.abs b/etc/zebradb/marc_defs/unimarc/authorities/record.abs
similarity index 100%
rename from etc/zebradb/marc_defs/unimarc/authorities.abs
rename to etc/zebradb/marc_defs/unimarc/authorities/record.abs
diff --git a/etc/zebradb/marc_defs/unimarc/biblios.abs b/etc/zebradb/marc_defs/unimarc/biblios/record.abs
similarity index 100%
rename from etc/zebradb/marc_defs/unimarc/biblios.abs
rename to etc/zebradb/marc_defs/unimarc/biblios/record.abs
diff --git a/etc/zebradb/zebra-authorities.cfg b/etc/zebradb/zebra-authorities.cfg
index 1d41a2c3bf..c9c6321afa 100644
--- a/etc/zebradb/zebra-authorities.cfg
+++ b/etc/zebradb/zebra-authorities.cfg
@@ -4,7 +4,7 @@
 # $Id: zebra.cfg,v 1.1.2.2 2006/05/09 12:03:16 rangi Exp $
 #
 # Where are the config files located?
-profilePath:__ZEBRA_CONF_DIR__/authorities/etc:__ZEBRA_CONF_DIR__/etc:__ZEBRA_CONF_DIR__/marc_defs/__ZEBRA_MARC_FORMAT__:__ZEBRA_CONF_DIR__/lang_defs/__ZEBRA_LANGUAGE__
+profilePath:__ZEBRA_CONF_DIR__/authorities/etc:__ZEBRA_CONF_DIR__/etc:__ZEBRA_CONF_DIR__/marc_defs/__ZEBRA_MARC_FORMAT__/authorities:__ZEBRA_CONF_DIR__/lang_defs/__ZEBRA_LANGUAGE__
 
 encoding: UTF-8
 # modulePath - where to look for loadable zebra modules
diff --git a/etc/zebradb/zebra-biblios.cfg b/etc/zebradb/zebra-biblios.cfg
index c2e045d21b..68a7830a35 100644
--- a/etc/zebradb/zebra-biblios.cfg
+++ b/etc/zebradb/zebra-biblios.cfg
@@ -3,7 +3,7 @@
 # $Id: zebra.cfg,v 1.1.2.2 2006/05/09 12:03:16 rangi Exp $
 #
 # Where are the config files located?
-profilePath:__ZEBRA_CONF_DIR__/biblios/etc:__ZEBRA_CONF_DIR__/etc:__ZEBRA_CONF_DIR__/marc_defs/__ZEBRA_MARC_FORMAT__:__ZEBRA_CONF_DIR__/lang_defs/__ZEBRA_LANGUAGE__
+profilePath:__ZEBRA_CONF_DIR__/biblios/etc:__ZEBRA_CONF_DIR__/etc:__ZEBRA_CONF_DIR__/marc_defs/__ZEBRA_MARC_FORMAT__/biblios:__ZEBRA_CONF_DIR__/lang_defs/__ZEBRA_LANGUAGE__
 # modulePath - where to look for loadable zebra modules
 modulePath: /usr/lib/idzebra-2.0/modules