continue fixing names