When colleges report FA amounts, it includes all of these types of aid. In financial aid circles, merit aid is one type of financial aid. And yes, some merit aid requires an SES component, ‘combined’ seems like a good term for that… but it all still falls under the FA umbrella.