diff --git a/apex/apex.go b/apex/apex.go
index 506a89ee5..ee6f93ae3 100644
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -1982,7 +1982,7 @@ func (a *apexBundle) checkApexAvailability(ctx android.ModuleContext) {
 		if externalDep || to.AvailableFor(apexName) || whitelistedApexAvailable(apexName, to) {
 			return
 		}
-		ctx.ModuleErrorf("requires %q that is not available for the APEX.", to.Name())
+		ctx.ModuleErrorf("%q requires %q that is not available for the APEX.", from.Name(), to.Name())
 	})
 }
 
diff --git a/apex/apex_test.go b/apex/apex_test.go
index 36e7ea7a2..6a9533e37 100644
--- a/apex/apex_test.go
+++ b/apex/apex_test.go
@@ -3011,7 +3011,7 @@ func TestApexWithTestHelperApp(t *testing.T) {
 
 func TestApexPropertiesShouldBeDefaultable(t *testing.T) {
 	// libfoo's apex_available comes from cc_defaults
-	testApexError(t, `"myapex" .*: requires "libfoo" that is not available for the APEX`, `
+	testApexError(t, `"myapex" .*: "myapex" requires "libfoo" that is not available for the APEX`, `
 	apex {
 		name: "myapex",
 		key: "myapex.key",