fixing names again