refactor struct names with response*