That's right. ML and AI are interchangeable at this point and both mean basically what you said. Though not necessarily a DNN per se. But that's the idea.

Academically we mostly specify AGI to mean things more advanced or speculative.