Made some names consistent.