diff --git a/AsyncDisplayKit/ASControlNode+Subclasses.h b/AsyncDisplayKit/ASControlNode+Subclasses.h
index e88328bb08..d8ad017021 100644
--- a/AsyncDisplayKit/ASControlNode+Subclasses.h
+++ b/AsyncDisplayKit/ASControlNode+Subclasses.h
@@ -8,7 +8,7 @@
 
 #import <AsyncDisplayKit/ASControlNode.h>
 
-@interface ASControlNode (ForSubclassesEyesOnly)
+@interface ASControlNode (Subclassing)
 
 /**
  @abstract Sends action messages for the given control events.
diff --git a/AsyncDisplayKit/ASDisplayNode+Subclasses.h b/AsyncDisplayKit/ASDisplayNode+Subclasses.h
index 5caf541a2b..9862bab5b7 100644
--- a/AsyncDisplayKit/ASDisplayNode+Subclasses.h
+++ b/AsyncDisplayKit/ASDisplayNode+Subclasses.h
@@ -34,7 +34,7 @@
  * variables.
  */
 
-@interface ASDisplayNode (ASDisplayNodeSubclasses)
+@interface ASDisplayNode (Subclassing)
 
 
 /** @name View Configuration */
diff --git a/docs/build.sh b/docs/build.sh
index c24168a5d8..c4b89b09d8 100755
--- a/docs/build.sh
+++ b/docs/build.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 
-HEADERS=`ls ../AsyncDisplayKit/*.h | grep -v Subclasses`
+HEADERS=`ls ../AsyncDisplayKit/*.h`
 
 rm -rf htdocs appledoc
 
@@ -12,6 +12,7 @@ appledoc \
     --create-html \
     --exit-threshold 2 \
     --no-repeat-first-par \
+    --no-merge-categories \
     --project-name AsyncDisplayKit \
     --project-company Facebook \
     --company-id "com.facebook" \