More listen* var name tweaks.