renamed KeyIdentifier to KeyId