Rename extra_context -> context