Changed pubkey filename to key ID