Renamed class alias
Synced from master
Synced from master