diff --git a/arangod/Aql/Index.h b/arangod/Aql/Index.h
index 1c6e80d912..9c0cae1f4f 100644
--- a/arangod/Aql/Index.h
+++ b/arangod/Aql/Index.h
@@ -97,7 +97,7 @@ namespace triagens {
             auto * name = static_cast<TRI_json_t const*>(TRI_AtVector(&f->_value._objects, i));
 
             if (TRI_IsStringJson(name)) {
-              std::vector<triagens::basics::AttributeName const> parsedAttributes;
+              std::vector<triagens::basics::AttributeName> parsedAttributes;
               TRI_ParseAttributeString(std::string(name->_value._string.data, name->_value._string.length - 1), parsedAttributes);
               fields.emplace_back(parsedAttributes);
             }
@@ -176,7 +176,7 @@ namespace triagens {
         triagens::arango::Index::IndexType                               type;
         bool                                                             unique;
         bool                                                             sparse;
-        std::vector<std::vector<triagens::basics::AttributeName const>>  fields;
+        std::vector<std::vector<triagens::basics::AttributeName>>  fields;
 
       private:
 
diff --git a/arangod/Indexes/CapConstraint.cpp b/arangod/Indexes/CapConstraint.cpp
index 301f365923..804ecfa9fe 100644
--- a/arangod/Indexes/CapConstraint.cpp
+++ b/arangod/Indexes/CapConstraint.cpp
@@ -52,7 +52,7 @@ CapConstraint::CapConstraint (TRI_idx_iid_t iid,
                               TRI_document_collection_t* collection,
                               size_t count,
                               int64_t size)
-  : Index(iid, collection, std::vector<std::vector<triagens::basics::AttributeName const>>()),
+  : Index(iid, collection, std::vector<std::vector<triagens::basics::AttributeName>>()),
     _count(count),
     _size(static_cast<int64_t>(size)) {
 
diff --git a/arangod/Indexes/EdgeIndex.cpp b/arangod/Indexes/EdgeIndex.cpp
index d49028ab42..09a5c6494b 100644
--- a/arangod/Indexes/EdgeIndex.cpp
+++ b/arangod/Indexes/EdgeIndex.cpp
@@ -315,7 +315,7 @@ static bool IsEqualElementEdgeToByKey (void const* left,
 
 EdgeIndex::EdgeIndex (TRI_idx_iid_t iid,
                       TRI_document_collection_t* collection) 
-  : Index(iid, collection, std::vector<std::vector<triagens::basics::AttributeName const>>({ { { TRI_VOC_ATTRIBUTE_FROM, false } }, { { TRI_VOC_ATTRIBUTE_TO , false } } })),
+  : Index(iid, collection, std::vector<std::vector<triagens::basics::AttributeName>>({ { { TRI_VOC_ATTRIBUTE_FROM, false } }, { { TRI_VOC_ATTRIBUTE_TO , false } } })),
     _edgesFrom(nullptr),
     _edgesTo(nullptr) {
   
diff --git a/arangod/Indexes/FulltextIndex.cpp b/arangod/Indexes/FulltextIndex.cpp
index 2993f9190f..ece698ac8b 100644
--- a/arangod/Indexes/FulltextIndex.cpp
+++ b/arangod/Indexes/FulltextIndex.cpp
@@ -121,7 +121,7 @@ FulltextIndex::FulltextIndex (TRI_idx_iid_t iid,
                               TRI_document_collection_t* collection,
                               std::string const& attribute,
                               int minWordLength) 
-  : Index(iid, collection, std::vector<std::vector<triagens::basics::AttributeName const>> { { { attribute, false } } } ),
+  : Index(iid, collection, std::vector<std::vector<triagens::basics::AttributeName>> { { { attribute, false } } } ),
     _pid(0),
     _fulltextIndex(nullptr),
     _minWordLength(minWordLength > 0 ? minWordLength : 1) {
diff --git a/arangod/Indexes/GeoIndex2.cpp b/arangod/Indexes/GeoIndex2.cpp
index 9ef9a1e665..89a20b8887 100644
--- a/arangod/Indexes/GeoIndex2.cpp
+++ b/arangod/Indexes/GeoIndex2.cpp
@@ -49,7 +49,7 @@ using namespace triagens::arango;
 
 GeoIndex2::GeoIndex2 (TRI_idx_iid_t iid,
                       TRI_document_collection_t* collection,
-                      std::vector<std::vector<triagens::basics::AttributeName const>> const& fields,
+                      std::vector<std::vector<triagens::basics::AttributeName>> const& fields,
                       std::vector<TRI_shape_pid_t> const& paths,
                       bool geoJson) 
   : Index(iid, collection, fields),
@@ -76,7 +76,7 @@ GeoIndex2::GeoIndex2 (TRI_idx_iid_t iid,
 
 GeoIndex2::GeoIndex2 (TRI_idx_iid_t iid,
                       TRI_document_collection_t* collection,
-                      std::vector<std::vector<triagens::basics::AttributeName const>> const& fields,
+                      std::vector<std::vector<triagens::basics::AttributeName>> const& fields,
                       std::vector<TRI_shape_pid_t> const& paths) 
   : Index(iid, collection, fields),
     _paths(paths),
diff --git a/arangod/Indexes/GeoIndex2.h b/arangod/Indexes/GeoIndex2.h
index 1accef5ab5..60582c00d1 100644
--- a/arangod/Indexes/GeoIndex2.h
+++ b/arangod/Indexes/GeoIndex2.h
@@ -58,13 +58,13 @@ namespace triagens {
 
         GeoIndex2 (TRI_idx_iid_t,
                    struct TRI_document_collection_t*,
-                   std::vector<std::vector<triagens::basics::AttributeName const>> const&,
+                   std::vector<std::vector<triagens::basics::AttributeName>> const&,
                    std::vector<TRI_shape_pid_t> const&,
                    bool);
         
         GeoIndex2 (TRI_idx_iid_t,
                    struct TRI_document_collection_t*,
-                   std::vector<std::vector<triagens::basics::AttributeName const>> const&,
+                   std::vector<std::vector<triagens::basics::AttributeName>> const&,
                    std::vector<TRI_shape_pid_t> const&);
 
         ~GeoIndex2 ();
diff --git a/arangod/Indexes/HashIndex.cpp b/arangod/Indexes/HashIndex.cpp
index eb584ff3cb..444cab9617 100644
--- a/arangod/Indexes/HashIndex.cpp
+++ b/arangod/Indexes/HashIndex.cpp
@@ -250,7 +250,7 @@ static int HashIndex_find (TRI_hash_array_t const* hashArray,
 
 HashIndex::HashIndex (TRI_idx_iid_t iid,
                       TRI_document_collection_t* collection,
-                      std::vector<std::vector<triagens::basics::AttributeName const>> const& fields,
+                      std::vector<std::vector<triagens::basics::AttributeName>> const& fields,
                       std::vector<TRI_shape_pid_t> const& paths,
                       bool unique,
                       bool sparse) 
diff --git a/arangod/Indexes/HashIndex.h b/arangod/Indexes/HashIndex.h
index a1162b7078..593bdf9a08 100644
--- a/arangod/Indexes/HashIndex.h
+++ b/arangod/Indexes/HashIndex.h
@@ -57,7 +57,7 @@ namespace triagens {
 
         HashIndex (TRI_idx_iid_t,
                    struct TRI_document_collection_t*,
-                   std::vector<std::vector<triagens::basics::AttributeName const>> const&,
+                   std::vector<std::vector<triagens::basics::AttributeName>> const&,
                    std::vector<TRI_shape_pid_t> const&,
                    bool,
                    bool);
diff --git a/arangod/Indexes/Index.cpp b/arangod/Indexes/Index.cpp
index 21334bf5f8..c6015a39c0 100644
--- a/arangod/Indexes/Index.cpp
+++ b/arangod/Indexes/Index.cpp
@@ -45,7 +45,7 @@ using namespace triagens::arango;
 
 Index::Index (TRI_idx_iid_t iid,
               TRI_document_collection_t* collection,
-              std::vector<std::vector<triagens::basics::AttributeName const>> const& fields) 
+              std::vector<std::vector<triagens::basics::AttributeName>> const& fields) 
   : _iid(iid),
     _collection(collection),
     _fields(fields) {
diff --git a/arangod/Indexes/Index.h b/arangod/Indexes/Index.h
index 45384c9590..cad209b1f8 100644
--- a/arangod/Indexes/Index.h
+++ b/arangod/Indexes/Index.h
@@ -76,7 +76,7 @@ namespace triagens {
 
         Index (TRI_idx_iid_t,
                struct TRI_document_collection_t*,
-               std::vector<std::vector<triagens::basics::AttributeName const> >const&);
+               std::vector<std::vector<triagens::basics::AttributeName> >const&);
 
         virtual ~Index ();
 
@@ -118,7 +118,7 @@ namespace triagens {
 /// @brief return the index fields
 ////////////////////////////////////////////////////////////////////////////////
 
-        inline std::vector<std::vector<triagens::basics::AttributeName const>> const& fields () const {
+        inline std::vector<std::vector<triagens::basics::AttributeName>> const& fields () const {
           return _fields;
         }
 
@@ -208,7 +208,7 @@ namespace triagens {
 
         struct TRI_document_collection_t*                                      _collection;
 
-        std::vector<std::vector<triagens::basics::AttributeName const>> const  _fields;
+        std::vector<std::vector<triagens::basics::AttributeName>> const  _fields;
                
     };
 
diff --git a/arangod/Indexes/PrimaryIndex.cpp b/arangod/Indexes/PrimaryIndex.cpp
index 9abe276d6b..b0b59b3df0 100644
--- a/arangod/Indexes/PrimaryIndex.cpp
+++ b/arangod/Indexes/PrimaryIndex.cpp
@@ -73,7 +73,7 @@ uint64_t const PrimaryIndex::InitialSize = 251;
 // -----------------------------------------------------------------------------
 
 PrimaryIndex::PrimaryIndex (TRI_document_collection_t* collection) 
-  : Index(0, collection, std::vector<std::vector<triagens::basics::AttributeName const>>( { { { TRI_VOC_ATTRIBUTE_KEY, false } } } )) {
+  : Index(0, collection, std::vector<std::vector<triagens::basics::AttributeName>>( { { { TRI_VOC_ATTRIBUTE_KEY, false } } } )) {
 
   _primaryIndex._nrAlloc = 0;
   _primaryIndex._nrUsed  = 0;
diff --git a/arangod/Indexes/SkiplistIndex2.cpp b/arangod/Indexes/SkiplistIndex2.cpp
index 0f8525aa09..fe04870d21 100644
--- a/arangod/Indexes/SkiplistIndex2.cpp
+++ b/arangod/Indexes/SkiplistIndex2.cpp
@@ -127,7 +127,7 @@ static int FillLookupOperator (TRI_index_operator_t* slOperator,
 
 SkiplistIndex2::SkiplistIndex2 (TRI_idx_iid_t iid,
                                 TRI_document_collection_t* collection,
-                                std::vector<std::vector<triagens::basics::AttributeName const>> const& fields,
+                                std::vector<std::vector<triagens::basics::AttributeName>> const& fields,
                                 std::vector<TRI_shape_pid_t> const& paths,
                                 bool unique,
                                 bool sparse) 
diff --git a/arangod/Indexes/SkiplistIndex2.h b/arangod/Indexes/SkiplistIndex2.h
index e3c8a93056..0b0e75a30b 100644
--- a/arangod/Indexes/SkiplistIndex2.h
+++ b/arangod/Indexes/SkiplistIndex2.h
@@ -57,7 +57,7 @@ namespace triagens {
 
         SkiplistIndex2 (TRI_idx_iid_t,
                         struct TRI_document_collection_t*,
-                        std::vector<std::vector<triagens::basics::AttributeName const>> const&,
+                        std::vector<std::vector<triagens::basics::AttributeName>> const&,
                         std::vector<TRI_shape_pid_t> const&,
                         bool,
                         bool);
diff --git a/arangod/V8Server/v8-query.cpp b/arangod/V8Server/v8-query.cpp
index ccf57cec13..82b1b6001f 100644
--- a/arangod/V8Server/v8-query.cpp
+++ b/arangod/V8Server/v8-query.cpp
@@ -183,7 +183,7 @@ static void CalculateSkipLimitSlice (size_t length,
 ////////////////////////////////////////////////////////////////////////////////
 
 static TRI_index_operator_t* SetupConditionsSkiplist (v8::Isolate* isolate,
-                                                      std::vector<std::vector<triagens::basics::AttributeName const>> const& fields,
+                                                      std::vector<std::vector<triagens::basics::AttributeName>> const& fields,
                                                       VocShaper* shaper,
                                                       v8::Handle<v8::Object> conditions) {
   TRI_index_operator_t* lastOperator = nullptr;
@@ -396,7 +396,7 @@ MEM_ERROR:
 ////////////////////////////////////////////////////////////////////////////////
 
 static TRI_index_operator_t* SetupExampleSkiplist (v8::Isolate* isolate,
-                                                   std::vector<std::vector<triagens::basics::AttributeName const>> const& fields,
+                                                   std::vector<std::vector<triagens::basics::AttributeName>> const& fields,
                                                    VocShaper* shaper,
                                                    v8::Handle<v8::Object> example) {
   TRI_json_t* parameters = TRI_CreateArrayJson(TRI_UNKNOWN_MEM_ZONE);
diff --git a/arangod/VocBase/document-collection.cpp b/arangod/VocBase/document-collection.cpp
index 0a79619be0..bcbf362a9a 100644
--- a/arangod/VocBase/document-collection.cpp
+++ b/arangod/VocBase/document-collection.cpp
@@ -3371,7 +3371,7 @@ static int FillIndex (TRI_document_collection_t* document,
 ////////////////////////////////////////////////////////////////////////////////
 
 static triagens::arango::Index* LookupPathIndexDocumentCollection (TRI_document_collection_t* collection,
-                                                                   std::vector<std::vector<triagens::basics::AttributeName const>> const& paths,
+                                                                   std::vector<std::vector<triagens::basics::AttributeName>> const& paths,
                                                                    triagens::arango::Index::IndexType type,
                                                                    int sparsity,
                                                                    bool unique,
@@ -3764,7 +3764,7 @@ bool TRI_DropIndexDocumentCollection (TRI_document_collection_t* document,
 static int PidNamesByAttributeNames (std::vector<std::string> const& attributes,
                                      VocShaper* shaper,
                                      std::vector<TRI_shape_pid_t>& pids,
-                                     std::vector<std::vector<triagens::basics::AttributeName const>>& names,
+                                     std::vector<std::vector<triagens::basics::AttributeName>>& names,
                                      bool sorted,
                                      bool create) {
   pids.reserve(attributes.size());
@@ -3776,12 +3776,12 @@ static int PidNamesByAttributeNames (std::vector<std::string> const& attributes,
 
   if (sorted) {
     // combine name and pid
-    typedef std::pair<std::vector<triagens::basics::AttributeName const>, TRI_shape_pid_t> PidNameType;
+    typedef std::pair<std::vector<triagens::basics::AttributeName>, TRI_shape_pid_t> PidNameType;
     std::vector<PidNameType> pidNames;
     pidNames.reserve(attributes.size()); 
 
     for (auto const& name : attributes) {
-      std::vector<triagens::basics::AttributeName const> attrNameList;
+      std::vector<triagens::basics::AttributeName> attrNameList;
       TRI_ParseAttributeString(name, attrNameList);
       TRI_ASSERT(attrNameList.size() > 0);
       std::string pidPath;
@@ -3821,7 +3821,7 @@ static int PidNamesByAttributeNames (std::vector<std::string> const& attributes,
   else {
     for (auto const& name : attributes) {
 
-      std::vector<triagens::basics::AttributeName const> attrNameList;
+      std::vector<triagens::basics::AttributeName> attrNameList;
       TRI_ParseAttributeString(name, attrNameList);
       TRI_ASSERT(attrNameList.size() > 0);
       std::string pidPath;
@@ -4097,14 +4097,14 @@ static triagens::arango::Index* CreateGeoIndexDocumentCollection (TRI_document_c
 
   // create a new index
   if (! location.empty()) {
-    geoIndex.reset(new triagens::arango::GeoIndex2(iid, document, std::vector<std::vector<triagens::basics::AttributeName const>> { { { location, false } } }, std::vector<TRI_shape_pid_t>{ loc }, geoJson));
+    geoIndex.reset(new triagens::arango::GeoIndex2(iid, document, std::vector<std::vector<triagens::basics::AttributeName>> { { { location, false } } }, std::vector<TRI_shape_pid_t>{ loc }, geoJson));
 
     LOG_TRACE("created geo-index for location '%s': %ld",
               location.c_str(),
               (unsigned long) loc);
   }
   else if (! longitude.empty() && ! latitude.empty()) {
-    geoIndex.reset(new triagens::arango::GeoIndex2(iid, document, std::vector<std::vector<triagens::basics::AttributeName const>>{ { { latitude, false } } , { { longitude, false } } }, std::vector<TRI_shape_pid_t>{ lat, lon }));
+    geoIndex.reset(new triagens::arango::GeoIndex2(iid, document, std::vector<std::vector<triagens::basics::AttributeName>>{ { { latitude, false } } , { { longitude, false } } }, std::vector<TRI_shape_pid_t>{ lat, lon }));
 
     LOG_TRACE("created geo-index for location '%s': %ld, %ld",
               location.c_str(),
@@ -4389,7 +4389,7 @@ static triagens::arango::Index* CreateHashIndexDocumentCollection (TRI_document_
                                                                    bool unique,
                                                                    bool* created) {
   std::vector<TRI_shape_pid_t> paths;
-  std::vector<std::vector<triagens::basics::AttributeName const>> fields;
+  std::vector<std::vector<triagens::basics::AttributeName>> fields;
 
   // determine the sorted shape ids for the attributes
   int res = PidNamesByAttributeNames(attributes,
@@ -4488,7 +4488,7 @@ triagens::arango::Index* TRI_LookupHashIndexDocumentCollection (TRI_document_col
                                                                 int sparsity,
                                                                 bool unique) {
   std::vector<TRI_shape_pid_t> paths;
-  std::vector<std::vector<triagens::basics::AttributeName const>> fields;
+  std::vector<std::vector<triagens::basics::AttributeName>> fields;
 
   // determine the sorted shape ids for the attributes
   int res = PidNamesByAttributeNames(attributes,
@@ -4556,7 +4556,7 @@ static triagens::arango::Index* CreateSkiplistIndexDocumentCollection (TRI_docum
                                                                        bool unique,
                                                                        bool* created) {
   std::vector<TRI_shape_pid_t> paths;
-  std::vector<std::vector<triagens::basics::AttributeName const>> fields;
+  std::vector<std::vector<triagens::basics::AttributeName>> fields;
   
   int res = PidNamesByAttributeNames(attributes,
                                      document->getShaper(),  // ONLY IN INDEX, PROTECTED by RUNTIME
@@ -4652,7 +4652,7 @@ triagens::arango::Index* TRI_LookupSkiplistIndexDocumentCollection (TRI_document
                                                                     int sparsity,
                                                                     bool unique) {
   std::vector<TRI_shape_pid_t> paths;
-  std::vector<std::vector<triagens::basics::AttributeName const>> fields;
+  std::vector<std::vector<triagens::basics::AttributeName>> fields;
 
   // determine the unsorted shape ids for the attributes
   int res = PidNamesByAttributeNames(attributes,
diff --git a/lib/Basics/AttributeNameParser.cpp b/lib/Basics/AttributeNameParser.cpp
index 9d2a4a6e56..e6bb7e2a47 100644
--- a/lib/Basics/AttributeNameParser.cpp
+++ b/lib/Basics/AttributeNameParser.cpp
@@ -32,7 +32,7 @@
 
 void triagens::basics::TRI_ParseAttributeString (
     std::string const& input,
-    std::vector<AttributeName const>& result
+    std::vector<AttributeName>& result
   ) {
   size_t parsedUntil = 0;
   size_t length = input.length();
@@ -62,7 +62,7 @@ void triagens::basics::TRI_ParseAttributeString (
 }
 
 void triagens::basics::TRI_AttributeNamesToString (
-    std::vector<AttributeName const> const& input,
+    std::vector<AttributeName> const& input,
     std::string& result,
     bool excludeExpansion
   ) {
diff --git a/lib/Basics/AttributeNameParser.h b/lib/Basics/AttributeNameParser.h
index 6fdcb2b713..f061536b12 100644
--- a/lib/Basics/AttributeNameParser.h
+++ b/lib/Basics/AttributeNameParser.h
@@ -77,7 +77,7 @@ namespace triagens {
 
     void TRI_ParseAttributeString (
         std::string const& input,
-        std::vector<AttributeName const>& result
+        std::vector<AttributeName>& result
       );
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -85,7 +85,7 @@ namespace triagens {
 ////////////////////////////////////////////////////////////////////////////////
 
     void TRI_AttributeNamesToString (
-        std::vector<AttributeName const> const& input,
+        std::vector<AttributeName> const& input,
         std::string& result,
         bool excludeExpansion = false
       );