Swap SpecialVersionExtensionTypes for ExtensionTypes

Change-Id: Idd798be576a04127134d9721f24cbdcd77c5be84