diff --git a/include/villas/memory_type.h b/include/villas/memory_type.h
index 8d927cf3d..6139cd2e2 100644
--- a/include/villas/memory_type.h
+++ b/include/villas/memory_type.h
@@ -55,7 +55,7 @@ struct memory_type {
 	void *_vd; /**< Virtual data for internal state */
 };
 
-extern struct memory_type memory_type_heap;
+extern struct memory_type memory_heap;
 extern struct memory_type memory_hugepage;
 
 struct ibv_mr * memory_type_ib_mr(void *ptr);
diff --git a/lib/api.c b/lib/api.c
index 3a7912242..d46035edb 100644
--- a/lib/api.c
+++ b/lib/api.c
@@ -272,7 +272,7 @@ int api_init(struct api *a, struct super_node *sn)
 	if (ret)
 		return ret;
 
-	ret = queue_signalled_init(&a->pending, 1024, &memory_type_heap, 0);
+	ret = queue_signalled_init(&a->pending, 1024, &memory_heap, 0);
 	if (ret)
 		return ret;
 
diff --git a/lib/api/session.c b/lib/api/session.c
index f5f4ce62d..9dc27eff3 100644
--- a/lib/api/session.c
+++ b/lib/api/session.c
@@ -42,11 +42,11 @@ int api_session_init(struct api_session *s, enum api_mode m)
 	if (ret)
 		return ret;
 
-	ret = queue_init(&s->request.queue, 128, &memory_type_heap);
+	ret = queue_init(&s->request.queue, 128, &memory_heap);
 	if (ret)
 		return ret;
 
-	ret = queue_init(&s->response.queue, 128, &memory_type_heap);
+	ret = queue_init(&s->response.queue, 128, &memory_heap);
 	if (ret)
 		return ret;
 
diff --git a/lib/memory/heap.c b/lib/memory/heap.c
index 353a6840f..2b0469646 100644
--- a/lib/memory/heap.c
+++ b/lib/memory/heap.c
@@ -57,7 +57,7 @@ static int memory_heap_free(struct memory_type *m, struct memory_allocation *ma)
 }
 
 /* List of available memory types */
-struct memory_type memory_type_heap = {
+struct memory_type memory_heap = {
 	.name = "heap",
 	.flags = MEMORY_HEAP,
 	.alloc = memory_heap_alloc,
diff --git a/lib/nodes/infiniband.c b/lib/nodes/infiniband.c
index 2356a3e2e..1695ebfb4 100644
--- a/lib/nodes/infiniband.c
+++ b/lib/nodes/infiniband.c
@@ -652,7 +652,7 @@ int ib_start(struct node *n)
 	ib_create_bind_id(n);
 
 	// Initialize send Work Completion queue
-	queue_init(&ib->conn.send_wc_buffer, ib->qp_init.cap.max_send_wr, &memory_type_heap);
+	queue_init(&ib->conn.send_wc_buffer, ib->qp_init.cap.max_send_wr, &memory_heap);
 
 	debug(LOG_IB | 3, "Initialized Work Completion Buffer");
 
diff --git a/src/villas-signal.cpp b/src/villas-signal.cpp
index 1c509d7c3..894b1d5ad 100644
--- a/src/villas-signal.cpp
+++ b/src/villas-signal.cpp
@@ -249,7 +249,7 @@ int main(int argc, char *argv[])
 	if (ret)
 		error("Failed to verify node configuration");
 
-	ret = pool_init(&q, 16, SAMPLE_LENGTH(n.samplelen), &memory_type_heap);
+	ret = pool_init(&q, 16, SAMPLE_LENGTH(n.in.samplelen), &memory_heap);
 	if (ret)
 		error("Failed to initialize pool");
 
diff --git a/src/villas-test-cmp.cpp b/src/villas-test-cmp.cpp
index 9301cae9a..1ca3eddeb 100644
--- a/src/villas-test-cmp.cpp
+++ b/src/villas-test-cmp.cpp
@@ -121,7 +121,7 @@ check:		if (optarg == endptr)
 	struct side s[n];
 
 	memory_init(0);
-	ret = pool_init(&pool, n, SAMPLE_LENGTH(DEFAULT_SAMPLE_LENGTH), &memory_type_heap);
+	ret = pool_init(&pool, n, SAMPLE_LENGTH(DEFAULT_SAMPLE_LENGTH), &memory_heap);
 	if (ret)
 		error("Failed to initialize pool");
 
diff --git a/tests/unit/memory.c b/tests/unit/memory.c
index 821795afd..c2a06eaf4 100644
--- a/tests/unit/memory.c
+++ b/tests/unit/memory.c
@@ -70,7 +70,7 @@ Test(memory, manager) {
 	ret = memory_init(0);
 	cr_assert(!ret);
 
-	p = memory_alloc(&memory_type_heap, total_size);
+	p = memory_alloc(&memory_heap, total_size);
 	cr_assert_not_null(p);
 
 	m = memory_managed(p, total_size);
diff --git a/tests/unit/pool.c b/tests/unit/pool.c
index e2958185a..ca0113681 100644
--- a/tests/unit/pool.c
+++ b/tests/unit/pool.c
@@ -38,10 +38,10 @@ struct param {
 ParameterizedTestParameters(pool, basic)
 {
 	static struct param params[] = {
-		{ 1,	4096,	150,	&memory_type_heap },
+		{ 1,	4096,	150,	&memory_heap },
 		{ 1,	128,	8,	&memory_hugepage },
 		{ 1,	4,	8192,	&memory_hugepage },
-		{ 1,	1 << 13, 4,	&memory_type_heap }
+		{ 1,	1 << 13, 4,	&memory_heap }
 	};
 
 	return cr_make_param_array(struct param, params, ARRAY_LEN(params));
diff --git a/tests/unit/queue.c b/tests/unit/queue.c
index 25a5210de..2ab18e410 100644
--- a/tests/unit/queue.c
+++ b/tests/unit/queue.c
@@ -244,7 +244,7 @@ Test(queue, single_threaded)
 		.start = 1 /* we start immeadiatly */
 	};
 
-	ret = queue_init(&p.queue, p.queue_size, &memory_type_heap);
+	ret = queue_init(&p.queue, p.queue_size, &memory_heap);
 	cr_assert_eq(ret, 0, "Failed to create queue");
 
 	producer(&p);
@@ -266,28 +266,28 @@ ParameterizedTestParameters(queue, multi_threaded)
 			.thread_count = 32,
 			.thread_func = producer_consumer_many,
 			.batch_size = 10,
-			.memory_type = &memory_type_heap
+			.memory_type = &memory_heap
 		}, {
 			.iter_count = 1 << 8,
 			.queue_size = 1 << 9,
 			.thread_count = 4,
 			.thread_func = producer_consumer_many,
 			.batch_size = 100,
-			.memory_type = &memory_type_heap
+			.memory_type = &memory_heap
 		}, {
 			.iter_count = 1 << 16,
 			.queue_size = 1 << 14,
 			.thread_count = 16,
 			.thread_func = producer_consumer_many,
 			.batch_size = 100,
-			.memory_type = &memory_type_heap
+			.memory_type = &memory_heap
 		}, {
 			.iter_count = 1 << 8,
 			.queue_size = 1 << 9,
 			.thread_count = 4,
 			.thread_func = producer_consumer_many,
 			.batch_size = 10,
-			.memory_type = &memory_type_heap
+			.memory_type = &memory_heap
 		}, {
 			.iter_count = 1 << 16,
 			.queue_size = 1 << 9,
@@ -309,7 +309,7 @@ ParameterizedTest(struct param *p, queue, multi_threaded, .timeout = 20)
 
 	p->start = 0;
 
-	ret = queue_init(&p->queue, p->queue_size, &memory_type_heap);
+	ret = queue_init(&p->queue, p->queue_size, &memory_heap);
 	cr_assert_eq(ret, 0, "Failed to create queue");
 
 	uint64_t start_tsc_time, end_tsc_time;
@@ -351,7 +351,7 @@ Test(queue, init_destroy)
 	int ret;
 	struct queue q = { .state = STATE_DESTROYED };
 
-	ret = queue_init(&q, 1024, &memory_type_heap);
+	ret = queue_init(&q, 1024, &memory_heap);
 	cr_assert_eq(ret, 0); /* Should succeed */
 
 	ret = queue_destroy(&q);
diff --git a/tests/unit/queue_signalled.c b/tests/unit/queue_signalled.c
index 891dd476b..23c7e5f89 100644
--- a/tests/unit/queue_signalled.c
+++ b/tests/unit/queue_signalled.c
@@ -132,7 +132,7 @@ ParameterizedTest(struct param *param, queue_signalled, simple, .timeout = 5)
 
 	pthread_t t1, t2;
 
-	ret = queue_signalled_init(&q, LOG2_CEIL(NUM_ELEM), &memory_type_heap, param->flags);
+	ret = queue_signalled_init(&q, LOG2_CEIL(NUM_ELEM), &memory_heap, param->flags);
 	cr_assert_eq(ret, 0, "Failed to initialize queue: flags=%#x, ret=%d", param->flags, ret);
 
 	ret = pthread_create(&t1, NULL, producer, &q);