Fix openpgp package renaming
Unify store encryption methodology