Change names to more standard session typing names. Hack support for
EndBang in link.