Keyword upgrades - refs #518