Added alternative formulation of names in GV configurations; added wait and removed contraction and weakening for end?