Fixed the change of names