Changed context struct name