fixing names and headers