Changed weird support contexts to have more logical names.