Energy conversion I would say means converting say thermal
energy to mechanical, or mechanical to electrical, or other
conversions you can think of. Now some machines do this, like
electrical generators, or electric motors which is the same but in
reverse. Other machines are just mechanical, like a gearbox for
example, mechanical energy in and mechanical energy out. So the
word machine is more general, energy conversion devices are a
sub-set of machines.