Continue fixing names