Moved request and response handlers to more appropriate names