Question for the Porsche peopleS

Is the 2.0l flat-6 the same basic engine as the end-of-the-line 3.6l air-cooled engines in the 964? By same basic engine I mean the block. Thinking about it, nearly everything else is exchangeable while still being considered a direct evolution of the original.