update to struct names