[osh rename] Make names consistent