@@ -109,11 +109,11 @@
  * @param start The starting index of the range
  * @param length The length of the range
  * @return An OFRangeith the specified start and length
  */
 static OF_INLINE OFRange OF_CONST_FUNC
-OFMakeRange(size_t start, size_t length)
+OFRangeMake(size_t start, size_t length)
 {
 	OFRange range = { start, length };
 
 	return range;
 }
@@ -124,11 +124,11 @@
  * @param range1 The first range for the comparison
  * @param range2 The second range for the comparison
  * @return Whether the two ranges are equal
  */
 static OF_INLINE bool
-OFEqualRanges(OFRange range1, OFRange range2)
+OFRangeEqual(OFRange range1, OFRange range2)
 {
 	if (range1.location != range2.location)
 		return false;
 
 	if (range1.length != range2.length)
@@ -161,11 +161,11 @@
  * @param x The x coordinate of the point
  * @param y The x coordinate of the point
  * @return An OFPoint with the specified coordinates
  */
 static OF_INLINE OFPoint OF_CONST_FUNC
-OFMakePoint(float x, float y)
+OFPointMake(float x, float y)
 {
 	OFPoint point = { x, y };
 
 	return point;
 }
@@ -176,11 +176,11 @@
  * @param point1 The first point for the comparison
  * @param point2 The second point for the comparison
  * @return Whether the two points are equal
  */
 static OF_INLINE bool
-OFEqualPoints(OFPoint point1, OFPoint point2)
+OFPointEqual(OFPoint point1, OFPoint point2)
 {
 	if (point1.x != point2.x)
 		return false;
 
 	if (point1.y != point2.y)
@@ -208,11 +208,11 @@
  * @param width The width of the size
  * @param height The height of the size
  * @return An OFSize with the specified width and height
  */
 static OF_INLINE OFSize OF_CONST_FUNC
-OFMakeSize(float width, float height)
+OFSizeMake(float width, float height)
 {
 	OFSize size = { width, height };
 
 	return size;
 }
@@ -223,11 +223,11 @@
  * @param size1 The first size for the comparison
  * @param size2 The second size for the comparison
  * @return Whether the two sizes are equal
  */
 static OF_INLINE bool
-OFEqualSizes(OFSize size1, OFSize size2)
+OFSizeEqual(OFSize size1, OFSize size2)
 {
 	if (size1.width != size2.width)
 		return false;
 
 	if (size1.height != size2.height)
@@ -257,15 +257,15 @@
  * @param width The width of the rectangle
  * @param height The height of the rectangle
  * @return An OFRect with the specified origin and size
  */
 static OF_INLINE OFRect OF_CONST_FUNC
-OFMakeRect(float x, float y, float width, float height)
+OFRectMake(float x, float y, float width, float height)
 {
 	OFRect rect = {
-		OFMakePoint(x, y),
-		OFMakeSize(width, height)
+		OFPointMake(x, y),
+		OFSizeMake(width, height)
 	};
 
 	return rect;
 }
 
@@ -275,16 +275,16 @@
  * @param rect1 The first rectangle for the comparison
  * @param rect2 The second rectangle for the comparison
  * @return Whether the two rectangles are equal
  */
 static OF_INLINE bool
-OFEqualRects(OFRect rect1, OFRect rect2)
+OFRectEqual(OFRect rect1, OFRect rect2)
 {
-	if (!OFEqualPoints(rect1.origin, rect2.origin))
+	if (!OFPointEqual(rect1.origin, rect2.origin))
 		return false;
 
-	if (!OFEqualSizes(rect1.size, rect2.size))
+	if (!OFSizeEqual(rect1.size, rect2.size))
 		return false;
 
 	return true;
 }