Fixed straggling name changes