Fix platform-specific mappings to be based on version not type