diff --git a/common/include/villas/cpuset.hpp b/common/include/villas/cpuset.hpp
index c738d1e29..19bf3cd6f 100644
--- a/common/include/villas/cpuset.hpp
+++ b/common/include/villas/cpuset.hpp
@@ -167,17 +167,12 @@ public:
 		return lhs;
 	}
 
-	//bool& operator[](std::size_t cpu)
-	//{
-	//	void cpuset_set_cpu(cpuset_t*setp, cpu_t cpu, int state)
-	//}
-
 	bool operator[](size_t cpu) const
 	{
-		return isset(cpu);
+		return isSet(cpu);
 	}
 
-	bool isset(size_t cpu) const
+	bool isSet(size_t cpu) const
 	{
 		return CPU_ISSET_S(cpu, sz, setp);
 	}
diff --git a/common/lib/cpuset.cpp b/common/lib/cpuset.cpp
index 951bb917e..f5506a22e 100644
--- a/common/lib/cpuset.cpp
+++ b/common/lib/cpuset.cpp
@@ -84,7 +84,7 @@ CpuSet::operator uintmax_t()
 	uintmax_t iset = 0;
 
 	for (size_t i = 0; i < num_cpus; i++) {
-		if (isset(i))
+		if (isSet(i))
 			iset |= 1ULL << i;
 	}
 
@@ -98,10 +98,10 @@ CpuSet::operator std::string ()
 	bool first = true;
 
 	for (size_t i = 0; i < num_cpus; i++) {
-		if (isset(i)) {
+		if (isSet(i)) {
 			size_t run = 0;
 			for (size_t j = i + 1; j < num_cpus; j++) {
-				if (!isset(j))
+				if (!isSet(j))
 					break;
 
 				run++;
diff --git a/common/tests/unit/utils.cpp b/common/tests/unit/utils.cpp
index 86f2649ce..e823d676d 100644
--- a/common/tests/unit/utils.cpp
+++ b/common/tests/unit/utils.cpp
@@ -88,8 +88,8 @@ Test(utils, cpuset)
 	cr_assert_eq(cset3, cset4);
 	cr_assert_eq(cset3.count(), 5);
 
-	cr_assert(cset3.isset(3));
-	cr_assert_not(cset3.isset(6));
+	cr_assert(cset3.isSet(3));
+	cr_assert_not(cset3.isSet(6));
 
 	cr_assert(cset3[3]);
 	cr_assert_not(cset3[6]);