More Renaming

Renames a few missed `contexts`. Some always slip though the net :-p