Changed branch names, corresponding variable names, and getters, to reflect new namings for EventParameters tree
Fixed some output messages, no real code changes