Renamed blocks, fixed Fountain model