Replace listener with correct one, rename 'normal' to 'boot'