Add underscores to relationship name type
Collapse RequestResponses into one type