Change BlockId filename to name + rest of Patrick's comments