Renamed and fixed loading indicators