AMO is a slightly more general area than condensed matter physics, including related phenomena with smaller numbers atoms and optics. The two terms are however sometimes used as synonyms. The term AMO has gained wide usage and acceptability, see e.g.:
If Ciro had had greater foresight, this might have been what he studied at university!