modify names to be more accurate