diff --git a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredRuleClassProvider.java b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredRuleClassProvider.java
index 2d3119c..7f67e8d 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredRuleClassProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredRuleClassProvider.java
@@ -56,7 +56,6 @@
 import com.google.devtools.build.lib.syntax.Mutability;
 import com.google.devtools.build.lib.syntax.Type;
 import com.google.devtools.common.options.OptionsClassProvider;
-
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
@@ -66,7 +65,6 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
-
 import javax.annotation.Nullable;
 
 /**
@@ -189,7 +187,8 @@
     private Label preludeLabel;
     private String runfilesPrefix;
     private String toolsRepository;
-    private final List<ConfigurationFragmentFactory> configurationFragments = new ArrayList<>();
+    private final List<ConfigurationFragmentFactory> configurationFragmentFactories =
+        new ArrayList<>();
     private final List<BuildInfoFactory> buildInfoFactories = new ArrayList<>();
     private final List<Class<? extends FragmentOptions>> configurationOptions = new ArrayList<>();
 
@@ -278,7 +277,7 @@
     }
 
     public Builder addConfigurationFragment(ConfigurationFragmentFactory factory) {
-      configurationFragments.add(factory);
+      configurationFragmentFactories.add(factory);
       return this;
     }
 
@@ -403,7 +402,7 @@
           defaultWorkspaceFileSuffix.toString(),
           ImmutableList.copyOf(buildInfoFactories),
           ImmutableList.copyOf(configurationOptions),
-          ImmutableList.copyOf(configurationFragments),
+          ImmutableList.copyOf(configurationFragmentFactories),
           configurationCollectionFactory,
           universalFragment,
           prerequisiteValidator,
@@ -495,10 +494,8 @@
    */
   private final ImmutableList<Class<? extends FragmentOptions>> configurationOptions;
 
-  /**
-   * The set of configuration fragment factories.
-   */
-  private final ImmutableList<ConfigurationFragmentFactory> configurationFragments;
+  /** The set of configuration fragment factories. */
+  private final ImmutableList<ConfigurationFragmentFactory> configurationFragmentFactories;
 
   /**
    * The factory that creates the configuration collection.
@@ -548,7 +545,7 @@
     this.defaultWorkspaceFileSuffix = defaultWorkspaceFileSuffix;
     this.buildInfoFactories = buildInfoFactories;
     this.configurationOptions = configurationOptions;
-    this.configurationFragments = configurationFragments;
+    this.configurationFragmentFactories = configurationFragments;
     this.configurationCollectionFactory = configurationCollectionFactory;
     this.universalFragment = universalFragment;
     this.prerequisiteValidator = prerequisiteValidator;
@@ -601,7 +598,7 @@
    * Returns the set of configuration fragments provided by this module.
    */
   public ImmutableList<ConfigurationFragmentFactory> getConfigurationFragments() {
-    return configurationFragments;
+    return configurationFragmentFactories;
   }
 
   /**
