Update context names.
Update tests.