Yep. "Composition" has many meanings, but in the context of "inheritance vs. composition" it's just referring to "x has a y".