Fix names of submission contexts