Rename listener & parameter to correspond with its behaviour