rename team_x_score fields
match validation