rename choice form to submission choice (since we'll have choice creation forms later)