corrections and split listeners into more descriptively named classes and change service names to match.