Yes, that's the one. And they'll soon be manufactured here in the U.S., I believe.
The XM8 rifle under consideration to replace the M4 carbine and many of the M16A2 rifles is a little different in form from the German G-36, though derived thereof. But ongoing troop trials with the preproduction versions may yet reveal some overlooked flaws or disadvantages deemed worthy of correction, so the final production version could vary considerably. We shall see.