I used that chart when I sourced my heaters so I think you are gtg. There is some weirdness in 'old style' versus 'new style' heaters IIRC but the new ones fit once you take them apart.