Make the some names consistent.