Renamed Regular to Safe in CellTypes