diff --git a/AsyncDisplayKit/Layout/ASDimension.h b/AsyncDisplayKit/Layout/ASDimension.h
index 294b633e8d..59f153b62c 100644
--- a/AsyncDisplayKit/Layout/ASDimension.h
+++ b/AsyncDisplayKit/Layout/ASDimension.h
@@ -65,7 +65,7 @@ extern ASRelativeDimension ASRelativeDimensionMakeWithPercent(CGFloat percent);
 
 extern ASRelativeDimension ASRelativeDimensionCopy(ASRelativeDimension aDimension);
 
-extern BOOL ASRelativeDimensionEqualToDimension(ASRelativeDimension lhs, ASRelativeDimension rhs);
+extern BOOL ASRelativeDimensionEqualToRelativeDimension(ASRelativeDimension lhs, ASRelativeDimension rhs);
 
 extern NSString *NSStringFromASRelativeDimension(ASRelativeDimension dimension);
 
@@ -85,7 +85,7 @@ extern CGSize ASSizeRangeClamp(ASSizeRange sizeRange, CGSize size);
  */
 extern ASSizeRange ASSizeRangeIntersect(ASSizeRange sizeRange, ASSizeRange otherSizeRange);
 
-extern BOOL ASSizeRangeEqualToRange(ASSizeRange lhs, ASSizeRange rhs);
+extern BOOL ASSizeRangeEqualToSizeRange(ASSizeRange lhs, ASSizeRange rhs);
 
 extern NSString * NSStringFromASSizeRange(ASSizeRange sizeRange);
 
@@ -98,9 +98,9 @@ extern ASRelativeSize ASRelativeSizeMake(ASRelativeDimension width, ASRelativeDi
 extern ASRelativeSize ASRelativeSizeMakeWithCGSize(CGSize size);
 
 /** Resolve this relative size relative to a parent size. */
-extern CGSize ASRelativeSizeResolveSize(ASRelativeSize relativeSize, CGSize parentSize);
+extern CGSize ASRelativeSizeResolve(ASRelativeSize relativeSize, CGSize parentSize);
 
-extern BOOL ASRelativeSizeEqualToSize(ASRelativeSize lhs, ASRelativeSize rhs);
+extern BOOL ASRelativeSizeEqualToRelativeSize(ASRelativeSize lhs, ASRelativeSize rhs);
 
 extern NSString *NSStringFromASRelativeSize(ASRelativeSize size);
 
@@ -122,7 +122,7 @@ extern BOOL ASRelativeSizeRangeEqualToRelativeSizeRange(ASRelativeSizeRange lhs,
 /**
  Provided a parent size, compute final dimensions for this RelativeSizeRange to arrive at a SizeRange.
  */
-extern ASSizeRange ASRelativeSizeRangeResolveSizeRange(ASRelativeSizeRange relativeSizeRange,
+extern ASSizeRange ASRelativeSizeRangeResolve(ASRelativeSizeRange relativeSizeRange,
                                                        CGSize parentSize);
 
 ASDISPLAYNODE_EXTERN_C_END
diff --git a/AsyncDisplayKit/Layout/ASDimension.mm b/AsyncDisplayKit/Layout/ASDimension.mm
index 9d8c178a5a..a06e731c07 100644
--- a/AsyncDisplayKit/Layout/ASDimension.mm
+++ b/AsyncDisplayKit/Layout/ASDimension.mm
@@ -39,7 +39,7 @@ ASRelativeDimension ASRelativeDimensionCopy(ASRelativeDimension aDimension)
   return ASRelativeDimensionMake(aDimension.type, aDimension.value);
 }
 
-BOOL ASRelativeDimensionEqualToDimension(ASRelativeDimension lhs, ASRelativeDimension rhs)
+BOOL ASRelativeDimensionEqualToRelativeDimension(ASRelativeDimension lhs, ASRelativeDimension rhs)
 {
   return lhs.type == rhs.type && lhs.value == rhs.value;
 }
@@ -118,7 +118,7 @@ ASSizeRange ASSizeRangeIntersect(ASSizeRange sizeRange, ASSizeRange otherSizeRan
   return {{w.min, h.min}, {w.max, h.max}};
 }
 
-BOOL ASSizeRangeEqualToRange(ASSizeRange lhs, ASSizeRange rhs)
+BOOL ASSizeRangeEqualToSizeRange(ASSizeRange lhs, ASSizeRange rhs)
 {
   return CGSizeEqualToSize(lhs.min, rhs.min) && CGSizeEqualToSize(lhs.max, rhs.max);
 }
@@ -150,10 +150,10 @@ CGSize ASRelativeSizeResolveSize(ASRelativeSize relativeSize, CGSize parentSize)
                     ASRelativeDimensionResolve(relativeSize.height, parentSize.height));
 }
 
-BOOL ASRelativeSizeEqualToSize(ASRelativeSize lhs, ASRelativeSize rhs)
+BOOL ASRelativeSizeEqualToRelativeSize(ASRelativeSize lhs, ASRelativeSize rhs)
 {
-  return ASRelativeDimensionEqualToDimension(lhs.width, rhs.width)
-    && ASRelativeDimensionEqualToDimension(lhs.height, rhs.height);
+  return ASRelativeDimensionEqualToRelativeDimension(lhs.width, rhs.width)
+    && ASRelativeDimensionEqualToRelativeDimension(lhs.height, rhs.height);
 }
 
 NSString *NSStringFromASRelativeSize(ASRelativeSize size)
@@ -189,10 +189,10 @@ ASRelativeSizeRange ASRelativeSizeRangeMakeWithExactRelativeDimensions(ASRelativ
 
 BOOL ASRelativeSizeRangeEqualToRelativeSizeRange(ASRelativeSizeRange lhs, ASRelativeSizeRange rhs)
 {
-  return ASRelativeSizeEqualToSize(lhs.min, rhs.min) && ASRelativeSizeEqualToSize(lhs.max, rhs.max);
+  return ASRelativeSizeEqualToRelativeSize(lhs.min, rhs.min) && ASRelativeSizeEqualToRelativeSize(lhs.max, rhs.max);
 }
 
-ASSizeRange ASRelativeSizeRangeResolveSizeRange(ASRelativeSizeRange relativeSizeRange,
+ASSizeRange ASRelativeSizeRangeResolve(ASRelativeSizeRange relativeSizeRange,
                                                 CGSize parentSize)
 {
   return ASSizeRangeMake(ASRelativeSizeResolveSize(relativeSizeRange.min, parentSize),
diff --git a/AsyncDisplayKit/Layout/ASStaticLayoutNode.mm b/AsyncDisplayKit/Layout/ASStaticLayoutNode.mm
index bfd1d52da8..fc165d2f28 100644
--- a/AsyncDisplayKit/Layout/ASStaticLayoutNode.mm
+++ b/AsyncDisplayKit/Layout/ASStaticLayoutNode.mm
@@ -68,7 +68,7 @@
     };
     ASSizeRange childConstraint = ASRelativeSizeRangeEqualToRelativeSizeRange(ASRelativeSizeRangeUnconstrained, child.size)
       ? ASSizeRangeMake({0, 0}, autoMaxSize)
-      : ASRelativeSizeRangeResolveSizeRange(child.size, size);
+      : ASRelativeSizeRangeResolve(child.size, size);
     ASLayoutChild *layoutChild = [ASLayoutChild newWithPosition:child.position
                                                          layout:[child.node calculateLayoutThatFits:childConstraint]];
     [layoutChildren addObject:layoutChild];
diff --git a/AsyncDisplayKit/Private/ASStackUnpositionedLayout.mm b/AsyncDisplayKit/Private/ASStackUnpositionedLayout.mm
index 913f49a28f..e9778372ae 100644
--- a/AsyncDisplayKit/Private/ASStackUnpositionedLayout.mm
+++ b/AsyncDisplayKit/Private/ASStackUnpositionedLayout.mm
@@ -294,7 +294,7 @@ static std::vector<ASStackUnpositionedItem> layoutChildrenAlongUnconstrainedStac
   const CGFloat maxCrossDimension = crossDimension(style.direction, sizeRange.max);
   
   return AS::map(children, [&](ASStackLayoutNodeChild *child) -> ASStackUnpositionedItem {
-    const BOOL isUnconstrainedFlexBasis = ASRelativeDimensionEqualToDimension(ASRelativeDimensionUnconstrained, child.flexBasis);
+    const BOOL isUnconstrainedFlexBasis = ASRelativeDimensionEqualToRelativeDimension(ASRelativeDimensionUnconstrained, child.flexBasis);
     const CGFloat exactStackDimension = ASRelativeDimensionResolve(child.flexBasis, stackDimension(style.direction, size));
 
     if (useOptimizedFlexing && isFlexibleInBothDirections(child)) {
diff --git a/AsyncDisplayKitTests/ASDimensionTests.mm b/AsyncDisplayKitTests/ASDimensionTests.mm
index 97a7deadff..3c32fdea59 100644
--- a/AsyncDisplayKitTests/ASDimensionTests.mm
+++ b/AsyncDisplayKitTests/ASDimensionTests.mm
@@ -28,7 +28,7 @@
   ASSizeRange other = {{7,7}, {15,15}};
   ASSizeRange result = ASSizeRangeIntersect(range, other);
   ASSizeRange expected = {{7,7}, {10,10}};
-  XCTAssertTrue(ASSizeRangeEqualToRange(result, expected), @"Expected %@ but got %@", NSStringFromASSizeRange(expected), NSStringFromASSizeRange(result));
+  XCTAssertTrue(ASSizeRangeEqualToSizeRange(result, expected), @"Expected %@ but got %@", NSStringFromASSizeRange(expected), NSStringFromASSizeRange(result));
 }
 
 - (void)testIntersectingSizeRangeWithRangeThatContainsItReturnsSameRange
@@ -41,7 +41,7 @@
   ASSizeRange other = {{0,0}, {10,10}};
   ASSizeRange result = ASSizeRangeIntersect(range, other);
   ASSizeRange expected = {{2,2}, {8,8}};
-  XCTAssertTrue(ASSizeRangeEqualToRange(result, expected), @"Expected %@ but got %@", NSStringFromASSizeRange(expected), NSStringFromASSizeRange(result));
+  XCTAssertTrue(ASSizeRangeEqualToSizeRange(result, expected), @"Expected %@ but got %@", NSStringFromASSizeRange(expected), NSStringFromASSizeRange(result));
 }
 
 - (void)testIntersectingSizeRangeWithRangeContainedWithinItReturnsContainedRange
@@ -54,7 +54,7 @@
   ASSizeRange other = {{2,2}, {8,8}};
   ASSizeRange result = ASSizeRangeIntersect(range, other);
   ASSizeRange expected = {{2,2}, {8,8}};
-  XCTAssertTrue(ASSizeRangeEqualToRange(result, expected), @"Expected %@ but got %@", NSStringFromASSizeRange(expected), NSStringFromASSizeRange(result));
+  XCTAssertTrue(ASSizeRangeEqualToSizeRange(result, expected), @"Expected %@ but got %@", NSStringFromASSizeRange(expected), NSStringFromASSizeRange(result));
 }
 
 - (void)testIntersectingSizeRangeWithNonOverlappingRangeToRightReturnsSinglePointNearestOtherRange
@@ -67,7 +67,7 @@
   ASSizeRange other = {{10,10}, {15,15}};
   ASSizeRange result = ASSizeRangeIntersect(range, other);
   ASSizeRange expected = {{5,5}, {5,5}};
-  XCTAssertTrue(ASSizeRangeEqualToRange(result, expected), @"Expected %@ but got %@", NSStringFromASSizeRange(expected), NSStringFromASSizeRange(result));
+  XCTAssertTrue(ASSizeRangeEqualToSizeRange(result, expected), @"Expected %@ but got %@", NSStringFromASSizeRange(expected), NSStringFromASSizeRange(result));
 }
 
 - (void)testIntersectingSizeRangeWithNonOverlappingRangeToLeftReturnsSinglePointNearestOtherRange
@@ -80,7 +80,7 @@
   ASSizeRange other = {{0,0}, {5,5}};
   ASSizeRange result = ASSizeRangeIntersect(range, other);
   ASSizeRange expected = {{10,10}, {10,10}};
-  XCTAssertTrue(ASSizeRangeEqualToRange(result, expected), @"Expected %@ but got %@", NSStringFromASSizeRange(expected), NSStringFromASSizeRange(result));
+  XCTAssertTrue(ASSizeRangeEqualToSizeRange(result, expected), @"Expected %@ but got %@", NSStringFromASSizeRange(expected), NSStringFromASSizeRange(result));
 }
 
 @end