changed the names to the new ones