Rename: grid->mesh, block->bundle