Merge pull request #14370 from vespa-engine/hmusum/move-config-definitions-to-use-full-name-in-filename

Use full name in config definition file names

166 files changed, 43 insertions, 104 deletions

diff --git a/application/src/test/resources/configdefinitions/mock-application.def b/application/src/test/resources/configdefinitions/application.mock-application.def
index fa3a48bae96..fa3a48bae96 100644
--- a/application/src/test/resources/configdefinitions/mock-application.def
+++ b/application/src/test/resources/configdefinitions/application.mock-application.def
diff --git a/bundle-plugin-test/test-bundles/main/src/main/resources/configdefinitions/test.def b/bundle-plugin-test/test-bundles/main/src/main/resources/configdefinitions/example.test.def
index b4ba9ec518a..b4ba9ec518a 100644
--- a/bundle-plugin-test/test-bundles/main/src/main/resources/configdefinitions/test.def
+++ b/bundle-plugin-test/test-bundles/main/src/main/resources/configdefinitions/example.test.def
diff --git a/chain/CMakeLists.txt b/chain/CMakeLists.txt
index 3b5b5fd2c99..14909bc4ca1 100644
--- a/chain/CMakeLists.txt
+++ b/chain/CMakeLists.txt
@@ -1,2 +1,2 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-install_config_definition(src/main/resources/configdefinitions/chains.def container.core.chains.def)
+install_config_definitions(src/main/resources/configdefinitions)
diff --git a/chain/src/main/resources/configdefinitions/chains.def b/chain/src/main/resources/configdefinitions/container.core.chains.def
index 8520a8d6332..8520a8d6332 100644
--- a/chain/src/main/resources/configdefinitions/chains.def
+++ b/chain/src/main/resources/configdefinitions/container.core.chains.def
diff --git a/config-lib/src/test/resources/configdefinitions/maptypes.def b/config-lib/src/test/resources/configdefinitions/foo.maptypes.def
index 0e39c7ccdb9..0e39c7ccdb9 100644
--- a/config-lib/src/test/resources/configdefinitions/maptypes.def
+++ b/config-lib/src/test/resources/configdefinitions/foo.maptypes.def
diff --git a/config-lib/src/test/resources/configdefinitions/structtypes.def b/config-lib/src/test/resources/configdefinitions/foo.structtypes.def
index fe9d879fb64..fe9d879fb64 100644
--- a/config-lib/src/test/resources/configdefinitions/structtypes.def
+++ b/config-lib/src/test/resources/configdefinitions/foo.structtypes.def
diff --git a/config-lib/src/test/resources/configdefinitions/namespace-and-package.def b/config-lib/src/test/resources/configdefinitions/my.namespace.namespace-and-package.def
index 4e61d25f05f..4e61d25f05f 100644
--- a/config-lib/src/test/resources/configdefinitions/namespace-and-package.def
+++ b/config-lib/src/test/resources/configdefinitions/my.namespace.namespace-and-package.def
diff --git a/config-lib/src/test/resources/configdefinitions/namespace.def b/config-lib/src/test/resources/configdefinitions/my.namespace.namespace.def
index b1406fc1bc4..b1406fc1bc4 100644
--- a/config-lib/src/test/resources/configdefinitions/namespace.def
+++ b/config-lib/src/test/resources/configdefinitions/my.namespace.namespace.def
diff --git a/config-lib/src/test/resources/configdefinitions/app.def b/config-lib/src/test/resources/configdefinitions/test.app.def
index 78388998ef3..78388998ef3 100644
--- a/config-lib/src/test/resources/configdefinitions/app.def
+++ b/config-lib/src/test/resources/configdefinitions/test.app.def
diff --git a/config-lib/src/test/resources/configdefinitions/function-test.def b/config-lib/src/test/resources/configdefinitions/test.function-test.def
index 73681d95544..73681d95544 100644
--- a/config-lib/src/test/resources/configdefinitions/function-test.def
+++ b/config-lib/src/test/resources/configdefinitions/test.function-test.def
diff --git a/config-lib/src/test/resources/configdefinitions/int.def b/config-lib/src/test/resources/configdefinitions/test.int.def
index ea29b911fc4..ea29b911fc4 100755
--- a/config-lib/src/test/resources/configdefinitions/int.def
+++ b/config-lib/src/test/resources/configdefinitions/test.int.def
diff --git a/config-lib/src/test/resources/configdefinitions/restart.def b/config-lib/src/test/resources/configdefinitions/test.restart.def
index 4b28e5a5d95..4b28e5a5d95 100755
--- a/config-lib/src/test/resources/configdefinitions/restart.def
+++ b/config-lib/src/test/resources/configdefinitions/test.restart.def
diff --git a/config-model/src/test/cfg/admin/userconfigs/function-test.def b/config-model/src/test/cfg/admin/userconfigs/test.function-test.def
index 86a110c3413..86a110c3413 100644
--- a/config-model/src/test/cfg/admin/userconfigs/function-test.def
+++ b/config-model/src/test/cfg/admin/userconfigs/test.function-test.def
diff --git a/config-model/src/test/cfg/application/classes/attributes.def b/config-model/src/test/cfg/application/classes/vespa.config.search.attributes.def
index c8e51c391f7..c8e51c391f7 100644
--- a/config-model/src/test/cfg/application/classes/attributes.def
+++ b/config-model/src/test/cfg/application/classes/vespa.config.search.attributes.def
diff --git a/config-model/src/test/cfg/application/configdeftest/configdefinitions/foo.def b/config-model/src/test/cfg/application/configdeftest/configdefinitions/config.foo.def
index c37aafd6fc4..c37aafd6fc4 100644
--- a/config-model/src/test/cfg/application/configdeftest/configdefinitions/foo.def
+++ b/config-model/src/test/cfg/application/configdeftest/configdefinitions/config.foo.def
diff --git a/config-model/src/test/cfg/application/configdeftest/configdefinitions/xyzzy.def b/config-model/src/test/cfg/application/configdeftest/configdefinitions/config.xyzzy.def
index c37aafd6fc4..c37aafd6fc4 100644
--- a/config-model/src/test/cfg/application/configdeftest/configdefinitions/xyzzy.def
+++ b/config-model/src/test/cfg/application/configdeftest/configdefinitions/config.xyzzy.def
diff --git a/config-model/src/test/cfg/application/configdeftest/configdefinitions/qux.foo.def b/config-model/src/test/cfg/application/configdeftest/configdefinitions/qux.qux.foo.def
index 1ff4daea194..1ff4daea194 100644
--- a/config-model/src/test/cfg/application/configdeftest/configdefinitions/qux.foo.def
+++ b/config-model/src/test/cfg/application/configdeftest/configdefinitions/qux.qux.foo.def
diff --git a/config-model/src/test/cfg/application/configdeftest/configdefinitions/xyzzy.bar.def b/config-model/src/test/cfg/application/configdeftest/configdefinitions/xyzzy.bar.def
index d4ef225830a..e1d5e8341e7 100644
--- a/config-model/src/test/cfg/application/configdeftest/configdefinitions/xyzzy.bar.def
+++ b/config-model/src/test/cfg/application/configdeftest/configdefinitions/xyzzy.bar.def
@@ -1,4 +1,3 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 namespace=xyzzy
-bar int default="2"
-foo int
+bar int default="1"
diff --git a/config-model/src/test/cfg/application/configdeftest/configdefinitions/baz.def b/config-model/src/test/cfg/application/configdeftest/configdefinitions/xyzzy.baz.def
index c30d4b36ad3..c30d4b36ad3 100644
--- a/config-model/src/test/cfg/application/configdeftest/configdefinitions/baz.def
+++ b/config-model/src/test/cfg/application/configdeftest/configdefinitions/xyzzy.baz.def
diff --git a/config-model/src/test/cfg/application/configdeftest/configdefinitions/bar.def b/config-model/src/test/cfg/application/configdeftest/configdefinitions/xyzzy.xyzzy.bar.def
index e1d5e8341e7..d4ef225830a 100644
--- a/config-model/src/test/cfg/application/configdeftest/configdefinitions/bar.def
+++ b/config-model/src/test/cfg/application/configdeftest/configdefinitions/xyzzy.xyzzy.bar.def
@@ -1,3 +1,4 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 namespace=xyzzy
-bar int default="1"
+bar int default="2"
+foo int
diff --git a/config-model/src/test/cfg/application/serverdefs/attributes.def b/config-model/src/test/cfg/application/serverdefs/vespa.config.search.attributes.def
index 0bb16fb8079..0bb16fb8079 100644
--- a/config-model/src/test/cfg/application/serverdefs/attributes.def
+++ b/config-model/src/test/cfg/application/serverdefs/vespa.config.search.attributes.def
diff --git a/config-model/src/test/derived/music/defs/documentmanager.def b/config-model/src/test/derived/music/defs/document.config.documentmanager.def
index fa52e08a1de..fa52e08a1de 100644
--- a/config-model/src/test/derived/music/defs/documentmanager.def
+++ b/config-model/src/test/derived/music/defs/document.config.documentmanager.def
diff --git a/config-model/src/test/derived/music/defs/extra.def b/config-model/src/test/derived/music/defs/test.extra.def
index 3c3eaa51ab5..3c3eaa51ab5 100644
--- a/config-model/src/test/derived/music/defs/extra.def
+++ b/config-model/src/test/derived/music/defs/test.extra.def
diff --git a/config-model/src/test/derived/music/defs/attributes.def b/config-model/src/test/derived/music/defs/vespa.config.search.attributes.def
index c8e51c391f7..c8e51c391f7 100644
--- a/config-model/src/test/derived/music/defs/attributes.def
+++ b/config-model/src/test/derived/music/defs/vespa.config.search.attributes.def
diff --git a/config-model/src/test/derived/music/defs/rank-profiles.def b/config-model/src/test/derived/music/defs/vespa.config.search.rank-profiles.def
index 03037865bb9..03037865bb9 100644
--- a/config-model/src/test/derived/music/defs/rank-profiles.def
+++ b/config-model/src/test/derived/music/defs/vespa.config.search.rank-profiles.def
diff --git a/config-model/src/test/derived/music/defs/summarymap.def b/config-model/src/test/derived/music/defs/vespa.config.search.summarymap.def
index a994309e207..a994309e207 100644
--- a/config-model/src/test/derived/music/defs/summarymap.def
+++ b/config-model/src/test/derived/music/defs/vespa.config.search.summarymap.def
diff --git a/config-model/src/test/derived/music/defs/ilscripts.def b/config-model/src/test/derived/music/defs/vespa.configdefinition.ilscripts.def
index 1147fd6469d..1147fd6469d 100644
--- a/config-model/src/test/derived/music/defs/ilscripts.def
+++ b/config-model/src/test/derived/music/defs/vespa.configdefinition.ilscripts.def
diff --git a/config-model/src/test/derived/newrank/defs/documentmanager.def b/config-model/src/test/derived/newrank/defs/document.config.documentmanager.def
index fa52e08a1de..fa52e08a1de 100644
--- a/config-model/src/test/derived/newrank/defs/documentmanager.def
+++ b/config-model/src/test/derived/newrank/defs/document.config.documentmanager.def
diff --git a/config-model/src/test/derived/newrank/defs/extra.def b/config-model/src/test/derived/newrank/defs/test.extra.def
index 3c3eaa51ab5..3c3eaa51ab5 100644
--- a/config-model/src/test/derived/newrank/defs/extra.def
+++ b/config-model/src/test/derived/newrank/defs/test.extra.def
diff --git a/config-model/src/test/derived/newrank/defs/attributes.def b/config-model/src/test/derived/newrank/defs/vespa.config.search.attributes.def
index c8e51c391f7..c8e51c391f7 100644
--- a/config-model/src/test/derived/newrank/defs/attributes.def
+++ b/config-model/src/test/derived/newrank/defs/vespa.config.search.attributes.def
diff --git a/config-model/src/test/derived/newrank/defs/rank-profiles.def b/config-model/src/test/derived/newrank/defs/vespa.config.search.rank-profiles.def
index 03037865bb9..03037865bb9 100644
--- a/config-model/src/test/derived/newrank/defs/rank-profiles.def
+++ b/config-model/src/test/derived/newrank/defs/vespa.config.search.rank-profiles.def
diff --git a/config-model/src/test/derived/newrank/defs/summarymap.def b/config-model/src/test/derived/newrank/defs/vespa.config.search.summarymap.def
index 3f98c2b40eb..3f98c2b40eb 100644
--- a/config-model/src/test/derived/newrank/defs/summarymap.def
+++ b/config-model/src/test/derived/newrank/defs/vespa.config.search.summarymap.def
diff --git a/config-model/src/test/derived/newrank/defs/ilscripts.def b/config-model/src/test/derived/newrank/defs/vespa.configdefinition.ilscripts.def
index 1147fd6469d..1147fd6469d 100644
--- a/config-model/src/test/derived/newrank/defs/ilscripts.def
+++ b/config-model/src/test/derived/newrank/defs/vespa.configdefinition.ilscripts.def
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomConfigPayloadBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomConfigPayloadBuilderTest.java
index a62255c4c5c..6f876450a2d 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomConfigPayloadBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomConfigPayloadBuilderTest.java
@@ -270,7 +270,7 @@ public class DomConfigPayloadBuilderTest {
                 "<longval>invalid</longval>" +
                 "</config>");
         DefParser defParser = new DefParser("simpletypes",
-                new FileReader(new File("src/test/resources/configdefinitions/simpletypes.def")));
+                new FileReader(new File("src/test/resources/configdefinitions/test.simpletypes.def")));
         ConfigDefinition def = ConfigDefinitionBuilder.createConfigDefinition(defParser.getTree());
         ConfigPayloadBuilder builder =  new DomConfigPayloadBuilder(def).build(configRoot);
         //assertThat(builder.warnings().size(), is(1));
diff --git a/config-model/src/test/resources/configdefinitions/anotherrestart.def b/config-model/src/test/resources/configdefinitions/test.anotherrestart.def
index 01da11e7c45..01da11e7c45 100644
--- a/config-model/src/test/resources/configdefinitions/anotherrestart.def
+++ b/config-model/src/test/resources/configdefinitions/test.anotherrestart.def
diff --git a/config-model/src/test/resources/configdefinitions/arraytypes.def b/config-model/src/test/resources/configdefinitions/test.arraytypes.def
index 8add790c6cb..8add790c6cb 100644
--- a/config-model/src/test/resources/configdefinitions/arraytypes.def
+++ b/config-model/src/test/resources/configdefinitions/test.arraytypes.def
diff --git a/config-model/src/test/resources/configdefinitions/function-test.def b/config-model/src/test/resources/configdefinitions/test.function-test.def
index 4208f7ab906..4208f7ab906 100644
--- a/config-model/src/test/resources/configdefinitions/function-test.def
+++ b/config-model/src/test/resources/configdefinitions/test.function-test.def
diff --git a/config-model/src/test/resources/configdefinitions/nonrestart.def b/config-model/src/test/resources/configdefinitions/test.nonrestart.def
index b9b1227349a..b9b1227349a 100644
--- a/config-model/src/test/resources/configdefinitions/nonrestart.def
+++ b/config-model/src/test/resources/configdefinitions/test.nonrestart.def
diff --git a/config-model/src/test/resources/configdefinitions/restart.def b/config-model/src/test/resources/configdefinitions/test.restart.def
index a0826edf881..a0826edf881 100644
--- a/config-model/src/test/resources/configdefinitions/restart.def
+++ b/config-model/src/test/resources/configdefinitions/test.restart.def
diff --git a/config-model/src/test/resources/configdefinitions/simpletypes.def b/config-model/src/test/resources/configdefinitions/test.simpletypes.def
index b54ea43435d..b54ea43435d 100644
--- a/config-model/src/test/resources/configdefinitions/simpletypes.def
+++ b/config-model/src/test/resources/configdefinitions/test.simpletypes.def
diff --git a/config-model/src/test/resources/configdefinitions/standard.def b/config-model/src/test/resources/configdefinitions/test.standard.def
index b06e858d391..b06e858d391 100644
--- a/config-model/src/test/resources/configdefinitions/standard.def
+++ b/config-model/src/test/resources/configdefinitions/test.standard.def
diff --git a/config-provisioning/CMakeLists.txt b/config-provisioning/CMakeLists.txt
index 73101f8a7a6..ee0bc7f1bae 100644
--- a/config-provisioning/CMakeLists.txt
+++ b/config-provisioning/CMakeLists.txt
@@ -1,4 +1,3 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 install_fat_java_artifact(config-provisioning)
-install_config_definition(src/main/resources/configdefinitions/flavors.def config.provisioning.flavors.def)
-install_config_definition(src/main/resources/configdefinitions/node-repository.def config.provisioning.node-repository.def)
+install_config_definitions(src/main/resources/configdefinitions)
diff --git a/config-provisioning/src/main/resources/configdefinitions/cloud.def b/config-provisioning/src/main/resources/configdefinitions/config.provisioning.cloud.def
index 36523482ab2..36523482ab2 100644
--- a/config-provisioning/src/main/resources/configdefinitions/cloud.def
+++ b/config-provisioning/src/main/resources/configdefinitions/config.provisioning.cloud.def
diff --git a/config-provisioning/src/main/resources/configdefinitions/flavors.def b/config-provisioning/src/main/resources/configdefinitions/config.provisioning.flavors.def
index c5040c58b74..c5040c58b74 100644
--- a/config-provisioning/src/main/resources/configdefinitions/flavors.def
+++ b/config-provisioning/src/main/resources/configdefinitions/config.provisioning.flavors.def
diff --git a/config-provisioning/src/main/resources/configdefinitions/node-repository.def b/config-provisioning/src/main/resources/configdefinitions/config.provisioning.node-repository.def
index 8ea9265aa23..8ea9265aa23 100644
--- a/config-provisioning/src/main/resources/configdefinitions/node-repository.def
+++ b/config-provisioning/src/main/resources/configdefinitions/config.provisioning.node-repository.def
diff --git a/config/src/test/java/com/yahoo/vespa/config/util/ConfigUtilsTest.java b/config/src/test/java/com/yahoo/vespa/config/util/ConfigUtilsTest.java
index 190c7479ee7..0276f3c4f1c 100644
--- a/config/src/test/java/com/yahoo/vespa/config/util/ConfigUtilsTest.java
+++ b/config/src/test/java/com/yahoo/vespa/config/util/ConfigUtilsTest.java
@@ -214,7 +214,7 @@ public class ConfigUtilsTest {
         assertThat(def.getNamespace(), is("foo"));
 
         try {
-            byte[] content = IOUtils.readFileBytes(new File("src/test/resources/configs/def-files-nogen/foo.bar.app.def"));
+            byte[] content = IOUtils.readFileBytes(new File("src/test/resources/configs/def-files-nogen/app.def"));
             def = ConfigUtils.createConfigDefinitionKeyFromDefContent("app", content);
         } catch (IOException e) {
             fail();
diff --git a/config/src/test/resources/configs/def-files-nogen/foo.bar.app.def b/config/src/test/resources/configs/def-files-nogen/app.def
index 6082072695a..6082072695a 100644
--- a/config/src/test/resources/configs/def-files-nogen/foo.bar.app.def
+++ b/config/src/test/resources/configs/def-files-nogen/app.def
diff --git a/config_test/src/main/resources/configdefinitions/greeting.def b/config_test/src/main/resources/configdefinitions/configtest.greeting.def
index 924c1331e2c..924c1331e2c 100644
--- a/config_test/src/main/resources/configdefinitions/greeting.def
+++ b/config_test/src/main/resources/configdefinitions/configtest.greeting.def
diff --git a/configgen/src/test/java/com/yahoo/config/codegen/DefParserTest.java b/configgen/src/test/java/com/yahoo/config/codegen/DefParserTest.java
index 1c381e7c398..8e52c1b4ece 100644
--- a/configgen/src/test/java/com/yahoo/config/codegen/DefParserTest.java
+++ b/configgen/src/test/java/com/yahoo/config/codegen/DefParserTest.java
@@ -20,7 +20,7 @@ import java.io.*;
 public class DefParserTest {
 
     private static final String TEST_DIR = "target/test-classes/";
-    private static final String DEF_NAME = TEST_DIR + "allfeatures.def";
+    private static final String DEF_NAME = TEST_DIR + "configgen.allfeatures.def";
 
     @Test
     public void testTraverseTree() throws IOException {
@@ -61,7 +61,7 @@ public class DefParserTest {
 
     @Test
     public void testFileWithNamespaceInFilename() throws IOException {
-        File defFile = new File(TEST_DIR + "bar.foo.def");
+        File defFile = new File(TEST_DIR + "baz.bar.foo.def");
         CNode root = new DefParser("test", new FileReader(defFile)).getTree();
         assertThat(root.defMd5, is("31a0f9bda0e5ff929762a29569575a7e"));
     }
diff --git a/configgen/src/test/java/com/yahoo/config/codegen/JavaClassBuilderTest.java b/configgen/src/test/java/com/yahoo/config/codegen/JavaClassBuilderTest.java
index 11da88a12fa..66ebf38ed9a 100644
--- a/configgen/src/test/java/com/yahoo/config/codegen/JavaClassBuilderTest.java
+++ b/configgen/src/test/java/com/yahoo/config/codegen/JavaClassBuilderTest.java
@@ -25,7 +25,7 @@ import static org.junit.Assert.fail;
 public class JavaClassBuilderTest {
 
     private static final String TEST_DIR = "target/test-classes/";
-    private static final String DEF_NAME = TEST_DIR + "allfeatures.def";
+    private static final String DEF_NAME = TEST_DIR + "configgen.allfeatures.def";
     private static final String REFERENCE_NAME = TEST_DIR + "allfeatures.reference";
 
     @Ignore
diff --git a/configgen/src/test/java/com/yahoo/config/codegen/MakeConfigTest.java b/configgen/src/test/java/com/yahoo/config/codegen/MakeConfigTest.java
index 7486d464e43..2a2b65e97a7 100644
--- a/configgen/src/test/java/com/yahoo/config/codegen/MakeConfigTest.java
+++ b/configgen/src/test/java/com/yahoo/config/codegen/MakeConfigTest.java
@@ -46,18 +46,18 @@ public class MakeConfigTest {
         System.setProperty("config.dumpTree", "true");
         System.setProperty("config.useFramework", "true");
         System.setProperty("config.dest", dest.getAbsolutePath());
-        System.setProperty("config.spec", "src/test/resources/allfeatures.def");
+        System.setProperty("config.spec", "src/test/resources/configgen.allfeatures.def");
         MakeConfigProperties p = new MakeConfigProperties();
         assertEquals(p.destDir.getAbsolutePath(), dest.getAbsolutePath());
         assertTrue(p.dumpTree);
         assertTrue(p.generateFrameworkCode);
         assertEquals(p.specFiles.length, 1);
-        assertEquals(p.specFiles[0].getAbsolutePath(), new File("src/test/resources/allfeatures.def").getAbsolutePath());
+        assertEquals(p.specFiles[0].getAbsolutePath(), new File("src/test/resources/configgen.allfeatures.def").getAbsolutePath());
         
         System.setProperty("config.dumpTree", "false");
         System.setProperty("config.useFramework", "false");
         System.setProperty("config.dest", dest.getAbsolutePath());
-        System.setProperty("config.spec", "src/test/resources/allfeatures.def,src/test/resources/bar.foo.def");
+        System.setProperty("config.spec", "src/test/resources/configgen.allfeatures.def,src/test/resources/baz.bar.foo.def");
         p = new MakeConfigProperties();
         assertEquals(p.destDir.getAbsolutePath(), dest.getAbsolutePath());
         assertFalse(p.dumpTree);
@@ -66,11 +66,11 @@ public class MakeConfigTest {
     }
 
     @Test
-    public void testMake() throws IOException, InterruptedException {
+    public void testMake() throws IOException {
         System.setProperty("config.dumpTree", "true");
         System.setProperty("config.useFramework", "true");
         System.setProperty("config.dest", dest.getAbsolutePath());
-        System.setProperty("config.spec", "src/test/resources/allfeatures.def");
+        System.setProperty("config.spec", "src/test/resources/configgen.allfeatures.def");
         MakeConfig.main(new String[]{});
     }
     
diff --git a/configgen/src/test/java/com/yahoo/config/codegen/NormalizedDefinitionTest.java b/configgen/src/test/java/com/yahoo/config/codegen/NormalizedDefinitionTest.java
index 9cda4cfbb1c..343551c43de 100644
--- a/configgen/src/test/java/com/yahoo/config/codegen/NormalizedDefinitionTest.java
+++ b/configgen/src/test/java/com/yahoo/config/codegen/NormalizedDefinitionTest.java
@@ -53,7 +53,7 @@ public class NormalizedDefinitionTest {
     public void testNormalizingFromFile() throws IOException {
         FileReader fileReader = null;
         try {
-            fileReader = new FileReader("src/test/resources/allfeatures.def");
+            fileReader = new FileReader("src/test/resources/configgen.allfeatures.def");
         } catch (FileNotFoundException e) {
             e.printStackTrace();
         }
diff --git a/configgen/src/test/resources/bar.foo.def b/configgen/src/test/resources/baz.bar.foo.def
index e0084b792a5..e0084b792a5 100644
--- a/configgen/src/test/resources/bar.foo.def
+++ b/configgen/src/test/resources/baz.bar.foo.def
diff --git a/configgen/src/test/resources/allfeatures.def b/configgen/src/test/resources/configgen.allfeatures.def
index fb627f614d6..fb627f614d6 100644
--- a/configgen/src/test/resources/allfeatures.def
+++ b/configgen/src/test/resources/configgen.allfeatures.def
diff --git a/configserver/src/test/apps/serverdb/serverdefs/attributes.def b/configserver/src/test/apps/serverdb/serverdefs/config.attributes.def
index 89671b57046..89671b57046 100644
--- a/configserver/src/test/apps/serverdb/serverdefs/attributes.def
+++ b/configserver/src/test/apps/serverdb/serverdefs/config.attributes.def
diff --git a/configserver/src/test/apps/zkfeed/configdefinitions/a.b.test2.def b/configserver/src/test/apps/zkfeed/configdefinitions/a.b.a.b.test2.def
index 9e5c787df09..9e5c787df09 100644
--- a/configserver/src/test/apps/zkfeed/configdefinitions/a.b.test2.def
+++ b/configserver/src/test/apps/zkfeed/configdefinitions/a.b.a.b.test2.def
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/MiscTestCase.java b/configserver/src/test/java/com/yahoo/vespa/config/server/MiscTestCase.java
index 4df39f72ce9..3da7d180e35 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/MiscTestCase.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/MiscTestCase.java
@@ -32,8 +32,8 @@ public class MiscTestCase {
     @Test
     public void testGetDefMd5() throws IOException {
         String defDir = "src/test/resources/configdefinitions/";
-        assertEquals(AppConfig.CONFIG_DEF_MD5, ConfigUtils.getDefMd5(file2lines(new File(defDir + "app.def"))));
-        assertEquals(Md5testConfig.CONFIG_DEF_MD5, ConfigUtils.getDefMd5(file2lines(new File(defDir + "md5test.def"))));
+        assertEquals(AppConfig.CONFIG_DEF_MD5, ConfigUtils.getDefMd5(file2lines(new File(defDir + "config.app.def"))));
+        assertEquals(Md5testConfig.CONFIG_DEF_MD5, ConfigUtils.getDefMd5(file2lines(new File(defDir + "config.md5test.def"))));
     }
 
     private static List<String> file2lines(File file) throws IOException {
diff --git a/configserver/src/test/resources/configdefinitions/app.def b/configserver/src/test/resources/configdefinitions/config.app.def
index 7c7bb58b3a6..7c7bb58b3a6 100644
--- a/configserver/src/test/resources/configdefinitions/app.def
+++ b/configserver/src/test/resources/configdefinitions/config.app.def
diff --git a/configserver/src/test/resources/configdefinitions/md5test.def b/configserver/src/test/resources/configdefinitions/config.md5test.def
index 1c6eae0e587..1c6eae0e587 100644
--- a/configserver/src/test/resources/configdefinitions/md5test.def
+++ b/configserver/src/test/resources/configdefinitions/config.md5test.def
diff --git a/configserver/src/test/resources/configdefinitions/simpletypes.def b/configserver/src/test/resources/configdefinitions/config.simpletypes.def
index 569df41c97d..569df41c97d 100644
--- a/configserver/src/test/resources/configdefinitions/simpletypes.def
+++ b/configserver/src/test/resources/configdefinitions/config.simpletypes.def
diff --git a/container-accesslogging/CMakeLists.txt b/container-accesslogging/CMakeLists.txt
index fb2ba9ac031..14909bc4ca1 100644
--- a/container-accesslogging/CMakeLists.txt
+++ b/container-accesslogging/CMakeLists.txt
@@ -1,2 +1,2 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-install_config_definition(src/main/resources/configdefinitions/access-log.def container.core.access-log.def)
+install_config_definitions(src/main/resources/configdefinitions)
diff --git a/container-accesslogging/src/main/resources/configdefinitions/access-log.def b/container-accesslogging/src/main/resources/configdefinitions/container.core.access-log.def
index 788fadcdf90..788fadcdf90 100644
--- a/container-accesslogging/src/main/resources/configdefinitions/access-log.def
+++ b/container-accesslogging/src/main/resources/configdefinitions/container.core.access-log.def
diff --git a/container-core/CMakeLists.txt b/container-core/CMakeLists.txt
index 1f416ee2516..de3ef9a517e 100644
--- a/container-core/CMakeLists.txt
+++ b/container-core/CMakeLists.txt
@@ -1,20 +1,4 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-install_config_definition(src/main/resources/configdefinitions/application-metadata.def container.core.application-metadata.def)
-install_config_definition(src/main/resources/configdefinitions/container-document.def container.core.document.container-document.def)
-install_config_definition(src/main/resources/configdefinitions/container-http.def container.core.container-http.def)
-install_config_definition(src/main/resources/configdefinitions/container-threadpool.def container.core.container-threadpool.def)
-install_config_definition(src/main/resources/configdefinitions/health-monitor.def container.jdisc.config.health-monitor.def)
-install_config_definition(src/main/resources/configdefinitions/http-filter.def container.core.http.http-filter.def)
-install_config_definition(src/main/resources/configdefinitions/identity.def container.core.identity.identity.def)
-install_config_definition(src/main/resources/configdefinitions/log-handler.def container.core.log-handler.def)
-install_config_definition(src/main/resources/configdefinitions/metrics-packets-handler.def container.jdisc.state.metrics-packets-handler.def)
-install_config_definition(src/main/resources/configdefinitions/metrics-presentation.def metrics.metrics-presentation.def)
-install_config_definition(src/main/resources/configdefinitions/metrics-proxy-api.def container.handler.metrics.metrics-proxy-api.def)
-install_config_definition(src/main/resources/configdefinitions/mockservice.def container.handler.test.mockservice.def)
-install_config_definition(src/main/resources/configdefinitions/qr-searchers.def container.qr-searchers.def)
-install_config_definition(src/main/resources/configdefinitions/qr.def container.qr.def)
-install_config_definition(src/main/resources/configdefinitions/servlet-config.def container.servlet.servlet-config.def)
-install_config_definition(src/main/resources/configdefinitions/threadpool.def container.handler.threadpool.def)
-install_config_definition(src/main/resources/configdefinitions/vip-status.def container.core.vip-status.def)
+install_config_definitions(src/main/resources/configdefinitions)
 
 vespa_install_script(src/main/sh/vespa-load-balancer-status libexec/vespa)
diff --git a/container-core/src/main/resources/configdefinitions/application-metadata.def b/container-core/src/main/resources/configdefinitions/container.core.application-metadata.def
index a3ccf1b55cf..a3ccf1b55cf 100644
--- a/container-core/src/main/resources/configdefinitions/application-metadata.def
+++ b/container-core/src/main/resources/configdefinitions/container.core.application-metadata.def
diff --git a/container-core/src/main/resources/configdefinitions/container-http.def b/container-core/src/main/resources/configdefinitions/container.core.container-http.def
index 23edd402893..23edd402893 100644
--- a/container-core/src/main/resources/configdefinitions/container-http.def
+++ b/container-core/src/main/resources/configdefinitions/container.core.container-http.def
diff --git a/container-core/src/main/resources/configdefinitions/container-document.def b/container-core/src/main/resources/configdefinitions/container.core.document.container-document.def
index e8db64b011a..e8db64b011a 100644
--- a/container-core/src/main/resources/configdefinitions/container-document.def
+++ b/container-core/src/main/resources/configdefinitions/container.core.document.container-document.def
diff --git a/container-core/src/main/resources/configdefinitions/http-filter.def b/container-core/src/main/resources/configdefinitions/container.core.http.http-filter.def
index 829147479d6..829147479d6 100644
--- a/container-core/src/main/resources/configdefinitions/http-filter.def
+++ b/container-core/src/main/resources/configdefinitions/container.core.http.http-filter.def
diff --git a/container-core/src/main/resources/configdefinitions/identity.def b/container-core/src/main/resources/configdefinitions/container.core.identity.identity.def
index 539bf07fa7d..539bf07fa7d 100644
--- a/container-core/src/main/resources/configdefinitions/identity.def
+++ b/container-core/src/main/resources/configdefinitions/container.core.identity.identity.def
diff --git a/container-core/src/main/resources/configdefinitions/log-handler.def b/container-core/src/main/resources/configdefinitions/container.core.log-handler.def
index b30d6eebcf3..b30d6eebcf3 100644
--- a/container-core/src/main/resources/configdefinitions/log-handler.def
+++ b/container-core/src/main/resources/configdefinitions/container.core.log-handler.def
diff --git a/container-core/src/main/resources/configdefinitions/vip-status.def b/container-core/src/main/resources/configdefinitions/container.core.vip-status.def
index a042f5915c2..a042f5915c2 100644
--- a/container-core/src/main/resources/configdefinitions/vip-status.def
+++ b/container-core/src/main/resources/configdefinitions/container.core.vip-status.def
diff --git a/container-core/src/main/resources/configdefinitions/metrics-proxy-api.def b/container-core/src/main/resources/configdefinitions/container.handler.metrics.metrics-proxy-api.def
index d2b85cc1df7..d2b85cc1df7 100644
--- a/container-core/src/main/resources/configdefinitions/metrics-proxy-api.def
+++ b/container-core/src/main/resources/configdefinitions/container.handler.metrics.metrics-proxy-api.def
diff --git a/container-core/src/main/resources/configdefinitions/mockservice.def b/container-core/src/main/resources/configdefinitions/container.handler.test.mockservice.def
index 9ee162bc6b8..9ee162bc6b8 100644
--- a/container-core/src/main/resources/configdefinitions/mockservice.def
+++ b/container-core/src/main/resources/configdefinitions/container.handler.test.mockservice.def
diff --git a/container-core/src/main/resources/configdefinitions/container-threadpool.def b/container-core/src/main/resources/configdefinitions/container.handler.threadpool.container-threadpool.def
index 9248bf2e2bf..9248bf2e2bf 100644
--- a/container-core/src/main/resources/configdefinitions/container-threadpool.def
+++ b/container-core/src/main/resources/configdefinitions/container.handler.threadpool.container-threadpool.def
diff --git a/container-core/src/main/resources/configdefinitions/threadpool.def b/container-core/src/main/resources/configdefinitions/container.handler.threadpool.def
index d966738ea9f..d966738ea9f 100644
--- a/container-core/src/main/resources/configdefinitions/threadpool.def
+++ b/container-core/src/main/resources/configdefinitions/container.handler.threadpool.def
diff --git a/container-core/src/main/resources/configdefinitions/health-monitor.def b/container-core/src/main/resources/configdefinitions/container.jdisc.config.health-monitor.def
index 4e91d85b2b8..4e91d85b2b8 100644
--- a/container-core/src/main/resources/configdefinitions/health-monitor.def
+++ b/container-core/src/main/resources/configdefinitions/container.jdisc.config.health-monitor.def
diff --git a/container-core/src/main/resources/configdefinitions/metrics-packets-handler.def b/container-core/src/main/resources/configdefinitions/container.jdisc.state.metrics-packets-handler.def
index c295954fc5d..c295954fc5d 100644
--- a/container-core/src/main/resources/configdefinitions/metrics-packets-handler.def
+++ b/container-core/src/main/resources/configdefinitions/container.jdisc.state.metrics-packets-handler.def
diff --git a/container-core/src/main/resources/configdefinitions/qr-searchers.def b/container-core/src/main/resources/configdefinitions/container.qr-searchers.def
index 1e8bd54acc3..1e8bd54acc3 100644
--- a/container-core/src/main/resources/configdefinitions/qr-searchers.def
+++ b/container-core/src/main/resources/configdefinitions/container.qr-searchers.def
diff --git a/container-core/src/main/resources/configdefinitions/qr.def b/container-core/src/main/resources/configdefinitions/container.qr.def
index fe44b04e9d5..fe44b04e9d5 100644
--- a/container-core/src/main/resources/configdefinitions/qr.def
+++ b/container-core/src/main/resources/configdefinitions/container.qr.def
diff --git a/container-core/src/main/resources/configdefinitions/servlet-config.def b/container-core/src/main/resources/configdefinitions/container.servlet.servlet-config.def
index 2b3ef402792..2b3ef402792 100644
--- a/container-core/src/main/resources/configdefinitions/servlet-config.def
+++ b/container-core/src/main/resources/configdefinitions/container.servlet.servlet-config.def
diff --git a/container-core/src/main/resources/configdefinitions/metrics-presentation.def b/container-core/src/main/resources/configdefinitions/metrics.metrics-presentation.def
index b6c40993ef5..b6c40993ef5 100644
--- a/container-core/src/main/resources/configdefinitions/metrics-presentation.def
+++ b/container-core/src/main/resources/configdefinitions/metrics.metrics-presentation.def
diff --git a/container-core/src/test/vespa-configdef/int.def b/container-core/src/test/vespa-configdef/config.core.int.def
index 48a94e6bfcd..48a94e6bfcd 100644
--- a/container-core/src/test/vespa-configdef/int.def
+++ b/container-core/src/test/vespa-configdef/config.core.int.def
diff --git a/container-core/src/test/vespa-configdef/string.def b/container-core/src/test/vespa-configdef/config.core.string.def
index 250dec3955e..250dec3955e 100644
--- a/container-core/src/test/vespa-configdef/string.def
+++ b/container-core/src/test/vespa-configdef/config.core.string.def
diff --git a/container-di/CMakeLists.txt b/container-di/CMakeLists.txt
index 02b2b0d34d9..14909bc4ca1 100644
--- a/container-di/CMakeLists.txt
+++ b/container-di/CMakeLists.txt
@@ -1,7 +1,2 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-install_config_definition(src/main/resources/configdefinitions/bundles.def container.bundles.def)
-install_config_definition(src/main/resources/configdefinitions/application-bundles.def com.yahoo.container.di.config.application-bundles.def)
-install_config_definition(src/main/resources/configdefinitions/platform-bundles.def com.yahoo.container.di.config.platform-bundles.def)
-install_config_definition(src/main/resources/configdefinitions/components.def container.components.def)
-install_config_definition(src/main/resources/configdefinitions/jersey-bundles.def container.di.config.jersey-bundles.def)
-install_config_definition(src/main/resources/configdefinitions/jersey-injection.def container.di.config.jersey-injection.def)
+install_config_definitions(src/main/resources/configdefinitions)
diff --git a/container-di/src/main/resources/configdefinitions/bundles.def b/container-di/src/main/resources/configdefinitions/container.bundles.def
index 79e24742398..79e24742398 100644
--- a/container-di/src/main/resources/configdefinitions/bundles.def
+++ b/container-di/src/main/resources/configdefinitions/container.bundles.def
diff --git a/container-di/src/main/resources/configdefinitions/components.def b/container-di/src/main/resources/configdefinitions/container.components.def
index f27abc2fa5a..f27abc2fa5a 100644
--- a/container-di/src/main/resources/configdefinitions/components.def
+++ b/container-di/src/main/resources/configdefinitions/container.components.def
diff --git a/container-di/src/main/resources/configdefinitions/jersey-bundles.def b/container-di/src/main/resources/configdefinitions/container.di.config.jersey-bundles.def
index a226420274d..a226420274d 100644
--- a/container-di/src/main/resources/configdefinitions/jersey-bundles.def
+++ b/container-di/src/main/resources/configdefinitions/container.di.config.jersey-bundles.def
diff --git a/container-di/src/main/resources/configdefinitions/jersey-injection.def b/container-di/src/main/resources/configdefinitions/container.di.config.jersey-injection.def
index 9f5be59abbd..9f5be59abbd 100644
--- a/container-di/src/main/resources/configdefinitions/jersey-injection.def
+++ b/container-di/src/main/resources/configdefinitions/container.di.config.jersey-injection.def
diff --git a/container-di/src/test/vespa-configdef/int.def b/container-di/src/test/vespa-configdef/config.di.int.def
index a34539c4a0f..a34539c4a0f 100644
--- a/container-di/src/test/vespa-configdef/int.def
+++ b/container-di/src/test/vespa-configdef/config.di.int.def
diff --git a/container-di/src/test/vespa-configdef/string.def b/container-di/src/test/vespa-configdef/config.di.string.def
index 396afe54f3f..396afe54f3f 100644
--- a/container-di/src/test/vespa-configdef/string.def
+++ b/container-di/src/test/vespa-configdef/config.di.string.def
diff --git a/container-di/src/test/vespa-configdef/bootstrap1.def b/container-di/src/test/vespa-configdef/config.test.bootstrap1.def
index bdee16d99ea..bdee16d99ea 100644
--- a/container-di/src/test/vespa-configdef/bootstrap1.def
+++ b/container-di/src/test/vespa-configdef/config.test.bootstrap1.def
diff --git a/container-di/src/test/vespa-configdef/bootstrap2.def b/container-di/src/test/vespa-configdef/config.test.bootstrap2.def
index b4fbffd8ae6..b4fbffd8ae6 100644
--- a/container-di/src/test/vespa-configdef/bootstrap2.def
+++ b/container-di/src/test/vespa-configdef/config.test.bootstrap2.def
diff --git a/container-di/src/test/vespa-configdef/components1.def b/container-di/src/test/vespa-configdef/config.test.components1.def
index bdee16d99ea..bdee16d99ea 100644
--- a/container-di/src/test/vespa-configdef/components1.def
+++ b/container-di/src/test/vespa-configdef/config.test.components1.def
diff --git a/container-di/src/test/vespa-configdef/test.def b/container-di/src/test/vespa-configdef/config.test.test.def
index d3e0ed17748..d3e0ed17748 100644
--- a/container-di/src/test/vespa-configdef/test.def
+++ b/container-di/src/test/vespa-configdef/config.test.test.def
diff --git a/container-di/src/test/vespa-configdef/test2.def b/container-di/src/test/vespa-configdef/config.test.test2.def
index d3e0ed17748..d3e0ed17748 100644
--- a/container-di/src/test/vespa-configdef/test2.def
+++ b/container-di/src/test/vespa-configdef/config.test.test2.def
diff --git a/container-di/src/test/vespa-configdef/thread-pool.def b/container-di/src/test/vespa-configdef/config.test.thread-pool.def
index 9e6b6694e84..9e6b6694e84 100644
--- a/container-di/src/test/vespa-configdef/thread-pool.def
+++ b/container-di/src/test/vespa-configdef/config.test.thread-pool.def
diff --git a/container-disc/CMakeLists.txt b/container-disc/CMakeLists.txt
index 7eaf845a883..3d781a95075 100644
--- a/container-disc/CMakeLists.txt
+++ b/container-disc/CMakeLists.txt
@@ -3,6 +3,4 @@ install_fat_java_artifact(container-disc)
 
 vespa_install_script(src/main/sh/vespa-start-container-daemon.sh vespa-start-container-daemon bin)
 
-install_config_definition(src/main/resources/configdefinitions/jdisc-bindings.def container.jdisc.jdisc-bindings.def)
-install_config_definition(src/main/resources/configdefinitions/jersey-connection.def container.config.jersey.jersey-connection.def)
-install_config_definition(src/main/resources/configdefinitions/jersey-web-app-pool.def container.config.jersey.jersey-web-app-pool.def)
+install_config_definitions(src/main/resources/configdefinitions)
diff --git a/container-disc/src/main/resources/configdefinitions/jersey-connection.def b/container-disc/src/main/resources/configdefinitions/container.config.jersey.jersey-connection.def
index b8662e07bf9..b8662e07bf9 100644
--- a/container-disc/src/main/resources/configdefinitions/jersey-connection.def
+++ b/container-disc/src/main/resources/configdefinitions/container.config.jersey.jersey-connection.def
diff --git a/container-disc/src/main/resources/configdefinitions/jersey-web-app-pool.def b/container-disc/src/main/resources/configdefinitions/container.config.jersey.jersey-web-app-pool.def
index 52cb9f2229a..52cb9f2229a 100644
--- a/container-disc/src/main/resources/configdefinitions/jersey-web-app-pool.def
+++ b/container-disc/src/main/resources/configdefinitions/container.config.jersey.jersey-web-app-pool.def
diff --git a/container-disc/src/main/resources/configdefinitions/jdisc-bindings.def b/container-disc/src/main/resources/configdefinitions/container.jdisc.jdisc-bindings.def
index c1b65d39d7a..c1b65d39d7a 100644
--- a/container-disc/src/main/resources/configdefinitions/jdisc-bindings.def
+++ b/container-disc/src/main/resources/configdefinitions/container.jdisc.jdisc-bindings.def
diff --git a/container-messagebus/CMakeLists.txt b/container-messagebus/CMakeLists.txt
index 3cd62d83b73..14909bc4ca1 100644
--- a/container-messagebus/CMakeLists.txt
+++ b/container-messagebus/CMakeLists.txt
@@ -1,3 +1,2 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-install_config_definition(src/main/resources/configdefinitions/container-mbus.def container.jdisc.container-mbus.def)
-install_config_definition(src/main/resources/configdefinitions/session.def container.jdisc.config.session.def)
+install_config_definitions(src/main/resources/configdefinitions)
diff --git a/container-messagebus/src/main/resources/configdefinitions/session.def b/container-messagebus/src/main/resources/configdefinitions/container.jdisc.config.session.def
index 93e71449e98..93e71449e98 100644
--- a/container-messagebus/src/main/resources/configdefinitions/session.def
+++ b/container-messagebus/src/main/resources/configdefinitions/container.jdisc.config.session.def
diff --git a/container-messagebus/src/main/resources/configdefinitions/container-mbus.def b/container-messagebus/src/main/resources/configdefinitions/container.jdisc.container-mbus.def
index 9aef2b32a66..9aef2b32a66 100644
--- a/container-messagebus/src/main/resources/configdefinitions/container-mbus.def
+++ b/container-messagebus/src/main/resources/configdefinitions/container.jdisc.container-mbus.def
diff --git a/container-search-and-docproc/CMakeLists.txt b/container-search-and-docproc/CMakeLists.txt
index 29bbe5bdb0f..aef014583f5 100644
--- a/container-search-and-docproc/CMakeLists.txt
+++ b/container-search-and-docproc/CMakeLists.txt
@@ -1,4 +1,4 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 install_fat_java_artifact(container-search-and-docproc)
 
-install_config_definition(src/main/resources/configdefinitions/application-userdata.def container.handler.observability.application-userdata.def)
+install_config_definitions(src/main/resources/configdefinitions)
diff --git a/container-search-and-docproc/src/main/resources/configdefinitions/application-userdata.def b/container-search-and-docproc/src/main/resources/configdefinitions/container.handler.observability.application-userdata.def
index 0285d3d2103..0285d3d2103 100644
--- a/container-search-and-docproc/src/main/resources/configdefinitions/application-userdata.def
+++ b/container-search-and-docproc/src/main/resources/configdefinitions/container.handler.observability.application-userdata.def
diff --git a/container-search/CMakeLists.txt b/container-search/CMakeLists.txt
index 87d192a50f4..14909bc4ca1 100644
--- a/container-search/CMakeLists.txt
+++ b/container-search/CMakeLists.txt
@@ -1,24 +1,2 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-install_config_definition(src/main/resources/configdefinitions/cluster.def search.config.cluster.def)
-install_config_definition(src/main/resources/configdefinitions/documentdb-info.def prelude.fastsearch.documentdb-info.def)
-install_config_definition(src/main/resources/configdefinitions/emulation.def prelude.emulation.def)
-install_config_definition(src/main/resources/configdefinitions/federation.def search.federation.federation.def)
-install_config_definition(src/main/resources/configdefinitions/fs4.def container.search.fs4.def)
-install_config_definition(src/main/resources/configdefinitions/index-info.def search.config.index-info.def)
-install_config_definition(src/main/resources/configdefinitions/keyvalue.def prelude.searcher.keyvalue.def)
-install_config_definition(src/main/resources/configdefinitions/lowercasing.def search.querytransform.lowercasing.def)
-install_config_definition(src/main/resources/configdefinitions/measure-qps.def search.statistics.measure-qps.def)
-install_config_definition(src/main/resources/configdefinitions/page-templates.def search.pagetemplates.page-templates.def)
-install_config_definition(src/main/resources/configdefinitions/provider.def search.federation.provider.def)
-install_config_definition(src/main/resources/configdefinitions/qr-monitor.def prelude.cluster.qr-monitor.def)
-install_config_definition(src/main/resources/configdefinitions/qr-quotetable.def prelude.searcher.qr-quotetable.def)
-install_config_definition(src/main/resources/configdefinitions/qr-start.def search.config.qr-start.def)
-install_config_definition(src/main/resources/configdefinitions/query-profiles.def search.query.profile.config.query-profiles.def)
-install_config_definition(src/main/resources/configdefinitions/rate-limiting.def search.config.rate-limiting.def)
-install_config_definition(src/main/resources/configdefinitions/resolvers.def search.pagetemplates.resolvers.def)
-install_config_definition(src/main/resources/configdefinitions/rewrites.def search.query.rewrite.rewrites.def)
-install_config_definition(src/main/resources/configdefinitions/search-with-renderer-handler.def search.handler.search-with-renderer-handler.def)
-install_config_definition(src/main/resources/configdefinitions/searchchain-forward.def search.federation.searchchain-forward.def)
-install_config_definition(src/main/resources/configdefinitions/semantic-rules.def prelude.semantics.semantic-rules.def)
-install_config_definition(src/main/resources/configdefinitions/strict-contracts.def search.federation.strict-contracts.def)
-install_config_definition(src/main/resources/configdefinitions/timing-searcher.def search.statistics.timing-searcher.def)
+install_config_definitions(src/main/resources/configdefinitions)
diff --git a/container-search/src/main/resources/configdefinitions/fs4.def b/container-search/src/main/resources/configdefinitions/container.search.fs4.def
index 9562cfa75bd..9562cfa75bd 100644
--- a/container-search/src/main/resources/configdefinitions/fs4.def
+++ b/container-search/src/main/resources/configdefinitions/container.search.fs4.def
diff --git a/container-search/src/main/resources/configdefinitions/qr-monitor.def b/container-search/src/main/resources/configdefinitions/prelude.cluster.qr-monitor.def
index 2c4ff3c6167..2c4ff3c6167 100644
--- a/container-search/src/main/resources/configdefinitions/qr-monitor.def
+++ b/container-search/src/main/resources/configdefinitions/prelude.cluster.qr-monitor.def
diff --git a/container-search/src/main/resources/configdefinitions/emulation.def b/container-search/src/main/resources/configdefinitions/prelude.emulation.def
index 70d2d4954a4..70d2d4954a4 100644
--- a/container-search/src/main/resources/configdefinitions/emulation.def
+++ b/container-search/src/main/resources/configdefinitions/prelude.emulation.def
diff --git a/container-search/src/main/resources/configdefinitions/documentdb-info.def b/container-search/src/main/resources/configdefinitions/prelude.fastsearch.documentdb-info.def
index 76096b4a6f7..76096b4a6f7 100644
--- a/container-search/src/main/resources/configdefinitions/documentdb-info.def
+++ b/container-search/src/main/resources/configdefinitions/prelude.fastsearch.documentdb-info.def
diff --git a/container-search/src/main/resources/configdefinitions/keyvalue.def b/container-search/src/main/resources/configdefinitions/prelude.searcher.keyvalue.def
index 95153708aa2..95153708aa2 100644
--- a/container-search/src/main/resources/configdefinitions/keyvalue.def
+++ b/container-search/src/main/resources/configdefinitions/prelude.searcher.keyvalue.def
diff --git a/container-search/src/main/resources/configdefinitions/qr-quotetable.def b/container-search/src/main/resources/configdefinitions/prelude.searcher.qr-quotetable.def
index 40979ad2a35..40979ad2a35 100644
--- a/container-search/src/main/resources/configdefinitions/qr-quotetable.def
+++ b/container-search/src/main/resources/configdefinitions/prelude.searcher.qr-quotetable.def
diff --git a/container-search/src/main/resources/configdefinitions/semantic-rules.def b/container-search/src/main/resources/configdefinitions/prelude.semantics.semantic-rules.def
index 5ac0cca7ff6..5ac0cca7ff6 100644
--- a/container-search/src/main/resources/configdefinitions/semantic-rules.def
+++ b/container-search/src/main/resources/configdefinitions/prelude.semantics.semantic-rules.def
diff --git a/container-search/src/main/resources/configdefinitions/cluster.def b/container-search/src/main/resources/configdefinitions/search.config.cluster.def
index 52eca7ef753..52eca7ef753 100644
--- a/container-search/src/main/resources/configdefinitions/cluster.def
+++ b/container-search/src/main/resources/configdefinitions/search.config.cluster.def
diff --git a/container-search/src/main/resources/configdefinitions/index-info.def b/container-search/src/main/resources/configdefinitions/search.config.index-info.def
index f3b905d4d0a..f3b905d4d0a 100644
--- a/container-search/src/main/resources/configdefinitions/index-info.def
+++ b/container-search/src/main/resources/configdefinitions/search.config.index-info.def
diff --git a/container-search/src/main/resources/configdefinitions/qr-start.def b/container-search/src/main/resources/configdefinitions/search.config.qr-start.def
index 95e9d4575dd..95e9d4575dd 100644
--- a/container-search/src/main/resources/configdefinitions/qr-start.def
+++ b/container-search/src/main/resources/configdefinitions/search.config.qr-start.def
diff --git a/container-search/src/main/resources/configdefinitions/rate-limiting.def b/container-search/src/main/resources/configdefinitions/search.config.rate-limiting.def
index 23235617f8c..23235617f8c 100644
--- a/container-search/src/main/resources/configdefinitions/rate-limiting.def
+++ b/container-search/src/main/resources/configdefinitions/search.config.rate-limiting.def
diff --git a/container-search/src/main/resources/configdefinitions/federation.def b/container-search/src/main/resources/configdefinitions/search.federation.federation.def
index 36eb5d4b4c8..36eb5d4b4c8 100644
--- a/container-search/src/main/resources/configdefinitions/federation.def
+++ b/container-search/src/main/resources/configdefinitions/search.federation.federation.def
diff --git a/container-search/src/main/resources/configdefinitions/provider.def b/container-search/src/main/resources/configdefinitions/search.federation.provider.def
index f9ab305b114..f9ab305b114 100644
--- a/container-search/src/main/resources/configdefinitions/provider.def
+++ b/container-search/src/main/resources/configdefinitions/search.federation.provider.def
diff --git a/container-search/src/main/resources/configdefinitions/searchchain-forward.def b/container-search/src/main/resources/configdefinitions/search.federation.searchchain-forward.def
index 0e86490e120..0e86490e120 100644
--- a/container-search/src/main/resources/configdefinitions/searchchain-forward.def
+++ b/container-search/src/main/resources/configdefinitions/search.federation.searchchain-forward.def
diff --git a/container-search/src/main/resources/configdefinitions/strict-contracts.def b/container-search/src/main/resources/configdefinitions/search.federation.strict-contracts.def
index 5ceb37db8d1..5ceb37db8d1 100644
--- a/container-search/src/main/resources/configdefinitions/strict-contracts.def
+++ b/container-search/src/main/resources/configdefinitions/search.federation.strict-contracts.def
diff --git a/container-search/src/main/resources/configdefinitions/search-with-renderer-handler.def b/container-search/src/main/resources/configdefinitions/search.handler.search-with-renderer-handler.def
index a34e08a1c82..a34e08a1c82 100644
--- a/container-search/src/main/resources/configdefinitions/search-with-renderer-handler.def
+++ b/container-search/src/main/resources/configdefinitions/search.handler.search-with-renderer-handler.def
diff --git a/container-search/src/main/resources/configdefinitions/page-templates.def b/container-search/src/main/resources/configdefinitions/search.pagetemplates.page-templates.def
index 31ec7644d18..31ec7644d18 100644
--- a/container-search/src/main/resources/configdefinitions/page-templates.def
+++ b/container-search/src/main/resources/configdefinitions/search.pagetemplates.page-templates.def
diff --git a/container-search/src/main/resources/configdefinitions/resolvers.def b/container-search/src/main/resources/configdefinitions/search.pagetemplates.resolvers.def
index 6003fdf81f1..6003fdf81f1 100644
--- a/container-search/src/main/resources/configdefinitions/resolvers.def
+++ b/container-search/src/main/resources/configdefinitions/search.pagetemplates.resolvers.def
diff --git a/container-search/src/main/resources/configdefinitions/query-profiles.def b/container-search/src/main/resources/configdefinitions/search.query.profile.config.query-profiles.def
index 3c6d11e2944..3c6d11e2944 100644
--- a/container-search/src/main/resources/configdefinitions/query-profiles.def
+++ b/container-search/src/main/resources/configdefinitions/search.query.profile.config.query-profiles.def
diff --git a/container-search/src/main/resources/configdefinitions/rewrites.def b/container-search/src/main/resources/configdefinitions/search.query.rewrite.rewrites.def
index ecca422342a..ecca422342a 100644
--- a/container-search/src/main/resources/configdefinitions/rewrites.def
+++ b/container-search/src/main/resources/configdefinitions/search.query.rewrite.rewrites.def
diff --git a/container-search/src/main/resources/configdefinitions/lowercasing.def b/container-search/src/main/resources/configdefinitions/search.querytransform.lowercasing.def
index b656c451e11..b656c451e11 100644
--- a/container-search/src/main/resources/configdefinitions/lowercasing.def
+++ b/container-search/src/main/resources/configdefinitions/search.querytransform.lowercasing.def
diff --git a/container-search/src/main/resources/configdefinitions/measure-qps.def b/container-search/src/main/resources/configdefinitions/search.statistics.measure-qps.def
index c8b38b9db6e..c8b38b9db6e 100644
--- a/container-search/src/main/resources/configdefinitions/measure-qps.def
+++ b/container-search/src/main/resources/configdefinitions/search.statistics.measure-qps.def
diff --git a/container-search/src/main/resources/configdefinitions/timing-searcher.def b/container-search/src/main/resources/configdefinitions/search.statistics.timing-searcher.def
index 7c2b698bdb0..7c2b698bdb0 100644
--- a/container-search/src/main/resources/configdefinitions/timing-searcher.def
+++ b/container-search/src/main/resources/configdefinitions/search.statistics.timing-searcher.def
diff --git a/container-search/src/test/vespa-configdef/int.def b/container-search/src/test/vespa-configdef/config.search.int.def
index b526a956b5c..b526a956b5c 100644
--- a/container-search/src/test/vespa-configdef/int.def
+++ b/container-search/src/test/vespa-configdef/config.search.int.def
diff --git a/container-search/src/test/vespa-configdef/string.def b/container-search/src/test/vespa-configdef/config.search.string.def
index 4b39de61e0a..4b39de61e0a 100644
--- a/container-search/src/test/vespa-configdef/string.def
+++ b/container-search/src/test/vespa-configdef/config.search.string.def
diff --git a/controller-server/src/main/resources/configdefinitions/athenz.def b/controller-server/src/main/resources/configdefinitions/vespa.hosted.controller.athenz.config.athenz.def
index dc1a2337aaf..dc1a2337aaf 100644
--- a/controller-server/src/main/resources/configdefinitions/athenz.def
+++ b/controller-server/src/main/resources/configdefinitions/vespa.hosted.controller.athenz.config.athenz.def
diff --git a/controller-server/src/main/resources/configdefinitions/controller.def b/controller-server/src/main/resources/configdefinitions/vespa.hosted.controller.config.controller.def
index 069deaf276d..069deaf276d 100644
--- a/controller-server/src/main/resources/configdefinitions/controller.def
+++ b/controller-server/src/main/resources/configdefinitions/vespa.hosted.controller.config.controller.def
diff --git a/controller-server/src/main/resources/configdefinitions/maintainer.def b/controller-server/src/main/resources/configdefinitions/vespa.hosted.controller.maintenance.config.maintainer.def
index 7ec8860bef4..7ec8860bef4 100644
--- a/controller-server/src/main/resources/configdefinitions/maintainer.def
+++ b/controller-server/src/main/resources/configdefinitions/vespa.hosted.controller.maintenance.config.maintainer.def
diff --git a/controller-server/src/main/resources/configdefinitions/maven-repository.def b/controller-server/src/main/resources/configdefinitions/vespa.hosted.controller.maven.repository.config.maven-repository.def
index 0fd2d410e9b..0fd2d410e9b 100644
--- a/controller-server/src/main/resources/configdefinitions/maven-repository.def
+++ b/controller-server/src/main/resources/configdefinitions/vespa.hosted.controller.maven.repository.config.maven-repository.def
diff --git a/controller-server/src/main/resources/configdefinitions/tls.def b/controller-server/src/main/resources/configdefinitions/vespa.hosted.controller.tls.config.tls.def
index ddaa1e635db..ddaa1e635db 100644
--- a/controller-server/src/main/resources/configdefinitions/tls.def
+++ b/controller-server/src/main/resources/configdefinitions/vespa.hosted.controller.tls.config.tls.def
diff --git a/controller-server/src/main/resources/configdefinitions/rotations.def b/controller-server/src/main/resources/configdefinitions/vespa.hosted.rotation.config.rotations.def
index d4f3636d0d8..d4f3636d0d8 100644
--- a/controller-server/src/main/resources/configdefinitions/rotations.def
+++ b/controller-server/src/main/resources/configdefinitions/vespa.hosted.rotation.config.rotations.def
diff --git a/docproc/CMakeLists.txt b/docproc/CMakeLists.txt
index bacb45df319..14909bc4ca1 100644
--- a/docproc/CMakeLists.txt
+++ b/docproc/CMakeLists.txt
@@ -1,4 +1,2 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-install_config_definition(src/main/resources/configdefinitions/docproc.def config.docproc.docproc.def)
-install_config_definition(src/main/resources/configdefinitions/schemamapping.def config.docproc.schemamapping.def)
-install_config_definition(src/main/resources/configdefinitions/splitter-joiner-document-processor.def config.docproc.splitter-joiner-document-processor.def)
+install_config_definitions(src/main/resources/configdefinitions)
diff --git a/docproc/src/main/resources/configdefinitions/docproc.def b/docproc/src/main/resources/configdefinitions/config.docproc.docproc.def
index 53f5c2de21f..53f5c2de21f 100644
--- a/docproc/src/main/resources/configdefinitions/docproc.def
+++ b/docproc/src/main/resources/configdefinitions/config.docproc.docproc.def
diff --git a/docproc/src/main/resources/configdefinitions/schemamapping.def b/docproc/src/main/resources/configdefinitions/config.docproc.schemamapping.def
index d70235fbfc0..d70235fbfc0 100644
--- a/docproc/src/main/resources/configdefinitions/schemamapping.def
+++ b/docproc/src/main/resources/configdefinitions/config.docproc.schemamapping.def
diff --git a/docproc/src/main/resources/configdefinitions/splitter-joiner-document-processor.def b/docproc/src/main/resources/configdefinitions/config.docproc.splitter-joiner-document-processor.def
index dea6141e6cc..dea6141e6cc 100644
--- a/docproc/src/main/resources/configdefinitions/splitter-joiner-document-processor.def
+++ b/docproc/src/main/resources/configdefinitions/config.docproc.splitter-joiner-document-processor.def
diff --git a/docproc/src/test/vespa-configdef/string.def b/docproc/src/test/vespa-configdef/config.docproc.string.def
index 3e76855f1e8..3e76855f1e8 100644
--- a/docproc/src/test/vespa-configdef/string.def
+++ b/docproc/src/test/vespa-configdef/config.docproc.string.def
diff --git a/fileacquirer/CMakeLists.txt b/fileacquirer/CMakeLists.txt
index 7a366aa3882..c05241bf795 100644
--- a/fileacquirer/CMakeLists.txt
+++ b/fileacquirer/CMakeLists.txt
@@ -10,4 +10,4 @@ vespa_define_module(
     src/vespa/fileacquirer
 )
 
-install_config_definition(src/main/resources/configdefinitions/filedistributorrpc.def cloud.config.filedistribution.filedistributorrpc.def)
+install_config_definitions(src/main/resources/configdefinitions)
diff --git a/functions.cmake b/functions.cmake
index e57e1d1c412..5d23a3cb9ad 100644
--- a/functions.cmake
+++ b/functions.cmake
@@ -644,7 +644,7 @@ function(install_config_definition)
 endfunction()
 
 function(install_config_definitions)
-    install(DIRECTORY ${ARGV0}/ DESTINATION share/vespa/configdefinitions)
+    install(DIRECTORY ${ARGV0}/ DESTINATION share/vespa/configdefinitions FILES_MATCHING PATTERN "*.def")
 endfunction()
 
 function(install_java_artifact NAME)
diff --git a/jdisc-security-filters/CMakeLists.txt b/jdisc-security-filters/CMakeLists.txt
index fd691ae84ca..fc39c20dc29 100644
--- a/jdisc-security-filters/CMakeLists.txt
+++ b/jdisc-security-filters/CMakeLists.txt
@@ -1,4 +1,4 @@
 # Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 install_fat_java_artifact(jdisc-security-filters)
 
-install_config_definition(src/main/resources/configdefinitions/cors-filter.def jdisc.http.filter.security.cors.cors-filter.def)
+install_config_definitions(src/main/resources/configdefinitions)
diff --git a/jdisc-security-filters/src/main/resources/configdefinitions/athenz-authorization-filter.def b/jdisc-security-filters/src/main/resources/configdefinitions/jdisc.http.filter.security.athenz.athenz-authorization-filter.def
index ab8c4a204df..ab8c4a204df 100644
--- a/jdisc-security-filters/src/main/resources/configdefinitions/athenz-authorization-filter.def
+++ b/jdisc-security-filters/src/main/resources/configdefinitions/jdisc.http.filter.security.athenz.athenz-authorization-filter.def
diff --git a/jdisc-security-filters/src/main/resources/configdefinitions/athenz-principal-filter.def b/jdisc-security-filters/src/main/resources/configdefinitions/jdisc.http.filter.security.athenz.athenz-principal-filter.def
index 8fd95ee1dde..8fd95ee1dde 100644
--- a/jdisc-security-filters/src/main/resources/configdefinitions/athenz-principal-filter.def
+++ b/jdisc-security-filters/src/main/resources/configdefinitions/jdisc.http.filter.security.athenz.athenz-principal-filter.def
diff --git a/jdisc-security-filters/src/main/resources/configdefinitions/static-request-resource-mapper.def b/jdisc-security-filters/src/main/resources/configdefinitions/jdisc.http.filter.security.athenz.static-request-resource-mapper.def
index de89c1f9198..de89c1f9198 100644
--- a/jdisc-security-filters/src/main/resources/configdefinitions/static-request-resource-mapper.def
+++ b/jdisc-security-filters/src/main/resources/configdefinitions/jdisc.http.filter.security.athenz.static-request-resource-mapper.def
diff --git a/jdisc-security-filters/src/main/resources/configdefinitions/cors-filter.def b/jdisc-security-filters/src/main/resources/configdefinitions/jdisc.http.filter.security.cors.cors-filter.def
index a5c69b2db62..a5c69b2db62 100644
--- a/jdisc-security-filters/src/main/resources/configdefinitions/cors-filter.def
+++ b/jdisc-security-filters/src/main/resources/configdefinitions/jdisc.http.filter.security.cors.cors-filter.def
diff --git a/jdisc_http_service/CMakeLists.txt b/jdisc_http_service/CMakeLists.txt
index 3b1956e16de..e0f17286b85 100644
--- a/jdisc_http_service/CMakeLists.txt
+++ b/jdisc_http_service/CMakeLists.txt
@@ -2,8 +2,4 @@
 install_fat_java_artifact(jdisc_http_service)
 install_java_artifact_dependencies(jdisc_http_service)
 
-install_config_definition(src/main/resources/configdefinitions/jdisc.http.client.http-client.def)
-install_config_definition(src/main/resources/configdefinitions/jdisc.http.connector.def)
-install_config_definition(src/main/resources/configdefinitions/jdisc.http.server.def)
-install_config_definition(src/main/resources/configdefinitions/jdisc.http.servlet-paths.def)
-
+install_config_definitions(src/main/resources/configdefinitions)
diff --git a/jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.client.http-client.def b/jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.client.jdisc.http.client.http-client.def
index 8f99fccec94..8f99fccec94 100644
--- a/jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.client.http-client.def
+++ b/jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.client.jdisc.http.client.http-client.def
diff --git a/jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.connector.def b/jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.jdisc.http.connector.def
index 4c86c8b9bb6..4c86c8b9bb6 100644
--- a/jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.connector.def
+++ b/jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.jdisc.http.connector.def
diff --git a/jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.server.def b/jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.jdisc.http.server.def
index 0cb5b89b20c..0cb5b89b20c 100644
--- a/jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.server.def
+++ b/jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.jdisc.http.server.def
diff --git a/jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.servlet-paths.def b/jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.jdisc.http.servlet-paths.def
index 86707b027be..86707b027be 100644
--- a/jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.servlet-paths.def
+++ b/jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.jdisc.http.servlet-paths.def
diff --git a/linguistics/CMakeLists.txt b/linguistics/CMakeLists.txt
index 44f645f2b57..f2179625aae 100644
--- a/linguistics/CMakeLists.txt
+++ b/linguistics/CMakeLists.txt
@@ -1,2 +1,2 @@
 # Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-install_config_definition(src/main/resources/configdefinitions/opennlp-linguistics.def language.opennlp.opennlp-linguistics.def)
+install_config_definitions(src/main/resources/configdefinitions)
diff --git a/linguistics/src/main/resources/configdefinitions/opennlp-linguistics.def b/linguistics/src/main/resources/configdefinitions/language.opennlp.opennlp-linguistics.def
index 13194d471fd..13194d471fd 100644
--- a/linguistics/src/main/resources/configdefinitions/opennlp-linguistics.def
+++ b/linguistics/src/main/resources/configdefinitions/language.opennlp.opennlp-linguistics.def
diff --git a/metrics-proxy/CMakeLists.txt b/metrics-proxy/CMakeLists.txt
index 63520385bf5..20d508c84d3 100644
--- a/metrics-proxy/CMakeLists.txt
+++ b/metrics-proxy/CMakeLists.txt
@@ -4,12 +4,4 @@ install_fat_java_artifact(metrics-proxy)
 vespa_install_script(src/main/sh/start-telegraf.sh libexec/vespa)
 vespa_install_script(src/main/sh/stop-telegraf.sh libexec/vespa)
 
-install_config_definition(src/main/resources/configdefinitions/application-dimensions.def ai.vespa.metricsproxy.metric.dimensions.application-dimensions.def)
-install_config_definition(src/main/resources/configdefinitions/consumers.def ai.vespa.metricsproxy.core.consumers.def)
-install_config_definition(src/main/resources/configdefinitions/monitoring.def ai.vespa.metricsproxy.core.monitoring.def)
-install_config_definition(src/main/resources/configdefinitions/metrics-nodes.def ai.vespa.metricsproxy.http.application.metrics-nodes.def)
-install_config_definition(src/main/resources/configdefinitions/node-dimensions.def ai.vespa.metricsproxy.metric.dimensions.node-dimensions.def)
-install_config_definition(src/main/resources/configdefinitions/node-info.def ai.vespa.metricsproxy.http.metrics.node-info.def)
-install_config_definition(src/main/resources/configdefinitions/rpc-connector.def ai.vespa.metricsproxy.rpc.rpc-connector.def)
-install_config_definition(src/main/resources/configdefinitions/vespa-services.def ai.vespa.metricsproxy.service.vespa-services.def)
-install_config_definition(src/main/resources/configdefinitions/telegraf.def ai.vespa.metricsproxy.telegraf.telegraf.def)
+install_config_definitions(src/main/resources/configdefinitions)
diff --git a/simplemetrics/CMakeLists.txt b/simplemetrics/CMakeLists.txt
index c145fbb2ec7..f593afbfa0c 100644
--- a/simplemetrics/CMakeLists.txt
+++ b/simplemetrics/CMakeLists.txt
@@ -1,4 +1,4 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 install_fat_java_artifact(simplemetrics)
 
-install_config_definition(src/main/resources/configdefinitions/manager.def metrics.manager.def)
+install_config_definitions(src/main/resources/configdefinitions)
diff --git a/simplemetrics/src/main/resources/configdefinitions/manager.def b/simplemetrics/src/main/resources/configdefinitions/metrics.manager.def
index 6446e0df8b6..6446e0df8b6 100644
--- a/simplemetrics/src/main/resources/configdefinitions/manager.def
+++ b/simplemetrics/src/main/resources/configdefinitions/metrics.manager.def
diff --git a/statistics/CMakeLists.txt b/statistics/CMakeLists.txt
index 3b187b72d6e..14909bc4ca1 100644
--- a/statistics/CMakeLists.txt
+++ b/statistics/CMakeLists.txt
@@ -1,2 +1,2 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-install_config_definition(src/main/resources/configdefinitions/statistics.def container.statistics.def)
+install_config_definitions(src/main/resources/configdefinitions)
diff --git a/statistics/src/main/resources/configdefinitions/statistics.def b/statistics/src/main/resources/configdefinitions/container.statistics.def
index 92da7704714..92da7704714 100644
--- a/statistics/src/main/resources/configdefinitions/statistics.def
+++ b/statistics/src/main/resources/configdefinitions/container.statistics.def
diff --git a/vespa-athenz/src/main/resources/configdefinitions/sia-provider.def b/vespa-athenz/src/main/resources/configdefinitions/vespa.athenz.identity.sia-provider.def
index 77310d0c91e..77310d0c91e 100644
--- a/vespa-athenz/src/main/resources/configdefinitions/sia-provider.def
+++ b/vespa-athenz/src/main/resources/configdefinitions/vespa.athenz.identity.sia-provider.def
diff --git a/vespa-osgi-testrunner/CMakeLists.txt b/vespa-osgi-testrunner/CMakeLists.txt
index 4b097a2f7bf..13095c213a3 100644
--- a/vespa-osgi-testrunner/CMakeLists.txt
+++ b/vespa-osgi-testrunner/CMakeLists.txt
@@ -1,3 +1,3 @@
 # Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 install_fat_java_artifact(vespa-osgi-testrunner)
-install_config_definition(src/main/resources/configdefinitions/junit-test-runner.def com.yahoo.vespa.testrunner.junit-test-runner.def)
+install_config_definitions(src/main/resources/configdefinitions)
diff --git a/vespa-testrunner-components/CMakeLists.txt b/vespa-testrunner-components/CMakeLists.txt
index e2eeb2feecb..475039cb38e 100644
--- a/vespa-testrunner-components/CMakeLists.txt
+++ b/vespa-testrunner-components/CMakeLists.txt
@@ -1,4 +1,4 @@
 # Copyright 2020 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 install_java_artifact(vespa-testrunner-components)
 install_fat_java_artifact(vespa-testrunner-components)
-install_config_definition(src/main/resources/configdefinitions/test-runner.def com.yahoo.vespa.hosted.testrunner.test-runner.def)
+install_config_definitions(src/main/resources/configdefinitions)
diff --git a/vespaclient-core/CMakeLists.txt b/vespaclient-core/CMakeLists.txt
index 218276cf590..14909bc4ca1 100644
--- a/vespaclient-core/CMakeLists.txt
+++ b/vespaclient-core/CMakeLists.txt
@@ -1,2 +1,2 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-install_config_definition(src/main/resources/configdefinitions/feeder.def vespaclient.config.feeder.def)
+install_config_definitions(src/main/resources/configdefinitions)
diff --git a/vespaclient-core/src/main/resources/configdefinitions/feeder.def b/vespaclient-core/src/main/resources/configdefinitions/vespaclient.config.feeder.def
index a376a4807a7..a376a4807a7 100644
--- a/vespaclient-core/src/main/resources/configdefinitions/feeder.def
+++ b/vespaclient-core/src/main/resources/configdefinitions/vespaclient.config.feeder.def
diff --git a/vsm/src/vespa/vsm/config/CMakeLists.txt b/vsm/src/vespa/vsm/config/CMakeLists.txt
index e3bd2db68e2..c0e16c52de2 100644
--- a/vsm/src/vespa/vsm/config/CMakeLists.txt
+++ b/vsm/src/vespa/vsm/config/CMakeLists.txt
@@ -3,9 +3,9 @@ vespa_add_library(vsm_vconfig OBJECT
     SOURCES
     DEPENDS
 )
-vespa_generate_config(vsm_vconfig vsmfields.def)
-install_config_definition(vsmfields.def vespa.config.search.vsm.vsmfields.def)
-vespa_generate_config(vsm_vconfig vsm.def)
-install_config_definition(vsm.def vespa.config.search.vsm.vsm.def)
-vespa_generate_config(vsm_vconfig vsmsummary.def)
-install_config_definition(vsmsummary.def vespa.config.search.vsm.vsmsummary.def)
+vespa_generate_config(vsm_vconfig vsmfields.def) 
+install_config_definition(vsmfields.def vespa.config.search.vsm.vsmfields.def) 
+vespa_generate_config(vsm_vconfig vsm.def) 
+install_config_definition(vsm.def vespa.config.search.vsm.vsm.def) 
+vespa_generate_config(vsm_vconfig vsmsummary.def) 
+install_config_definition(vsmsummary.def vespa.config.search.vsm.vsmsummary.def)