diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java
index a2c7a78c90752f..e6ab3674f6789c 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java
@@ -256,7 +256,7 @@ public static void setup(ConfiguredRuleClassProvider.Builder builder) {
     builder.addRuleDefinition(ObjcRuleClasses.AlwaysLinkRule.class);
     builder.addRuleDefinition(ObjcRuleClasses.OptionsRule.class);
     builder.addRuleDefinition(ObjcRuleClasses.SdkFrameworksDependerRule.class);
-    builder.addRuleDefinition(ObjcRuleClasses.CompileInputRule.class);
+    builder.addRuleDefinition(ObjcRuleClasses.CompileDependencyRule.class);
     builder.addRuleDefinition(ObjcRuleClasses.ResourceToolsRule.class);
     builder.addRuleDefinition(IosApplicationRule.class);
     builder.addRuleDefinition(IosExtensionBinaryRule.class);
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcBundleLibraryRule.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcBundleLibraryRule.java
index df08ef8b522c23..19180fa6f38c16 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcBundleLibraryRule.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcBundleLibraryRule.java
@@ -18,7 +18,6 @@
 import com.google.devtools.build.lib.analysis.BlazeRule;
 import com.google.devtools.build.lib.analysis.RuleDefinition;
 import com.google.devtools.build.lib.analysis.RuleDefinitionEnvironment;
-import com.google.devtools.build.lib.packages.ImplicitOutputsFunction;
 import com.google.devtools.build.lib.packages.RuleClass;
 import com.google.devtools.build.lib.packages.RuleClass.Builder;
 
@@ -42,7 +41,7 @@ public RuleClass build(Builder builder, RuleDefinitionEnvironment env) {
          can be used to develop or build on a Mac.</li>
         </ul>
         <!-- #END_BLAZE_RULE.IMPLICIT_OUTPUTS -->*/
-        .setImplicitOutputsFunction(ImplicitOutputsFunction.fromFunctions(XcodeSupport.PBXPROJ))
+        .setImplicitOutputsFunction(XcodeSupport.PBXPROJ)
         .build();
   }
 }
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java
index 47c18a1270d5d4..9041d7dc1435f7 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java
@@ -390,18 +390,19 @@ public RuleClass build(Builder builder, RuleDefinitionEnvironment env) {
   }
 
   /**
-   * Common attributes for {@code objc_*} rules that contain linkable content.
+   * Common attributes for {@code objc_*} rules that can be input to compilation (i.e. can be
+   * dependencies of other compiling rules).
    */
-  @BlazeRule(name = "$objc_compile_input_rule",
+  @BlazeRule(name = "$objc_compile_dependency_rule",
       type = RuleClassType.ABSTRACT,
       ancestors = {
           ResourcesRule.class,
           SdkFrameworksDependerRule.class })
-  public static class CompileInputRule implements RuleDefinition {
+  public static class CompileDependencyRule implements RuleDefinition {
     @Override
     public RuleClass build(Builder builder, RuleDefinitionEnvironment env) {
       return builder
-          /* <!-- #BLAZE_RULE($objc_compile_input_rule).ATTRIBUTE(hdrs) -->
+          /* <!-- #BLAZE_RULE($objc_compile_dependency_rule).ATTRIBUTE(hdrs) -->
           The list of Objective-C files that are included as headers by source
           files in this rule or by users of this library.
           ${SYNOPSIS}
@@ -409,7 +410,7 @@ public RuleClass build(Builder builder, RuleDefinitionEnvironment env) {
           .add(attr("hdrs", LABEL_LIST)
               .direct_compile_time_input()
               .allowedFileTypes(FileTypeSet.ANY_FILE))
-          /* <!-- #BLAZE_RULE($objc_compile_input_rule).ATTRIBUTE(includes) -->
+          /* <!-- #BLAZE_RULE($objc_compile_dependency_rule).ATTRIBUTE(includes) -->
           List of <code>#include/#import</code> search paths to add to this target
           and all depending targets.
           ${SYNOPSIS}
@@ -424,7 +425,7 @@ genfiles and bin roots (e.g. <code>blaze-genfiles/pkg/includedir</code>
           actual client root.
           <!-- #END_BLAZE_RULE.ATTRIBUTE -->*/
           .add(attr("includes", Type.STRING_LIST))
-          /* <!-- #BLAZE_RULE($objc_compile_input_rule).ATTRIBUTE(sdk_includes) -->
+          /* <!-- #BLAZE_RULE($objc_compile_dependency_rule).ATTRIBUTE(sdk_includes) -->
           List of <code>#include/#import</code> search paths to add to this target
           and all depending targets, where each path is relative to
           <code>$(SDKROOT)/usr/include</code>.
@@ -441,7 +442,7 @@ genfiles and bin roots (e.g. <code>blaze-genfiles/pkg/includedir</code>
   @BlazeRule(name = "$objc_compiling_rule",
       type = RuleClassType.ABSTRACT,
       ancestors = {
-          CompileInputRule.class,
+          CompileDependencyRule.class,
           OptionsRule.class,
           CoptsRule.class })
   public static class CompilingRule implements RuleDefinition {
@@ -531,7 +532,7 @@ passed not only the compiler for this target (as <code>copts</code>
    */
   @BlazeRule(name = "$objc_alwayslink_rule",
       type = RuleClassType.ABSTRACT,
-      ancestors = { ObjcRuleClasses.CompileInputRule.class, })
+      ancestors = { CompileDependencyRule.class, })
   public static class AlwaysLinkRule implements RuleDefinition {
     @Override
     public RuleClass build(Builder builder, RuleDefinitionEnvironment env) {