replace dummy block events, rename event handler