Fix changed names