listener variables renaming