Context stuff and naming stuff for 2.7