add suffix to Listener classes; update request usage