adjust names to match display