diff --git a/Descriptors/BaseDescriptor.h b/Descriptors/BaseDescriptor.h
index 12a9a15af..6c54f2f3f 100644
--- a/Descriptors/BaseDescriptor.h
+++ b/Descriptors/BaseDescriptor.h
@@ -36,8 +36,8 @@ or see http://www.gnu.org/licenses/agpl.txt.
 #include <string>
 #include <vector>
 
-struct _DescriptorConfig {
-    _DescriptorConfig() : instructions(true), geometry(true), encodeGeometry(true), z(18) {}
+struct DescriptorConfig {
+    DescriptorConfig() : instructions(true), geometry(true), encodeGeometry(true), z(18) {}
     bool instructions;
     bool geometry;
     bool encodeGeometry;
@@ -51,7 +51,7 @@ public:
     //Maybe someone can explain the pure virtual destructor thing to me (dennis)
     virtual ~BaseDescriptor() { }
     virtual void Run(http::Reply & reply, const RawRouteData &rawRoute, PhantomNodes &phantomNodes, const DataFacadeT * facade) = 0;
-    virtual void SetConfig(const _DescriptorConfig & config) = 0;
+    virtual void SetConfig(const DescriptorConfig & config) = 0;
 };
 
 #endif /* BASE_DESCRIPTOR_H_ */
diff --git a/Descriptors/GPXDescriptor.h b/Descriptors/GPXDescriptor.h
index fc91c9e97..7cf394bc2 100644
--- a/Descriptors/GPXDescriptor.h
+++ b/Descriptors/GPXDescriptor.h
@@ -28,12 +28,12 @@ or see http://www.gnu.org/licenses/agpl.txt.
 template<class DataFacadeT>
 class GPXDescriptor : public BaseDescriptor<DataFacadeT> {
 private:
-    _DescriptorConfig config;
+    DescriptorConfig config;
     FixedPointCoordinate current;
 
     std::string tmp;
 public:
-    void SetConfig(const _DescriptorConfig& c) { config = c; }
+    void SetConfig(const DescriptorConfig& c) { config = c; }
 
     //TODO: reorder parameters
     void Run(
diff --git a/Descriptors/JSONDescriptor.h b/Descriptors/JSONDescriptor.h
index 25d6e7b58..0f4c2c6af 100644
--- a/Descriptors/JSONDescriptor.h
+++ b/Descriptors/JSONDescriptor.h
@@ -37,7 +37,7 @@ or see http://www.gnu.org/licenses/agpl.txt.
 template<class DataFacadeT>
 class JSONDescriptor : public BaseDescriptor<DataFacadeT> {
 private:
-    _DescriptorConfig config;
+    DescriptorConfig config;
     DescriptionFactory description_factory;
     DescriptionFactory alternateDescriptionFactory;
     FixedPointCoordinate current;
@@ -71,7 +71,7 @@ private:
 
 public:
     JSONDescriptor() : entered_restricted_area_count(0) {}
-    void SetConfig(const _DescriptorConfig & c) { config = c; }
+    void SetConfig(const DescriptorConfig & c) { config = c; }
 
     //TODO: reorder
     void Run(