Making some changes to the names and ids.