diff --git a/.codeclimate.yml b/.codeclimate.yml
index faa9ee872..93fd8eb53 100644
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -38,8 +38,7 @@ exclude_paths:
 - LICENSE
 - README.md
 - composer.json 
-- config.inc.dist
-- vocabularies.ttl.dist
+- config.ttl.dist
 - favicon.ico 
 - phpdoc.sh 
 - phpunit.xml
diff --git a/controller/WebController.php b/controller/WebController.php
index 9b6fb8043..a0c8e955b 100644
--- a/controller/WebController.php
+++ b/controller/WebController.php
@@ -29,7 +29,7 @@ public function __construct($model)
         // initialize Twig templates
         $tmpDir = $model->getConfig()->getTemplateCache();
 
-        // check if the cache pointed by config.inc exists, if not we create it.
+        // check if the cache pointed by config.ttl exists, if not we create it.
         if (!file_exists($tmpDir)) {
             mkdir($tmpDir);
         }
@@ -41,10 +41,10 @@ public function __construct($model)
         $this->twig->addExtension(new Twig_Extensions_Extension_I18n());
         // used for setting the base href for the relative urls
         $this->twig->addGlobal("BaseHref", $this->getBaseHref());
-        // setting the service name string from the config.inc
+        // setting the service name string from the config.ttl
         $this->twig->addGlobal("ServiceName", $this->model->getConfig()->getServiceName());
 
-        // setting the service custom css file from the config.inc
+        // setting the service custom css file from the config.ttl
         if ($this->model->getConfig()->getCustomCss() !== null) {
             $this->twig->addGlobal("ServiceCustomCss", $this->model->getConfig()->getCustomCss());
         }
diff --git a/docker-compose.yml b/docker-compose.yml
index be294177d..a6669a923 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -27,4 +27,4 @@ services:
 # 1. create dataset
 # >curl -I -u admin:admin -XPOST --data "dbName=skosmos&dbType=tdb" -G http://localhost:3030/$/datasets/
 # 2. load example vocabulary
-# >curl -I -X POST -H Content-Type:text/turtle -T vocabularies.ttl -G http://localhost:3030/skosmos/data
+# >curl -I -X POST -H Content-Type:text/turtle -T config.ttl -G http://localhost:3030/skosmos/data
diff --git a/model/BaseConfig.php b/model/BaseConfig.php
index 320e2d9af..745fb5ba0 100644
--- a/model/BaseConfig.php
+++ b/model/BaseConfig.php
@@ -8,7 +8,7 @@ abstract class BaseConfig extends DataObject
 {
 
 	/**
-     * Returns a boolean value based on a literal value from the vocabularies.ttl configuration.
+     * Returns a boolean value based on a literal value from the config.ttl configuration.
      * @param string $property the property to query
      * @param boolean $default the default value if the value is not set in configuration
      */
@@ -22,7 +22,7 @@ protected function getBoolean($property, $default = false)
     }
 
     /**
-     * Returns an array of URIs based on a property from the vocabularies.ttl configuration.
+     * Returns an array of URIs based on a property from the config.ttl configuration.
      * @param string $property the property to query
      * @return string[] List of URIs
      */
@@ -37,7 +37,7 @@ protected function getResources($property)
     }
 
     /**
-     * Returns a boolean value based on a literal value from the vocabularies.ttl configuration.
+     * Returns a boolean value based on a literal value from the config.ttl configuration.
      * @param string $property the property to query
      * @param string $default default value
      * @param string $lang preferred language for the literal
diff --git a/model/Model.php b/model/Model.php
index 1c412baba..24ec2bbdb 100644
--- a/model/Model.php
+++ b/model/Model.php
@@ -388,7 +388,7 @@ public function getVocabularyCategories()
     }
 
     /**
-     * Returns the label defined in vocabularies.ttl with the appropriate language.
+     * Returns the label defined in config.ttl with the appropriate language.
      * @param string $lang language code of returned labels, eg. 'fi'
      * @return string the label for vocabulary categories.
      */
@@ -592,7 +592,7 @@ public function getSparqlImplementation($dialect, $endpoint, $graph)
     }
 
     /**
-     * Returns a SPARQL endpoint object using the default implementation set in the config.inc.
+     * Returns a SPARQL endpoint object using the default implementation set in the config.ttl.
      */
     public function getDefaultSparql()
     {
diff --git a/model/VocabularyConfig.php b/model/VocabularyConfig.php
index 9f8d4a445..964bf24c0 100644
--- a/model/VocabularyConfig.php
+++ b/model/VocabularyConfig.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * VocabularyConfig provides access to the vocabulary configuration defined in vocabularies.ttl.
+ * VocabularyConfig provides access to the vocabulary configuration defined in config.ttl.
  */
 class VocabularyConfig extends BaseConfig
 {
@@ -86,7 +86,7 @@ public function getTitle($lang = null)
     }
 
     /**
-     * Returns a boolean value set in the vocabularies.ttl config.
+     * Returns a boolean value set in the config.ttl config.
      * @return boolean
      */
     public function sortByNotation()
@@ -95,7 +95,7 @@ public function sortByNotation()
     }
 
     /**
-     * Returns a boolean value set in the vocabularies.ttl config.
+     * Returns a boolean value set in the config.ttl config.
      * @return boolean
      */
     public function showChangeList()
@@ -228,7 +228,7 @@ public function hasMultiLingualProperty($property)
     }
 
     /**
-     * Returns a boolean value set in the vocabularies.ttl config.
+     * Returns a boolean value set in the config.ttl config.
      * @return boolean
      */
     public function getShowHierarchy()
@@ -237,7 +237,7 @@ public function getShowHierarchy()
     }
 
     /**
-     * Returns a boolean value set in the vocabularies.ttl config.
+     * Returns a boolean value set in the config.ttl config.
      * @return boolean
      */
     public function showConceptSchemesInHierarchy()
@@ -246,7 +246,7 @@ public function showConceptSchemesInHierarchy()
     }
 
     /**
-     * Returns a boolean value set in the vocabularies.ttl config.
+     * Returns a boolean value set in the config.ttl config.
      * @return boolean defaults to true if fetching hasn't been explicitly denied.
      */
     public function getExternalResourcesLoading()
@@ -255,7 +255,7 @@ public function getExternalResourcesLoading()
     }
 
     /**
-     * Returns a boolean value set in the vocabularies.ttl config.
+     * Returns a boolean value set in the config.ttl config.
      * @return boolean
      */
     public function getShowLangCodes()
@@ -264,7 +264,7 @@ public function getShowLangCodes()
     }
 
     /**
-     * Returns a boolean value set in the vocabularies.ttl config.
+     * Returns a boolean value set in the config.ttl config.
      * @return array array of concept class URIs (can be empty)
      */
     public function getIndexClasses()
@@ -273,7 +273,7 @@ public function getIndexClasses()
     }
 
     /**
-     * Returns skosmos:externalProperty values set in the vocabularies.ttl config.
+     * Returns skosmos:externalProperty values set in the config.ttl config.
      * @return array array of external property URIs (can be empty)
      */
     public function getExtProperties()
@@ -372,7 +372,7 @@ public function getHierarchyProperty()
     }
 
     /**
-     * Returns a boolean value set in the vocabularies.ttl config.
+     * Returns a boolean value set in the config.ttl config.
      * @return boolean
      */
     public function showNotation()
@@ -381,7 +381,7 @@ public function showNotation()
     }
 
     /**
-     * Returns a boolean value set in the vocabularies.ttl config.
+     * Returns a boolean value set in the config.ttl config.
      * @return boolean
      */
     public function showAlphabeticalIndex()
@@ -390,7 +390,7 @@ public function showAlphabeticalIndex()
     }
 
     /**
-     * Returns a boolean value set in the vocabularies.ttl config.
+     * Returns a boolean value set in the config.ttl config.
      * @return boolean
      */
     public function getShowDeprecated()
diff --git a/swagger.json b/swagger.json
index 2189cfcfd..fe9fe048f 100644
--- a/swagger.json
+++ b/swagger.json
@@ -101,7 +101,7 @@
                     {
                         "name": "maxhits",
                         "in": "query",
-                        "description": "Maximum number of results to return. If not given, maxhits will default to 100. (default settable in config.inc)",
+                        "description": "Maximum number of results to return. If not given, maxhits will default to 100. (default settable in config.ttl)",
                         "required": false,
                         "type": "integer"
                     },
@@ -424,7 +424,7 @@
                     {
                         "name": "maxhits",
                         "in": "query",
-                        "description": "Maximum number of results to return. If not given, maxhits will default to 100. (default settable in config.inc)",
+                        "description": "Maximum number of results to return. If not given, maxhits will default to 100. (default settable in config.ttl)",
                         "required": false,
                         "type": "integer"
                     },
diff --git a/tests/ModelTest.php b/tests/ModelTest.php
index 89235e74b..28b2b4ba3 100644
--- a/tests/ModelTest.php
+++ b/tests/ModelTest.php
@@ -296,7 +296,7 @@ public function testSearchConceptsAndInfoWithOneVocabCaseInsensitivity() {
   }
 
   /**
-   * Test for issue #387: make sure namespaces defined in vocabularies.ttl are used for RDF export
+   * Test for issue #387: make sure namespaces defined in config.ttl are used for RDF export
    * @covers Model::getRDF
    */