They're actually still separate products. They don't want to sell office 365 but it still exists.

M365 = office 365 plus windows as a service licensing. If you buy your licenses as lifetime with your laptops it is much cheaper to simply subscribe to O365. Thus Microsoft is gating more and more things behind M365 to get companies to pay for the expensive windows subscription.