diff --git a/include/villas/node_type.h b/include/villas/node_type.h
index b728349fb..9b8ca66c3 100644
--- a/include/villas/node_type.h
+++ b/include/villas/node_type.h
@@ -83,7 +83,7 @@ struct node_type {
 	 * @retval <0	Error. Something went wrong.
 	 */
 	int (*parse)(struct node *n, config_setting_t *cfg);
-	
+
 	/** Parse node from command line arguments. */
 	int (*parse_cli)(struct node *n, int argc, char *argv[]);
 
@@ -116,7 +116,7 @@ struct node_type {
 	 * using gathering techniques (struct iovec).
 	 * The messages will be stored in a circular buffer / array @p m.
 	 * Indexes used to address @p m will wrap around after len messages.
-	 * Some node types might only support to receive one message at a time.
+	 * Some node-types might only support to receive one message at a time.
 	 *
 	 * @param n		A pointer to the node object.
 	 * @param smps		An array of pointers to memory blocks where the function should store received samples.
@@ -141,7 +141,7 @@ struct node_type {
 
 	/** Reverse source and destination of a node.
 	 *
-	 * This is not supported by all node types!
+	 * This is not supported by all node-types!
 	 *
 	 * @param n		A pointer to the node object.
 	 */
@@ -163,4 +163,4 @@ int node_type_stop(struct node_type *vt);
 /** Return a printable representation of the node-type. */
 char * node_type_name(struct node_type *vt);
 
-/** @} */
\ No newline at end of file
+/** @} */
diff --git a/lib/Makefile.villas.inc b/lib/Makefile.villas.inc
index b9c3ab0d0..62de6791b 100644
--- a/lib/Makefile.villas.inc
+++ b/lib/Makefile.villas.inc
@@ -40,7 +40,7 @@ LIB_LDLIBS  = $(LDLIBS) -ldl -lrt -Wl,-soname,$(LIB_NAME).so.$(LIB_ABI_VERSION)
 
 LIB_PKGS += libwebsockets openssl
 
-######## Node types ########
+######## Node-types ########
 
 # Enable Socket node type when libnl3 is available
 ifndef WITHOUT_SOCKET
diff --git a/lib/super_node.c b/lib/super_node.c
index 14e11379e..0ae7cee38 100644
--- a/lib/super_node.c
+++ b/lib/super_node.c
@@ -341,7 +341,7 @@ int super_node_start(struct super_node *sn)
 	api_start(&sn->api);
 	web_start(&sn->web);
 
-	info("Start node types");
+	info("Starting node-types");
 	for (size_t i = 0; i < list_length(&sn->nodes); i++) { INDENT
 		struct node *n = list_at(&sn->nodes, i);
 
@@ -398,7 +398,7 @@ int super_node_stop(struct super_node *sn)
 			error("Failed to stop node: %s", node_name(n));
 	}
 
-	info("Stopping node types");
+	info("Stopping node-types");
 	for (size_t i = 0; i < list_length(&plugins); i++) { INDENT
 		struct plugin *p = list_at(&plugins, i);
 
diff --git a/src/node.c b/src/node.c
index ffc63fca4..9ccdcf54c 100644
--- a/src/node.c
+++ b/src/node.c
@@ -51,7 +51,7 @@ static void quit(int signal, siginfo_t *sinfo, void *ctx)
 
 	if (sn.stats > 0)
 		stats_print_footer(STATS_FORMAT_HUMAN);
-	
+
 	ret = super_node_stop(&sn);
 	if (ret)
 		error("Failed to stop super node");
@@ -75,7 +75,7 @@ static void usage()
 	printf("  This type of invocation is used by OPAL-RT Asynchronous processes.\n");
 	printf("  See in the RT-LAB User Guide for more information.\n\n");
 #endif
-	printf("Supported node types:\n");
+	printf("Supported node-types:\n");
 	plugin_dump(PLUGIN_TYPE_NODE);
 	printf("\n");
 
@@ -138,7 +138,7 @@ int main(int argc, char *argv[])
 		if (sn.stats > 0 && time_delta(&last, &now) > sn.stats) {
 			for (size_t i = 0; i < list_length(&sn.paths); i++) {
 				struct path *p = list_at(&sn.paths, i);
-				
+
 				if (p->state != STATE_STARTED)
 					continue;