Correct. There are also official moves to shift from the M16 to the carbine variant due to more recent MOUT missions.
The M4 is the wave in all services. The 16A2 is on the way out.