Rename handler interface