diff --git a/include/villas/nodes/signal_generator.h b/include/villas/nodes/signal_generator.h
index 4220cb486..fe5f57c6d 100644
--- a/include/villas/nodes/signal_generator.h
+++ b/include/villas/nodes/signal_generator.h
@@ -77,11 +77,11 @@ char * signal_generator_print(struct node *n);
 /** @see node_type::parse */
 int signal_generator_parse(struct node *n, json_t *cfg);
 
-/** @see node_type::open */
-int signal_generator_open(struct node *n);
+/** @see node_type::start */
+int signal_generator_start(struct node *n);
 
-/** @see node_type::close */
-int signal_generator_close(struct node *n);
+/** @see node_type::stop */
+int signal_generator_stop(struct node *n);
 
 /** @see node_type::read */
 int signal_generator_read(struct node *n, struct sample *smps[], unsigned cnt);
diff --git a/lib/nodes/signal_generator.c b/lib/nodes/signal_generator.c
index ef6862bbe..020dc1657 100644
--- a/lib/nodes/signal_generator.c
+++ b/lib/nodes/signal_generator.c
@@ -170,7 +170,7 @@ check:		if (optarg == endptr)
 	return 0;
 }
 
-int signal_generator_open(struct node *n)
+int signal_generator_start(struct node *n)
 {
 	int ret;
 	struct signal_generator *s = (struct signal_generator *) n->_vd;
@@ -192,7 +192,7 @@ int signal_generator_open(struct node *n)
 	return 0;
 }
 
-int signal_generator_close(struct node *n)
+int signal_generator_stop(struct node *n)
 {
 	int ret;
 	struct signal_generator *s = (struct signal_generator *) n->_vd;
@@ -312,8 +312,8 @@ static struct plugin p = {
 		.parse = signal_generator_parse,
 		.parse_cli = signal_generator_parse_cli,
 		.print = signal_generator_print,
-		.start = signal_generator_open,
-		.stop  = signal_generator_close,
+		.start = signal_generator_start,
+		.stop  = signal_generator_stop,
 		.read  = signal_generator_read,
 		.fd    = signal_generator_fd
 	}