@@ -43,20 +43,20 @@
 
 				if (UINT32_MAX - c < 1)
 					@throw [OFOutOfRangeException
 					    exception];
 
-				newSize = OF_ROUND_UP_POW2(CHAR_BIT, c + 1) /
+				newSize = OFRoundUpToPowerOf2(CHAR_BIT, c + 1) /
 				    CHAR_BIT;
 
 				_bitset = OFResizeMemory(_bitset, newSize, 1);
 				memset(_bitset + _size, '\0', newSize - _size);
 
 				_size = newSize;
 			}
 
-			of_bitset_set(_bitset, c);
+			OFBitsetSet(_bitset, c);
 		}
 
 		objc_autoreleasePoolPop(pool);
 	} @catch (id e) {
 		[self release];
@@ -76,8 +76,8 @@
 - (bool)characterIsMember: (OFUnichar)character
 {
 	if (character / CHAR_BIT >= _size)
 		return false;
 
-	return of_bitset_isset(_bitset, character);
+	return OFBitsetIsSet(_bitset, character);
 }
 @end