Distinguish between miniblocks and blocks at the type level, rename some fields