iron out the returned struct names