User-owned modem listed as "Xfinity Gateway" in device list. Am I getting the wrong boot file to my modem?

I noticed that I am maxing out at about 600mbps download even though I have the gigabit x2 service. I am using a NETGEAR CM2000 at the moment, which I do not expect to get the full speed advertised, but I am concerned that I am getting the generic bootfile for a Xfinity Gateway modem, and this is capping my speed. I've added my device's MAC address twice, and gone through the entire activation process, but my profile still lists "Xfinity Gateway". 

Also, the chat assistant keeps looping around to have me do a speed test in the app, which doesn't work...