Name fixes and continue progress.