Change the Papenmeier key tables to use properly named contexts. (dm)