Fixed inconsistancy with handler naming.