Convert the rest of the key tables to use properly named contexts. (dm)