Renamed the blocks for the new system.