made names singular again (2 chars trimmed!)