I'm not a big fan of changing key names. We did it in the past and it seems a bad idea. AOSP uses `type` I don't see any reason to change that name. It could be more sense to change `type` by `types` but we have to pay a price that sometimes make no sense. I would prefer to keep `type`.