diff --git a/java/classpath_fragment.go b/java/classpath_fragment.go
index d4974600f..460cc3ef4 100644
--- a/java/classpath_fragment.go
+++ b/java/classpath_fragment.go
@@ -81,7 +81,7 @@ type classpathJar struct {
 	maxSdkVersion int32
 }
 
-func (c *ClasspathFragmentBase) generateAndroidBuildActions(ctx android.ModuleContext) {
+func (c *ClasspathFragmentBase) generateClasspathProtoBuildActions(ctx android.ModuleContext) {
 	outputFilename := ctx.ModuleName() + ".pb"
 	c.outputFilepath = android.PathForModuleOut(ctx, outputFilename).OutputPath
 	c.installDirPath = android.PathForModuleInstall(ctx, "etc", "classpaths")
@@ -137,7 +137,7 @@ func appendClasspathJar(slice []classpathJar, classpathType classpathType, paths
 	return
 }
 
-func (c *ClasspathFragmentBase) getAndroidMkEntries() []android.AndroidMkEntries {
+func (c *ClasspathFragmentBase) androidMkEntries() []android.AndroidMkEntries {
 	return []android.AndroidMkEntries{android.AndroidMkEntries{
 		Class:      "ETC",
 		OutputFile: android.OptionalPathForPath(c.outputFilepath),
diff --git a/java/platform_bootclasspath.go b/java/platform_bootclasspath.go
index 3a5982279..1acb9f4f5 100644
--- a/java/platform_bootclasspath.go
+++ b/java/platform_bootclasspath.go
@@ -87,7 +87,7 @@ func (b *platformBootclasspathModule) AndroidMkEntries() (entries []android.Andr
 		OutputFile: android.OptionalPathForPath(b.hiddenAPIFlagsCSV),
 		Include:    "$(BUILD_PHONY_PACKAGE)",
 	})
-	entries = append(entries, b.classpathFragmentBase().getAndroidMkEntries()...)
+	entries = append(entries, b.classpathFragmentBase().androidMkEntries()...)
 	return
 }
 
@@ -167,7 +167,7 @@ func (d *platformBootclasspathModule) MakeVars(ctx android.MakeVarsContext) {
 }
 
 func (b *platformBootclasspathModule) GenerateAndroidBuildActions(ctx android.ModuleContext) {
-	b.classpathFragmentBase().generateAndroidBuildActions(ctx)
+	b.classpathFragmentBase().generateClasspathProtoBuildActions(ctx)
 
 	// Gather all the dependencies from the art, updatable and non-updatable boot jars.
 	artModules := gatherApexModulePairDepsWithTag(ctx, platformBootclasspathArtBootJarDepTag)