updated names and type