Rename handlers to fix case sensitivity issue.