diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index be54c093c..104ccc217 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -61,6 +61,7 @@ find_package(Criterion)
 
 pkg_check_modules(JANSSON IMPORTED_TARGET REQUIRED jansson>=2.7)
 pkg_check_modules(LIBCONFIG IMPORTED_TARGET libconfig>=1.4.9)
+pkg_check_modules(UUID IMPORTED_TARGET REQUIRED uuid>=2.23)
 
 add_subdirectory(lib)
 if(CRITERION_FOUND AND TOPLEVEL_PROJECT)
diff --git a/common/Dockerfile b/common/Dockerfile
index 0db17ab74..275f2ba81 100644
--- a/common/Dockerfile
+++ b/common/Dockerfile
@@ -53,6 +53,7 @@ RUN dnf -y install \
 	jansson-devel \
 	libcurl-devel \
 	libconfig-devel \
+	libuuid-devel \
 	spdlog-devel \
 	fmt-devel \
 	openssl-devel openssl
diff --git a/common/lib/CMakeLists.txt b/common/lib/CMakeLists.txt
index 50018aba8..b8e86b439 100644
--- a/common/lib/CMakeLists.txt
+++ b/common/lib/CMakeLists.txt
@@ -72,6 +72,7 @@ target_include_directories(villas-common PUBLIC
 
 target_link_libraries(villas-common PUBLIC
 	PkgConfig::JANSSON
+	PkgConfig::UUID
 	${OPENSSL_LIBRARIES}
 	${CURL_LIBRARIES}
 	${CMAKE_DL_LIBS}
diff --git a/common/tests/unit/list.cpp b/common/tests/unit/list.cpp
index e072c753b..bcff76f8e 100644
--- a/common/tests/unit/list.cpp
+++ b/common/tests/unit/list.cpp
@@ -33,7 +33,7 @@ using namespace villas;
 static const char *nouns[] = { "time", "person", "year", "way", "day", "thing", "man", "world", "life", "hand", "part", "child", "eye", "woman", "place", "work", "week", "case", "point", "government", "company", "number", "group", "problem", "fact" };
 
 struct data {
-	const char *tag;
+	const char *name;
 	int data;
 };
 
@@ -50,7 +50,7 @@ Test(list, vlist_lookup_name)
 		if (!d)
 			throw MemoryAllocationError();
 
-		d->tag = nouns[i];
+		d->name = nouns[i];
 		d->data = i;
 
 		vlist_push(&l, d);