diff -r fe67489523b5 -r 6e838748867b src/objecttypes/conditionaledge.h
--- a/src/objecttypes/conditionaledge.h	Sun Nov 03 17:57:21 2019 +0200
+++ b/src/objecttypes/conditionaledge.h	Sun Nov 03 18:09:47 2019 +0200
@@ -1,12 +1,12 @@
 #pragma once
 #include "edge.h"
 
-namespace modelobjects
+namespace linetypes
 {
 	class ConditionalEdge;
 }
 
-class modelobjects::ConditionalEdge : public Edge
+class linetypes::ConditionalEdge : public Edge
 {
 public:
 	ConditionalEdge() = default;
@@ -15,7 +15,7 @@
 		const Vertex& point_2,
 		const Vertex& controlPoint_1,
 		const Vertex& controlPoint_2,
-		const Color color_index = colors::edge);
+		const Color colorIndex = colors::edge);
 	ConditionalEdge(const QVector<Vertex>& vertices, const Color color);
 	QVariant getProperty(Property property) const override;
 	SetPropertyResult setProperty(