Clarify handler names.