@@ -42,20 +42,20 @@
 @interface OFNumberSingleton: OFNumber
 @end
 
 #ifdef OF_OBJFW_RUNTIME
 enum Tag {
-	TagChar,
-	TagShort,
-	TagInt,
-	TagLong,
-	TagLongLong,
-	TagUnsignedChar,
-	TagUnsignedShort,
-	TagUnsignedInt,
-	TagUnsignedLong,
-	TagUnsignedLongLong,
+	tagChar,
+	tagShort,
+	tagInt,
+	tagLong,
+	tagLongLong,
+	tagUnsignedChar,
+	tagUnsignedShort,
+	tagUnsignedInt,
+	tagUnsignedLong,
+	tagUnsignedLongLong,
 };
 static const uint_fast8_t tagBits = 4;
 static const uintptr_t tagMask = 0xF;
 
 @interface OFTaggedPointerNumber: OFNumberSingleton
@@ -172,11 +172,11 @@
 		OFOnce(&onceControl, charZeroNumberInit);
 		return (id)charZeroNumber;
 #ifdef OF_OBJFW_RUNTIME
 	} else if ((unsigned char)value <= (UINTPTR_MAX >> tagBits)) {
 		id ret = objc_createTaggedPointer(numberTag,
-		    ((uintptr_t)(unsigned char)value << tagBits) | TagChar);
+		    ((uintptr_t)(unsigned char)value << tagBits) | tagChar);
 
 		if (ret != nil)
 			return ret;
 #endif
 	}
@@ -191,11 +191,11 @@
 		OFOnce(&onceControl, shortZeroNumberInit);
 		return (id)shortZeroNumber;
 #ifdef OF_OBJFW_RUNTIME
 	} else if ((unsigned short)value <= (UINTPTR_MAX >> tagBits)) {
 		id ret = objc_createTaggedPointer(numberTag,
-		    ((uintptr_t)(unsigned short)value << tagBits) | TagShort);
+		    ((uintptr_t)(unsigned short)value << tagBits) | tagShort);
 
 		if (ret != nil)
 			return ret;
 #endif
 	}
@@ -210,11 +210,11 @@
 		OFOnce(&onceControl, intZeroNumberInit);
 		return (id)intZeroNumber;
 #ifdef OF_OBJFW_RUNTIME
 	} else if ((unsigned int)value <= (UINTPTR_MAX >> tagBits)) {
 		id ret = objc_createTaggedPointer(numberTag,
-		    ((uintptr_t)(unsigned int)value << tagBits) | TagInt);
+		    ((uintptr_t)(unsigned int)value << tagBits) | tagInt);
 
 		if (ret != nil)
 			return ret;
 #endif
 	}
@@ -229,11 +229,11 @@
 		OFOnce(&onceControl, longZeroNumberInit);
 		return (id)longZeroNumber;
 #ifdef OF_OBJFW_RUNTIME
 	} else if ((unsigned long)value <= (UINTPTR_MAX >> tagBits)) {
 		id ret = objc_createTaggedPointer(numberTag,
-		    ((uintptr_t)(unsigned long)value << tagBits) | TagLong);
+		    ((uintptr_t)(unsigned long)value << tagBits) | tagLong);
 
 		if (ret != nil)
 			return ret;
 #endif
 	}
@@ -249,11 +249,11 @@
 		return (id)longLongZeroNumber;
 #ifdef OF_OBJFW_RUNTIME
 	} else if ((unsigned long long)value <= (UINTPTR_MAX >> tagBits)) {
 		id ret = objc_createTaggedPointer(numberTag,
 		    ((uintptr_t)(unsigned long long)value << tagBits) |
-		    TagLongLong);
+		    tagLongLong);
 
 		if (ret != nil)
 			return ret;
 #endif
 	}
@@ -268,11 +268,11 @@
 		OFOnce(&onceControl, unsignedCharZeroNumberInit);
 		return (id)unsignedCharZeroNumber;
 #ifdef OF_OBJFW_RUNTIME
 	} else if (value <= (UINTPTR_MAX >> tagBits)) {
 		id ret = objc_createTaggedPointer(numberTag,
-		    ((uintptr_t)value << tagBits) | TagUnsignedChar);
+		    ((uintptr_t)value << tagBits) | tagUnsignedChar);
 
 		if (ret != nil)
 			return ret;
 #endif
 	}
@@ -287,11 +287,11 @@
 		OFOnce(&onceControl, unsignedShortZeroNumberInit);
 		return (id)unsignedShortZeroNumber;
 #ifdef OF_OBJFW_RUNTIME
 	} else if (value <= (UINTPTR_MAX >> tagBits)) {
 		id ret = objc_createTaggedPointer(numberTag,
-		    ((uintptr_t)value << tagBits) | TagUnsignedShort);
+		    ((uintptr_t)value << tagBits) | tagUnsignedShort);
 
 		if (ret != nil)
 			return ret;
 #endif
 	}
@@ -306,11 +306,11 @@
 		OFOnce(&onceControl, unsignedIntZeroNumberInit);
 		return (id)unsignedIntZeroNumber;
 #ifdef OF_OBJFW_RUNTIME
 	} else if (value <= (UINTPTR_MAX >> tagBits)) {
 		id ret = objc_createTaggedPointer(numberTag,
-		    ((uintptr_t)value << tagBits) | TagUnsignedInt);
+		    ((uintptr_t)value << tagBits) | tagUnsignedInt);
 
 		if (ret != nil)
 			return ret;
 #endif
 	}
@@ -325,11 +325,11 @@
 		OFOnce(&onceControl, unsignedLongZeroNumberInit);
 		return (id)unsignedLongZeroNumber;
 #ifdef OF_OBJFW_RUNTIME
 	} else if (value <= (UINTPTR_MAX >> tagBits)) {
 		id ret = objc_createTaggedPointer(numberTag,
-		    ((uintptr_t)value << tagBits) | TagUnsignedLong);
+		    ((uintptr_t)value << tagBits) | tagUnsignedLong);
 
 		if (ret != nil)
 			return ret;
 #endif
 	}
@@ -344,11 +344,11 @@
 		OFOnce(&onceControl, unsignedLongLongZeroNumberInit);
 		return (id)unsignedLongLongZeroNumber;
 #ifdef OF_OBJFW_RUNTIME
 	} else if (value <= (UINTPTR_MAX >> tagBits)) {
 		id ret = objc_createTaggedPointer(numberTag,
-		    ((uintptr_t)value << tagBits) | TagUnsignedLongLong);
+		    ((uintptr_t)value << tagBits) | tagUnsignedLongLong);
 
 		if (ret != nil)
 			return ret;
 #endif
 	}
@@ -413,29 +413,29 @@
 - (const char *)objCType
 {
 	uintptr_t value = object_getTaggedPointerValue(self);
 
 	switch (value & tagMask) {
-	case TagChar:
+	case tagChar:
 		return @encode(signed char);
-	case TagShort:
+	case tagShort:
 		return @encode(short);
-	case TagInt:
+	case tagInt:
 		return @encode(int);
-	case TagLong:
+	case tagLong:
 		return @encode(long);
-	case TagLongLong:
+	case tagLongLong:
 		return @encode(long long);
-	case TagUnsignedChar:
+	case tagUnsignedChar:
 		return @encode(unsigned char);
-	case TagUnsignedShort:
+	case tagUnsignedShort:
 		return @encode(unsigned short);
-	case TagUnsignedInt:
+	case tagUnsignedInt:
 		return @encode(unsigned int);
-	case TagUnsignedLong:
+	case tagUnsignedLong:
 		return @encode(unsigned long);
-	case TagUnsignedLongLong:
+	case tagUnsignedLongLong:
 		return @encode(unsigned long long);
 	default:
 		@throw [OFInvalidArgumentException exception];
 	}
 }
@@ -442,29 +442,29 @@
 
 # define RETURN_VALUE							  \
 	uintptr_t value = object_getTaggedPointerValue(self);		  \
 									  \
 	switch (value & tagMask) {					  \
-	case TagChar:							  \
+	case tagChar:							  \
 		return (signed char)(unsigned char)(value >> tagBits);	  \
-	case TagShort:							  \
+	case tagShort:							  \
 		return (short)(unsigned short)(value >> tagBits);	  \
-	case TagInt:							  \
+	case tagInt:							  \
 		return (int)(unsigned int)(value >> tagBits);		  \
-	case TagLong:							  \
+	case tagLong:							  \
 		return (long)(unsigned long)(value >> tagBits);		  \
-	case TagLongLong:						  \
+	case tagLongLong:						  \
 		return (long long)(unsigned long long)(value >> tagBits); \
-	case TagUnsignedChar:						  \
+	case tagUnsignedChar:						  \
 		return (unsigned char)(value >> tagBits);		  \
-	case TagUnsignedShort:						  \
+	case tagUnsignedShort:						  \
 		return (unsigned short)(value >> tagBits);		  \
-	case TagUnsignedInt:						  \
+	case tagUnsignedInt:						  \
 		return (unsigned int)(value >> tagBits);		  \
-	case TagUnsignedLong:						  \
+	case tagUnsignedLong:						  \
 		return (unsigned long)(value >> tagBits);		  \
-	case TagUnsignedLongLong:					  \
+	case tagUnsignedLongLong:					  \
 		return (unsigned long long)(value >> tagBits);		  \
 	default:							  \
 		@throw [OFInvalidArgumentException exception];		  \
 	}
 - (long long)longLongValue