rename request and handler