add gnupg, symlink renames for consistency