...mmm... I can't merge the patch now so I try to read it "as is" I understand that the only difference between 818 and 816 driver is the match_model and you changed the 816 freq ranges to be "larger". If this is right I can't see a reason to have different drivers for the the two models instead of simply renaming the 816 driver to "KG816/KG816" with the enlarged ranges.
My complaint is that I want it to show up as the same thing post-download as it does when you open an image from a file. I'm not crazy about the composite model names, but at least it's consistent.
After talking about it on IRC, I've decided to apply what Tom has (which will load an 818 image as an 816) for now, knowing that when I get the new file format done, we can make it consistent that way.