diff --git a/infer/src/al/ComponentKit.ml b/infer/src/al/ComponentKit.ml
index 3b6202c4b..8523ed5ae 100644
--- a/infer/src/al/ComponentKit.ml
+++ b/infer/src/al/ComponentKit.ml
@@ -224,10 +224,8 @@ let component_with_unconventional_superclass_advice context an =
                      [ ckcomponent_cl
                      ; ckcomponentcontroller_cl
                      ; "CKCompositeComponent"
+                     ; "CKLayoutComponent"
                      ; "CKRenderComponent"
-                     ; "CKRenderLayoutComponent"
-                     ; "CKRenderLayoutWithChildrenComponent"
-                     ; "CKRenderWithChildrenComponent"
                      ; "CKStatefulViewComponent"
                      ; "CKStatefulViewComponentController"
                      ; "NTNativeTemplateComponent" ]
diff --git a/infer/tests/codetoanalyze/objcpp/linters/componentkit/FakeComponentKitHeader.h b/infer/tests/codetoanalyze/objcpp/linters/componentkit/FakeComponentKitHeader.h
index bc386634a..82e0132d9 100644
--- a/infer/tests/codetoanalyze/objcpp/linters/componentkit/FakeComponentKitHeader.h
+++ b/infer/tests/codetoanalyze/objcpp/linters/componentkit/FakeComponentKitHeader.h
@@ -63,14 +63,6 @@ class CKComponentScope {
 @interface CKRenderComponent : CKComponent
 @end
 
-// Mimic importing CKRenderWithChildrenComponent
-@interface CKRenderWithChildrenComponent : CKComponent
-@end
-
-// Mimic importing CKRenderLayoutComponent
-@interface CKRenderLayoutComponent : CKComponent
-@end
-
-// Mimic importing CKRenderLayoutWithChildrenComponent
-@interface CKRenderLayoutWithChildrenComponent : CKComponent
+// Mimic importing CKLayoutComponent
+@interface CKLayoutComponent : CKComponent
 @end