fix names again