diff --git a/bin/app/data/color_scheme_template.xml b/bin/app/data/color_scheme_template.xml
index 544291f8..4da0167f 100644
--- a/bin/app/data/color_scheme_template.xml
+++ b/bin/app/data/color_scheme_template.xml
@@ -179,7 +179,7 @@
 			<struct></struct>
 			<enum></enum>
 			<typedef></typedef>
-			<template_parameter_type></template_parameter_type>
+			<template_parameter></template_parameter>
 			<type_parameter></type_parameter>
 
 			<function></function>
diff --git a/bin/app/data/color_schemes/bad_rainbow.xml b/bin/app/data/color_schemes/bad_rainbow.xml
index db6cd8a0..1375f3d3 100644
--- a/bin/app/data/color_schemes/bad_rainbow.xml
+++ b/bin/app/data/color_schemes/bad_rainbow.xml
@@ -283,9 +283,9 @@
 			<typedef>
 				<like>type</like>
 			</typedef>
-			<template_parameter_type>
+			<template_parameter>
 				<like>type</like>
-			</template_parameter_type>
+			</template_parameter>
 			<type_parameter>
 				<like>type</like>
 			</type_parameter>
diff --git a/bin/app/data/color_schemes/bright.xml b/bin/app/data/color_schemes/bright.xml
index 7dbdd530..23afac14 100644
--- a/bin/app/data/color_schemes/bright.xml
+++ b/bin/app/data/color_schemes/bright.xml
@@ -275,9 +275,9 @@
 			<typedef>
 				<like>type</like>
 			</typedef>
-			<template_parameter_type>
+			<template_parameter>
 				<like>type</like>
-			</template_parameter_type>
+			</template_parameter>
 			<type_parameter>
 				<like>type</like>
 			</type_parameter>
diff --git a/bin/app/data/color_schemes/dark.xml b/bin/app/data/color_schemes/dark.xml
index 4c9aee0e..08ba3907 100644
--- a/bin/app/data/color_schemes/dark.xml
+++ b/bin/app/data/color_schemes/dark.xml
@@ -278,9 +278,9 @@
 			<typedef>
 				<like>type</like>
 			</typedef>
-			<template_parameter_type>
+			<template_parameter>
 				<like>type</like>
-			</template_parameter_type>
+			</template_parameter>
 			<type_parameter>
 				<like>type</like>
 			</type_parameter>
diff --git a/src/lib/component/controller/GraphController.cpp b/src/lib/component/controller/GraphController.cpp
index efc38026..ead358fd 100644
--- a/src/lib/component/controller/GraphController.cpp
+++ b/src/lib/component/controller/GraphController.cpp
@@ -2431,7 +2431,7 @@ void GraphController::createLegendGraph()
 		i += 1;
 
 		Node* templateNode = addNode(NodeType::NODE_TYPE, L"TemplateType<typename ParameterType>", Vec2i(x, y + dy * ++i));
-		Node* templateParameterNode = addNode(NodeType::NODE_TEMPLATE_PARAMETER_TYPE, L"ParameterType", Vec2i());
+		Node* templateParameterNode = addNode(NodeType::NODE_TEMPLATE_PARAMETER, L"ParameterType", Vec2i());
 		addMember(templateNode, templateParameterNode, ACCESS_TEMPLATE_PARAMETER);
 		y += 5;
 		i += 2;
diff --git a/src/lib/data/NodeType.cpp b/src/lib/data/NodeType.cpp
index ae2d730b..e00135cd 100644
--- a/src/lib/data/NodeType.cpp
+++ b/src/lib/data/NodeType.cpp
@@ -62,8 +62,8 @@ NodeType::Type NodeType::intToType(int value)
 		return NodeType::NODE_ENUM_CONSTANT;
 	case NodeType::NODE_TYPEDEF:
 		return NodeType::NODE_TYPEDEF;
-	case NodeType::NODE_TEMPLATE_PARAMETER_TYPE:
-		return NodeType::NODE_TEMPLATE_PARAMETER_TYPE;
+	case NodeType::NODE_TEMPLATE_PARAMETER:
+		return NodeType::NODE_TEMPLATE_PARAMETER;
 	case NodeType::NODE_TYPE_PARAMETER:
 		return NodeType::NODE_TYPE_PARAMETER;
 	case NodeType::NODE_FILE:
@@ -113,8 +113,8 @@ std::string NodeType::getReadableTypeString(NodeType::Type type)
 		return "enum constant";
 	case NodeType::NODE_TYPEDEF:
 		return "typedef";
-	case NodeType::NODE_TEMPLATE_PARAMETER_TYPE:
-		return "template parameter type";
+	case NodeType::NODE_TEMPLATE_PARAMETER:
+		return "template parameter";
 	case NodeType::NODE_TYPE_PARAMETER:
 		return "type parameter";
 	case NodeType::NODE_FILE:
@@ -414,7 +414,7 @@ NodeType::StyleType NodeType::getNodeStyle() const
 	case NodeType::NODE_ANNOTATION:
 	case NodeType::NODE_ENUM:
 	case NodeType::NODE_TYPEDEF:
-	case NodeType::NODE_TEMPLATE_PARAMETER_TYPE:
+	case NodeType::NODE_TEMPLATE_PARAMETER:
 	case NodeType::NODE_TYPE_PARAMETER:
 	case NodeType::NODE_FILE:
 	case NodeType::NODE_MACRO:
diff --git a/src/lib/data/NodeType.h b/src/lib/data/NodeType.h
index 61dbad3e..83d771e3 100644
--- a/src/lib/data/NodeType.h
+++ b/src/lib/data/NodeType.h
@@ -34,7 +34,7 @@ public:
 		NODE_ENUM = 1 << 13,
 		NODE_ENUM_CONSTANT = 1 << 14,
 		NODE_TYPEDEF = 1 << 15,
-		NODE_TEMPLATE_PARAMETER_TYPE = 1 << 16,
+		NODE_TEMPLATE_PARAMETER = 1 << 16,
 		NODE_TYPE_PARAMETER = 1 << 17,
 
 		NODE_FILE = 1 << 18,
diff --git a/src/lib/data/NodeTypeSet.cpp b/src/lib/data/NodeTypeSet.cpp
index 4d2a4796..b12c7379 100644
--- a/src/lib/data/NodeTypeSet.cpp
+++ b/src/lib/data/NodeTypeSet.cpp
@@ -188,7 +188,7 @@ const std::vector<NodeType> NodeTypeSet::s_allNodeTypes = {
 	NodeType(NodeType::NODE_ENUM),
 	NodeType(NodeType::NODE_ENUM_CONSTANT),
 	NodeType(NodeType::NODE_TYPEDEF),
-	NodeType(NodeType::NODE_TEMPLATE_PARAMETER_TYPE),
+	NodeType(NodeType::NODE_TEMPLATE_PARAMETER),
 	NodeType(NodeType::NODE_TYPE_PARAMETER),
 	NodeType(NodeType::NODE_FILE),
 	NodeType(NodeType::NODE_MACRO),
diff --git a/src/lib/data/parser/ParserClientImpl.cpp b/src/lib/data/parser/ParserClientImpl.cpp
index 71896ecb..958e2081 100644
--- a/src/lib/data/parser/ParserClientImpl.cpp
+++ b/src/lib/data/parser/ParserClientImpl.cpp
@@ -128,7 +128,7 @@ NodeType ParserClientImpl::symbolKindToNodeType(SymbolKind symbolKind) const
 	case SYMBOL_STRUCT:
 		return NodeType::NODE_STRUCT;
 	case SYMBOL_TEMPLATE_PARAMETER:
-		return NodeType::NODE_TEMPLATE_PARAMETER_TYPE;
+		return NodeType::NODE_TEMPLATE_PARAMETER;
 	case SYMBOL_TYPEDEF:
 		return NodeType::NODE_TYPEDEF;
 	case SYMBOL_TYPE_PARAMETER:
diff --git a/src/test/helper/TestIntermediateStorage.h b/src/test/helper/TestIntermediateStorage.h
index def9cc86..3370a704 100644
--- a/src/test/helper/TestIntermediateStorage.h
+++ b/src/test/helper/TestIntermediateStorage.h
@@ -350,7 +350,7 @@ private:
 			return L"SYMBOL_PACKAGE";
 		case NodeType::NODE_STRUCT:
 			return L"SYMBOL_STRUCT";
-		case NodeType::NODE_TEMPLATE_PARAMETER_TYPE:
+		case NodeType::NODE_TEMPLATE_PARAMETER:
 			return L"SYMBOL_TEMPLATE_PARAMETER";
 		case NodeType::NODE_TYPEDEF:
 			return L"SYMBOL_TYPEDEF";
@@ -438,7 +438,7 @@ private:
 			return &structs;
 		case NodeType::NODE_MACRO:
 			return &macros;
-		case NodeType::NODE_TEMPLATE_PARAMETER_TYPE:
+		case NodeType::NODE_TEMPLATE_PARAMETER:
 			return &templateParameterTypes;
 		case NodeType::NODE_TYPE_PARAMETER:
 			return &typeParameters;