Imported Upstream version 1.8.0upstream/1.8.0

74 files changed, 575 insertions, 516 deletions

diff --git a/lang/python/MANIFEST.in b/lang/python/MANIFEST.in
index eefdb83..8f63640 100644
--- a/lang/python/MANIFEST.in
+++ b/lang/python/MANIFEST.in
@@ -1,4 +1,4 @@
 recursive-include examples *.py
 include gpgme-h-clean.py gpgme.i
 include helpers.c helpers.h private.h
-recursive-include pyme *.py
+recursive-include gpg *.py
diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am
index 224a91a..e32fd12 100644
--- a/lang/python/Makefile.am
+++ b/lang/python/Makefile.am
@@ -23,7 +23,7 @@ EXTRA_DIST = \
 	helpers.c helpers.h private.h \
 	gpgme-h-clean.py \
 	examples \
-	pyme
+	gpg
 
 SUBDIRS = . tests
 
@@ -35,21 +35,21 @@ COPY_FILES = \
 	$(srcdir)/examples \
 	$(srcdir)/helpers.c $(srcdir)/helpers.h $(srcdir)/private.h
 
-COPY_FILES_PYME = \
-	$(srcdir)/pyme/callbacks.py \
-	$(srcdir)/pyme/constants \
-	$(srcdir)/pyme/core.py \
-	$(srcdir)/pyme/errors.py \
-	$(srcdir)/pyme/__init__.py \
-	$(srcdir)/pyme/results.py \
-	$(srcdir)/pyme/util.py
+COPY_FILES_GPG = \
+	$(srcdir)/gpg/callbacks.py \
+	$(srcdir)/gpg/constants \
+	$(srcdir)/gpg/core.py \
+	$(srcdir)/gpg/errors.py \
+	$(srcdir)/gpg/__init__.py \
+	$(srcdir)/gpg/results.py \
+	$(srcdir)/gpg/util.py
 
 # For VPATH builds we need to copy some files because Python's
 # distutils are not VPATH-aware.
-copystamp: $(COPY_FILES) $(COPY_FILES_PYME) data.h config.h
+copystamp: $(COPY_FILES) $(COPY_FILES_GPG) data.h config.h
 	if test "$(srcdir)" != "$(builddir)" ; then \
 	  cp -R $(COPY_FILES) . ; \
-	  cp -R $(COPY_FILES_PYME) pyme ; \
+	  cp -R $(COPY_FILES_GPG) gpg ; \
 	fi
 	touch $@
 
@@ -65,22 +65,22 @@ all-local: copystamp
 	    $$PYTHON setup.py build --verbose ; \
 	done
 
-dist/pyme3-$(VERSION).tar.gz dist/pyme3-$(VERSION).tar.gz.asc: copystamp
+dist/gpg-$(VERSION).tar.gz dist/gpg-$(VERSION).tar.gz.asc: copystamp
 	CFLAGS="$(CFLAGS)" \
 	  $(PYTHON) setup.py sdist --verbose
-	gpg2 --detach-sign --armor dist/pyme3-$(VERSION).tar.gz
+	gpg2 --detach-sign --armor dist/gpg-$(VERSION).tar.gz
 
 .PHONY: prepare
 prepare: copystamp
 
 .PHONY: sdist
-sdist: dist/pyme3-$(VERSION).tar.gz dist/pyme3-$(VERSION).tar.gz.asc
+sdist: dist/gpg-$(VERSION).tar.gz dist/gpg-$(VERSION).tar.gz.asc
 
 .PHONY: upload
-upload: dist/pyme3-$(VERSION).tar.gz dist/pyme3-$(VERSION).tar.gz.asc
+upload: dist/gpg-$(VERSION).tar.gz dist/gpg-$(VERSION).tar.gz.asc
 	twine upload $^
 
-CLEANFILES = gpgme.h errors.i gpgme_wrap.c pyme/gpgme.py \
+CLEANFILES = gpgme.h errors.i gpgme_wrap.c gpg/gpgme.py \
 	  data.h config.h copystamp
 
 # Remove the rest.
@@ -92,8 +92,8 @@ clean-local:
 	if test "$(srcdir)" != "$(builddir)" ; then \
 	  find . -type d ! -perm -200 -exec chmod u+w {} ';' ; \
 	  for F in $(COPY_FILES); do rm -rf -- `basename $$F` ; done ; \
-	  for F in $(COPY_FILES_PYME); do \
-	      rm -rf -- pyme/`basename $$F` ; \
+	  for F in $(COPY_FILES_GPG); do \
+	      rm -rf -- gpg/`basename $$F` ; \
 	  done ; \
 	fi
 
@@ -107,9 +107,9 @@ install-exec-local:
 	  cat files.txt >> install_files.txt ; \
 	  rm files.txt ; \
 	done
-	$(MKDIR_P) $(DESTDIR)$(pythondir)/pyme
-	mv install_files.txt $(DESTDIR)$(pythondir)/pyme
+	$(MKDIR_P) $(DESTDIR)$(pythondir)/gpg
+	mv install_files.txt $(DESTDIR)$(pythondir)/gpg
 
 uninstall-local:
-	xargs <$(DESTDIR)$(pythondir)/pyme/install_files.txt -- rm -rf --
-	rm -rf -- $(DESTDIR)$(pythondir)/pyme
+	xargs <$(DESTDIR)$(pythondir)/gpg/install_files.txt -- rm -rf --
+	rm -rf -- $(DESTDIR)$(pythondir)/gpg
diff --git a/lang/python/Makefile.in b/lang/python/Makefile.in
index 08b26e0..4168708 100644
--- a/lang/python/Makefile.in
+++ b/lang/python/Makefile.in
@@ -329,6 +329,9 @@ SWIG = @SWIG@
 SWIG_LIB = @SWIG_LIB@
 SYSROOT = @SYSROOT@
 VERSION = @VERSION@
+VERSION_MAJOR = @VERSION_MAJOR@
+VERSION_MICRO = @VERSION_MICRO@
+VERSION_MINOR = @VERSION_MINOR@
 VERSION_NUMBER = @VERSION_NUMBER@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -397,7 +400,7 @@ EXTRA_DIST = \
 	helpers.c helpers.h private.h \
 	gpgme-h-clean.py \
 	examples \
-	pyme
+	gpg
 
 SUBDIRS = . tests
 COPY_FILES = \
@@ -408,16 +411,16 @@ COPY_FILES = \
 	$(srcdir)/examples \
 	$(srcdir)/helpers.c $(srcdir)/helpers.h $(srcdir)/private.h
 
-COPY_FILES_PYME = \
-	$(srcdir)/pyme/callbacks.py \
-	$(srcdir)/pyme/constants \
-	$(srcdir)/pyme/core.py \
-	$(srcdir)/pyme/errors.py \
-	$(srcdir)/pyme/__init__.py \
-	$(srcdir)/pyme/results.py \
-	$(srcdir)/pyme/util.py
+COPY_FILES_GPG = \
+	$(srcdir)/gpg/callbacks.py \
+	$(srcdir)/gpg/constants \
+	$(srcdir)/gpg/core.py \
+	$(srcdir)/gpg/errors.py \
+	$(srcdir)/gpg/__init__.py \
+	$(srcdir)/gpg/results.py \
+	$(srcdir)/gpg/util.py
 
-CLEANFILES = gpgme.h errors.i gpgme_wrap.c pyme/gpgme.py \
+CLEANFILES = gpgme.h errors.i gpgme_wrap.c gpg/gpgme.py \
 	  data.h config.h copystamp
 
 all: all-recursive
@@ -737,10 +740,10 @@ uninstall-am: uninstall-local
 
 # For VPATH builds we need to copy some files because Python's
 # distutils are not VPATH-aware.
-copystamp: $(COPY_FILES) $(COPY_FILES_PYME) data.h config.h
+copystamp: $(COPY_FILES) $(COPY_FILES_GPG) data.h config.h
 	if test "$(srcdir)" != "$(builddir)" ; then \
 	  cp -R $(COPY_FILES) . ; \
-	  cp -R $(COPY_FILES_PYME) pyme ; \
+	  cp -R $(COPY_FILES_GPG) gpg ; \
 	fi
 	touch $@
 
@@ -756,19 +759,19 @@ all-local: copystamp
 	    $$PYTHON setup.py build --verbose ; \
 	done
 
-dist/pyme3-$(VERSION).tar.gz dist/pyme3-$(VERSION).tar.gz.asc: copystamp
+dist/gpg-$(VERSION).tar.gz dist/gpg-$(VERSION).tar.gz.asc: copystamp
 	CFLAGS="$(CFLAGS)" \
 	  $(PYTHON) setup.py sdist --verbose
-	gpg2 --detach-sign --armor dist/pyme3-$(VERSION).tar.gz
+	gpg2 --detach-sign --armor dist/gpg-$(VERSION).tar.gz
 
 .PHONY: prepare
 prepare: copystamp
 
 .PHONY: sdist
-sdist: dist/pyme3-$(VERSION).tar.gz dist/pyme3-$(VERSION).tar.gz.asc
+sdist: dist/gpg-$(VERSION).tar.gz dist/gpg-$(VERSION).tar.gz.asc
 
 .PHONY: upload
-upload: dist/pyme3-$(VERSION).tar.gz dist/pyme3-$(VERSION).tar.gz.asc
+upload: dist/gpg-$(VERSION).tar.gz dist/gpg-$(VERSION).tar.gz.asc
 	twine upload $^
 
 # Remove the rest.
@@ -780,8 +783,8 @@ clean-local:
 	if test "$(srcdir)" != "$(builddir)" ; then \
 	  find . -type d ! -perm -200 -exec chmod u+w {} ';' ; \
 	  for F in $(COPY_FILES); do rm -rf -- `basename $$F` ; done ; \
-	  for F in $(COPY_FILES_PYME); do \
-	      rm -rf -- pyme/`basename $$F` ; \
+	  for F in $(COPY_FILES_GPG); do \
+	      rm -rf -- gpg/`basename $$F` ; \
 	  done ; \
 	fi
 
@@ -795,12 +798,12 @@ install-exec-local:
 	  cat files.txt >> install_files.txt ; \
 	  rm files.txt ; \
 	done
-	$(MKDIR_P) $(DESTDIR)$(pythondir)/pyme
-	mv install_files.txt $(DESTDIR)$(pythondir)/pyme
+	$(MKDIR_P) $(DESTDIR)$(pythondir)/gpg
+	mv install_files.txt $(DESTDIR)$(pythondir)/gpg
 
 uninstall-local:
-	xargs <$(DESTDIR)$(pythondir)/pyme/install_files.txt -- rm -rf --
-	rm -rf -- $(DESTDIR)$(pythondir)/pyme
+	xargs <$(DESTDIR)$(pythondir)/gpg/install_files.txt -- rm -rf --
+	rm -rf -- $(DESTDIR)$(pythondir)/gpg
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/lang/python/README b/lang/python/README
index 98c007e..6a2e8b8 100644
--- a/lang/python/README
+++ b/lang/python/README
@@ -1,10 +1,10 @@
-PyME - GPGME for Python                                      -*- org -*-
+gpg - GPGME bindings for Python                                      -*- org -*-
 =======================
 
-PyME is a python interface to the GPGME library:
+The "gpg" module is a python interface to the GPGME library:
 https://www.gnupg.org/related_software/gpgme/
 
-PyME offers two interfaces, one is a high-level, curated, and
+"gpg" offers two interfaces, one is a high-level, curated, and
 idiomatic interface that is implemented as a shim on top of the
 low-level interface automatically created using SWIG.
 
@@ -27,20 +27,22 @@ https://bugs.gnupg.org/gnupg/
 
 * Authors
 
-PyME has been created by John Goerzen, and maintained, developed, and
+PyME was created by John Goerzen, and maintained, developed, and
 cherished by Igor Belyi, Martin Albrecht, Ben McGinnes, and everyone
 who contributed to it in any way.
 
 In 2016 we merged a port of PyME to into the GPGME repository, and
 development will continue there.  Please see the VCS history for the
 list of contributors, and if you do find bugs, or want to contribute,
-please get in touch and help maintain PyME.
+please get in touch and help maintain the python gpg bindings.
 
 Please see the section 'History' further down this document for
 references to previous versions.
 
 * History
 
+ - The python bindings were renamed from PyME to "gpg" in 2016.
+
  - The bindings have been merged into the GPGME repository in 2016.
 
  - The latest version of PyME for Python 3.2 and above (as of
diff --git a/lang/python/examples/assuan.py b/lang/python/examples/assuan.py
index 22960d3..dd42ad4 100644
--- a/lang/python/examples/assuan.py
+++ b/lang/python/examples/assuan.py
@@ -20,9 +20,9 @@
 from __future__ import absolute_import, print_function, unicode_literals
 del absolute_import, print_function, unicode_literals
 
-import pyme
+import gpg
 
-with pyme.Context(protocol=pyme.constants.PROTOCOL_ASSUAN) as c:
+with gpg.Context(protocol=gpg.constants.protocol.ASSUAN) as c:
     # Invoke the pinentry to get a confirmation.
     err = c.assuan_transact(['GET_CONFIRMATION', 'Hello there'])
     print("You chose {}.".format("cancel" if err else "ok"))
diff --git a/lang/python/examples/decryption-filter.py b/lang/python/examples/decryption-filter.py
index 3007c2b..987dfd1 100644
--- a/lang/python/examples/decryption-filter.py
+++ b/lang/python/examples/decryption-filter.py
@@ -17,7 +17,7 @@
 
 """A decryption filter
 
-This demonstrates decryption using pyme3 in three lines of code.  To
+This demonstrates decryption using gpg3 in three lines of code.  To
 be used like this:
 
 ./decryption-filter.py <message.gpg >message.plain
@@ -28,5 +28,5 @@ from __future__ import absolute_import, print_function, unicode_literals
 del absolute_import, print_function, unicode_literals
 
 import sys
-import pyme
-pyme.Context().decrypt(sys.stdin, sink=sys.stdout)
+import gpg
+gpg.Context().decrypt(sys.stdin, sink=sys.stdout)
diff --git a/lang/python/examples/delkey.py b/lang/python/examples/delkey.py
index a02f412..12510f3 100755
--- a/lang/python/examples/delkey.py
+++ b/lang/python/examples/delkey.py
@@ -22,12 +22,12 @@
 from __future__ import absolute_import, print_function, unicode_literals
 del absolute_import, print_function, unicode_literals
 
-import pyme
+import gpg
 
-with pyme.Context() as c:
+with gpg.Context() as c:
     # Note: We must not modify the key store during iteration,
     # therefore, we explicitly make a list.
-    keys = list(c.keylist("joe+pyme@example.org"))
+    keys = list(c.keylist("joe+gpg@example.org"))
 
     for k in keys:
         c.op_delete(k, True)
diff --git a/lang/python/examples/encrypt-to-all.py b/lang/python/examples/encrypt-to-all.py
index 35873bd..bad4220 100755
--- a/lang/python/examples/encrypt-to-all.py
+++ b/lang/python/examples/encrypt-to-all.py
@@ -26,9 +26,9 @@ from __future__ import absolute_import, print_function, unicode_literals
 del absolute_import, print_function, unicode_literals
 
 import sys
-import pyme
+import gpg
 
-with pyme.Context(armor=True) as c:
+with gpg.Context(armor=True) as c:
     recipients = list()
     for key in c.keylist():
         valid = 0
@@ -42,7 +42,7 @@ with pyme.Context(armor=True) as c:
         try:
             ciphertext, _, _ = c.encrypt(b'This is my message.',
                                          recipients=recipients)
-        except pyme.errors.InvalidRecipients as e:
+        except gpg.errors.InvalidRecipients as e:
             print("Encryption failed for these keys:\n{0!s}".format(e))
 
             # filter out the bad keys
diff --git a/lang/python/examples/exportimport.py b/lang/python/examples/exportimport.py
index bc946bc..8ae87a8 100755
--- a/lang/python/examples/exportimport.py
+++ b/lang/python/examples/exportimport.py
@@ -17,18 +17,18 @@
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 # Sample of export and import of keys
-# It uses keys for joe+pyme@example.org generated by genkey.py script
+# It uses keys for joe+gpg@example.org generated by genkey.py script
 
 from __future__ import absolute_import, print_function, unicode_literals
 del absolute_import, print_function, unicode_literals
 
 import sys
 import os
-import pyme
+import gpg
 
-user = "joe+pyme@example.org"
+user = "joe+gpg@example.org"
 
-with pyme.Context(armor=True) as c, pyme.Data() as expkey:
+with gpg.Context(armor=True) as c, gpg.Data() as expkey:
     print(" - Export %s's public keys - " % user)
     c.op_export(user, 0, expkey)
 
@@ -43,7 +43,7 @@ with pyme.Context(armor=True) as c, pyme.Data() as expkey:
 # delete keys to ensure that they came from our imported data.  Note
 # that if joe's key has private part as well we can only delete both
 # of them.
-with pyme.Context() as c:
+with gpg.Context() as c:
     # Note: We must not modify the key store during iteration,
     # therfore, we explicitly make a list.
     keys = list(c.keylist(user))
@@ -51,7 +51,7 @@ with pyme.Context() as c:
     for k in keys:
         c.op_delete(k, True)
 
-with pyme.Context() as c:
+with gpg.Context() as c:
     print(" - Import exported keys - ")
     c.op_import(expstring)
     result = c.op_import_result()
diff --git a/lang/python/examples/genkey.py b/lang/python/examples/genkey.py
index ee70303..a043500 100755
--- a/lang/python/examples/genkey.py
+++ b/lang/python/examples/genkey.py
@@ -20,7 +20,7 @@
 from __future__ import absolute_import, print_function, unicode_literals
 del absolute_import, print_function, unicode_literals
 
-import pyme
+import gpg
 
 # This is the example from the GPGME manual.
 
@@ -31,14 +31,14 @@ Subkey-Type: RSA
 Subkey-Length: 2048
 Name-Real: Joe Tester
 Name-Comment: with stupid passphrase
-Name-Email: joe+pyme@example.org
+Name-Email: joe+gpg@example.org
 Passphrase: Crypt0R0cks
 Expire-Date: 2020-12-31
 </GnupgKeyParms>
 """
 
-with pyme.Context() as c:
-    c.set_progress_cb(pyme.callbacks.progress_stdout)
+with gpg.Context() as c:
+    c.set_progress_cb(gpg.callbacks.progress_stdout)
     c.op_genkey(parms, None, None)
     print("Generated key with fingerprint {0}.".format(
         c.op_genkey_result().fpr))
diff --git a/lang/python/examples/inter-edit.py b/lang/python/examples/inter-edit.py
index 3c0f29b..ed0d8c4 100644
--- a/lang/python/examples/inter-edit.py
+++ b/lang/python/examples/inter-edit.py
@@ -22,14 +22,14 @@ from __future__ import absolute_import, print_function, unicode_literals
 del absolute_import, print_function, unicode_literals
 
 import sys
-import pyme
+import gpg
 
 if len(sys.argv) != 2:
     sys.exit("Usage: %s <Gpg key pattern>\n" % sys.argv[0])
 
 name = sys.argv[1]
 
-with pyme.Context() as c:
+with gpg.Context() as c:
     keys = list(c.keylist(name))
     if len(keys) == 0:
         sys.exit("No key matching {}.".format(name))
diff --git a/lang/python/examples/sign.py b/lang/python/examples/sign.py
index 2f235ba..16c2256 100755
--- a/lang/python/examples/sign.py
+++ b/lang/python/examples/sign.py
@@ -20,9 +20,9 @@ from __future__ import absolute_import, print_function, unicode_literals
 del absolute_import, print_function, unicode_literals
 
 import sys
-import pyme
-from pyme.constants.sig import mode
+import gpg
+from gpg.constants.sig import mode
 
-with pyme.Context() as c:
+with gpg.Context() as c:
     signed, _ = c.sign(b"Test message", mode=mode.CLEAR)
     sys.stdout.buffer.write(signed)
diff --git a/lang/python/examples/signverify.py b/lang/python/examples/signverify.py
index 03bc0a6..5870ca9 100755
--- a/lang/python/examples/signverify.py
+++ b/lang/python/examples/signverify.py
@@ -17,18 +17,18 @@
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 # Sample of unattended signing/verifying of a message.
-# It uses keys for joe+pyme@example.org generated by genkey.py script
+# It uses keys for joe+gpg@example.org generated by genkey.py script
 
 from __future__ import absolute_import, print_function, unicode_literals
 del absolute_import, print_function, unicode_literals
 
 import sys
-import pyme
-from pyme.constants.sig import mode
+import gpg
+from gpg.constants.sig import mode
 
-user = "joe+pyme"
+user = "joe+gpg"
 
-with pyme.Context(pinentry_mode=pyme.constants.PINENTRY_MODE_LOOPBACK) as c:
+with gpg.Context(pinentry_mode=gpg.constants.PINENTRY_MODE_LOOPBACK) as c:
     keys = list(c.keylist(user))
     if len(keys) == 0:
         sys.exit("No key matching {}.".format(user))
diff --git a/lang/python/examples/simple.py b/lang/python/examples/simple.py
index 5598487..8f451d7 100755
--- a/lang/python/examples/simple.py
+++ b/lang/python/examples/simple.py
@@ -21,9 +21,9 @@ from __future__ import absolute_import, print_function, unicode_literals
 del absolute_import, print_function, unicode_literals
 
 import sys
-import pyme
+import gpg
 
-with pyme.Context(armor=True) as c:
+with gpg.Context(armor=True) as c:
     recipients = []
     print("Enter name of your recipient(s), end with a blank line.")
     while True:
diff --git a/lang/python/examples/testCMSgetkey.py b/lang/python/examples/testCMSgetkey.py
index 62c35d2..d4c0884 100644
--- a/lang/python/examples/testCMSgetkey.py
+++ b/lang/python/examples/testCMSgetkey.py
@@ -22,12 +22,12 @@ from __future__ import absolute_import, print_function, unicode_literals
 del absolute_import, print_function, unicode_literals
 
 import sys
-import pyme
+import gpg
 
 if len(sys.argv) != 2:
     sys.exit("fingerprint or unique key ID for gpgme_get_key()")
 
-with pyme.Context(protocol=pyme.constants.PROTOCOL_CMS) as c:
+with gpg.Context(protocol=gpg.constants.protocol.CMS) as c:
     key = c.get_key(sys.argv[1])
 
     print("got key: ", key.subkeys[0].fpr)
diff --git a/lang/python/examples/verifydetails.py b/lang/python/examples/verifydetails.py
index 81f82e9..b3ca133 100755
--- a/lang/python/examples/verifydetails.py
+++ b/lang/python/examples/verifydetails.py
@@ -21,24 +21,23 @@ from __future__ import absolute_import, print_function, unicode_literals
 del absolute_import, print_function, unicode_literals
 
 import sys
-from pyme import core
-from pyme.constants import protocol
+import gpg
 
 def print_engine_infos():
-    print("gpgme version:", core.check_version(None))
+    print("gpgme version:", gpg.core.check_version(None))
     print("engines:")
 
-    for engine in core.get_engine_info():
+    for engine in gpg.core.get_engine_info():
         print(engine.file_name, engine.version)
 
-    for proto in [protocol.OpenPGP, protocol.CMS]:
-        print("Have {}? {}".format(core.get_protocol_name(proto),
-                                   core.engine_check_version(proto)))
+    for proto in [gpg.constants.protocol.OpenPGP, gpg.constants.protocol.CMS]:
+        print("Have {}? {}".format(gpg.core.get_protocol_name(proto),
+                                   gpg.core.engine_check_version(proto)))
 
 
 def verifyprintdetails(filename, detached_sig_filename=None):
     """Verify a signature, print a lot of details."""
-    with core.Context() as c:
+    with gpg.Context() as c:
 
         # Verify.
         data, result = c.verify(open(filename),
diff --git a/lang/python/pyme/__init__.py b/lang/python/gpg/__init__.py
index 12c96c2..385b17e 100644
--- a/lang/python/pyme/__init__.py
+++ b/lang/python/gpg/__init__.py
@@ -16,17 +16,13 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
 
-"""Pyme: GPGME Interface for Python
+"""gpg: GnuPG Interface for Python (GPGME bindings)
 
-Welcome to PyME, the GPGME Interface for Python.  "Pyme", when prounced,
-rhymes with "Pine".
+Welcome to gpg, the GnuPG Interface for Python.
 
 The latest release of this package may be obtained from
 https://www.gnupg.org
 
-Previous releases of this package for Python 2 can be obtained from
-http://pyme.sourceforge.net
-
 FEATURES
 --------
 
@@ -43,23 +39,23 @@ FEATURES
 QUICK EXAMPLE
 -------------
 
-    >>> import pyme
-    >>> with pyme.Context() as c:
-    >>> with pyme.Context() as c:
+    >>> import gpg
+    >>> with gpg.Context() as c:
+    >>> with gpg.Context() as c:
     ...     cipher, _, _ = c.encrypt("Hello world :)".encode(),
     ...                              passphrase="abc")
     ...     c.decrypt(cipher, passphrase="abc")
     ...
     (b'Hello world :)',
-     <pyme.results.DecryptResult object at 0x7f5ab8121080>,
-     <pyme.results.VerifyResult object at 0x7f5ab81219b0>)
+     <gpg.results.DecryptResult object at 0x7f5ab8121080>,
+     <gpg.results.VerifyResult object at 0x7f5ab81219b0>)
 
 GENERAL OVERVIEW
 ----------------
 
 For those of you familiar with GPGME, you will be right at home here.
 
-Pyme is, for the most part, a direct interface to the C GPGME
+The python gpg module is, for the most part, a direct interface to the C GPGME
 library.  However, it is re-packaged in a more Pythonic way --
 object-oriented with classes and modules.  Take a look at the classes
 defined here -- they correspond directly to certain object types in GPGME
@@ -77,7 +73,7 @@ context = core.Context()
 context.op_encrypt(recp, 1, plain, cipher)
 
 The Python module automatically does error-checking and raises Python
-exception pyme.errors.GPGMEError when GPGME signals an error. getcode()
+exception gpg.errors.GPGMEError when GPGME signals an error. getcode()
 and getsource() of this exception return code and source of the error.
 
 IMPORTANT NOTE
@@ -94,7 +90,7 @@ be found only in GPGME documentation.
 
 FOR MORE INFORMATION
 --------------------
-PYME3 homepage: https://www.gnupg.org/
+GnuPG homepage: https://www.gnupg.org/
 GPGME documentation: https://www.gnupg.org/documentation/manuals/gpgme/
 
 """
diff --git a/lang/python/pyme/callbacks.py b/lang/python/gpg/callbacks.py
index b25a9a7..b25a9a7 100644
--- a/lang/python/pyme/callbacks.py
+++ b/lang/python/gpg/callbacks.py
diff --git a/lang/python/pyme/constants/__init__.py b/lang/python/gpg/constants/__init__.py
index 96d89e4..4fb3d6f 100644
--- a/lang/python/pyme/constants/__init__.py
+++ b/lang/python/gpg/constants/__init__.py
@@ -1,15 +1,43 @@
+# Constants.
+#
+# Copyright (C) 2016 g10 Code GmbH
+#
+# This file is part of GPGME.
+#
+# GPGME is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of the
+# License, or (at your option) any later version.
+#
+# GPGME is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General
+# Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 from __future__ import absolute_import, print_function, unicode_literals
 del absolute_import, print_function, unicode_literals
 
-from pyme import util
+from gpg import util
 util.process_constants('GPGME_', globals())
+del util
+
+# For convenience, we import the modules here.
+from . import data, event, keylist, md, pk
+from . import protocol, sig, sigsum, status, validity
+
+# A complication arises because 'import' is a reserved keyword.
+# Import it as 'Import' instead.
+globals()['Import'] = getattr(__import__('', globals(), locals(),
+                                         [str('import')], 1), "import")
 
 __all__ = ['data', 'event', 'import', 'keylist', 'md', 'pk',
            'protocol', 'sig', 'sigsum', 'status', 'validity']
 
 # GPGME 1.7 replaced gpgme_op_edit with gpgme_op_interact.  We
-# implement pyme.Context.op_edit using gpgme_op_interact, so the
+# implement gpg.Context.op_edit using gpgme_op_interact, so the
 # callbacks will be called with string keywords instead of numeric
 # status messages.  Code that is using these constants will continue
 # to work.
diff --git a/lang/python/pyme/constants/data/__init__.py b/lang/python/gpg/constants/data/__init__.py
index 8274ab9..8274ab9 100644
--- a/lang/python/pyme/constants/data/__init__.py
+++ b/lang/python/gpg/constants/data/__init__.py
diff --git a/lang/python/pyme/constants/data/encoding.py b/lang/python/gpg/constants/data/encoding.py
index a05dbb4..e76a22e 100644
--- a/lang/python/pyme/constants/data/encoding.py
+++ b/lang/python/gpg/constants/data/encoding.py
@@ -18,5 +18,6 @@
 from __future__ import absolute_import, print_function, unicode_literals
 del absolute_import, print_function, unicode_literals
 
-from pyme import util
+from gpg import util
 util.process_constants('GPGME_DATA_ENCODING_', globals())
+del util
diff --git a/lang/python/pyme/constants/event.py b/lang/python/gpg/constants/event.py
index 2e30c5e..1b14d1d 100644
--- a/lang/python/pyme/constants/event.py
+++ b/lang/python/gpg/constants/event.py
@@ -18,5 +18,6 @@
 from __future__ import absolute_import, print_function, unicode_literals
 del absolute_import, print_function, unicode_literals
 
-from pyme import util
+from gpg import util
 util.process_constants('GPGME_EVENT_', globals())
+del util
diff --git a/lang/python/pyme/constants/import.py b/lang/python/gpg/constants/import.py
index 10e7d3c..47c296c 100644
--- a/lang/python/pyme/constants/import.py
+++ b/lang/python/gpg/constants/import.py
@@ -18,5 +18,6 @@
 from __future__ import absolute_import, print_function, unicode_literals
 del absolute_import, print_function, unicode_literals
 
-from pyme import util
+from gpg import util
 util.process_constants('GPGME_IMPORT_', globals())
+del util
diff --git a/lang/python/pyme/constants/keylist/__init__.py b/lang/python/gpg/constants/keylist/__init__.py
index 2ce0edf..2ce0edf 100644
--- a/lang/python/pyme/constants/keylist/__init__.py
+++ b/lang/python/gpg/constants/keylist/__init__.py
diff --git a/lang/python/pyme/constants/keylist/mode.py b/lang/python/gpg/constants/keylist/mode.py
index 000dd79..39e1819 100644
--- a/lang/python/pyme/constants/keylist/mode.py
+++ b/lang/python/gpg/constants/keylist/mode.py
@@ -18,5 +18,6 @@
 from __future__ import absolute_import, print_function, unicode_literals
 del absolute_import, print_function, unicode_literals
 
-from pyme import util
+from gpg import util
 util.process_constants('GPGME_KEYLIST_MODE_', globals())
+del util
diff --git a/lang/python/pyme/constants/md.py b/lang/python/gpg/constants/md.py
index dbd762c..f3e8bbd 100644
--- a/lang/python/pyme/constants/md.py
+++ b/lang/python/gpg/constants/md.py
@@ -18,5 +18,6 @@
 from __future__ import absolute_import, print_function, unicode_literals
 del absolute_import, print_function, unicode_literals
 
-from pyme import util
+from gpg import util
 util.process_constants('GPGME_MD_', globals())
+del util
diff --git a/lang/python/pyme/constants/pk.py b/lang/python/gpg/constants/pk.py
index cfc5309..6bf2a21 100644
--- a/lang/python/pyme/constants/pk.py
+++ b/lang/python/gpg/constants/pk.py
@@ -18,5 +18,6 @@
 from __future__ import absolute_import, print_function, unicode_literals
 del absolute_import, print_function, unicode_literals
 
-from pyme import util
+from gpg import util
 util.process_constants('GPGME_PK_', globals())
+del util
diff --git a/lang/python/pyme/constants/protocol.py b/lang/python/gpg/constants/protocol.py
index a4b6583..d086bbd 100644
--- a/lang/python/pyme/constants/protocol.py
+++ b/lang/python/gpg/constants/protocol.py
@@ -18,5 +18,6 @@
 from __future__ import absolute_import, print_function, unicode_literals
 del absolute_import, print_function, unicode_literals
 
-from pyme import util
+from gpg import util
 util.process_constants('GPGME_PROTOCOL_', globals())
+del util
diff --git a/lang/python/pyme/constants/sig/__init__.py b/lang/python/gpg/constants/sig/__init__.py
index 2ce0edf..39d4e6e 100644
--- a/lang/python/pyme/constants/sig/__init__.py
+++ b/lang/python/gpg/constants/sig/__init__.py
@@ -2,5 +2,5 @@
 from __future__ import absolute_import, print_function, unicode_literals
 del absolute_import, print_function, unicode_literals
 
-from . import mode
-__all__ = ['mode']
+from . import mode, notation
+__all__ = ['mode', 'notation']
diff --git a/lang/python/pyme/constants/sig/mode.py b/lang/python/gpg/constants/sig/mode.py
index fb534bc..0f4f0ef 100644
--- a/lang/python/pyme/constants/sig/mode.py
+++ b/lang/python/gpg/constants/sig/mode.py
@@ -18,5 +18,6 @@
 from __future__ import absolute_import, print_function, unicode_literals
 del absolute_import, print_function, unicode_literals
 
-from pyme import util
+from gpg import util
 util.process_constants('GPGME_SIG_MODE_', globals())
+del util
diff --git a/lang/python/gpg/constants/sig/notation.py b/lang/python/gpg/constants/sig/notation.py
new file mode 100644
index 0000000..9a79e01
--- /dev/null
+++ b/lang/python/gpg/constants/sig/notation.py
@@ -0,0 +1,25 @@
+# Constants for signature notation data.
+#
+# Copyright (C) 2016 g10 Code GmbH
+#
+# This file is part of GPGME.
+#
+# GPGME is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of the
+# License, or (at your option) any later version.
+#
+# GPGME is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General
+# Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import absolute_import, print_function, unicode_literals
+del absolute_import, print_function, unicode_literals
+
+from gpg import util
+util.process_constants('GPGME_SIG_NOTATION_', globals())
+del util
diff --git a/lang/python/pyme/constants/sigsum.py b/lang/python/gpg/constants/sigsum.py
index 3d94745..09ef9d7 100644
--- a/lang/python/pyme/constants/sigsum.py
+++ b/lang/python/gpg/constants/sigsum.py
@@ -18,5 +18,6 @@
 from __future__ import absolute_import, print_function, unicode_literals
 del absolute_import, print_function, unicode_literals
 
-from pyme import util
+from gpg import util
 util.process_constants('GPGME_SIGSUM_', globals())
+del util
diff --git a/lang/python/pyme/constants/status.py b/lang/python/gpg/constants/status.py
index a04d9aa..a0ad073 100644
--- a/lang/python/pyme/constants/status.py
+++ b/lang/python/gpg/constants/status.py
@@ -19,7 +19,7 @@ from __future__ import absolute_import, print_function, unicode_literals
 del absolute_import, print_function, unicode_literals
 
 # GPGME 1.7 replaced gpgme_op_edit with gpgme_op_interact.  We
-# implement pyme.Context.op_edit using gpgme_op_interact, so the
+# implement gpg.Context.op_edit using gpgme_op_interact, so the
 # callbacks will be called with string keywords instead of numeric
 # status messages.  Code that is using these constants will continue
 # to work.
diff --git a/lang/python/pyme/constants/validity.py b/lang/python/gpg/constants/validity.py
index 4ecd4d3..d3c5345 100644
--- a/lang/python/pyme/constants/validity.py
+++ b/lang/python/gpg/constants/validity.py
@@ -18,5 +18,6 @@
 from __future__ import absolute_import, print_function, unicode_literals
 del absolute_import, print_function, unicode_literals
 
-from pyme import util
+from gpg import util
 util.process_constants('GPGME_VALIDITY_', globals())
+del util
diff --git a/lang/python/pyme/core.py b/lang/python/gpg/core.py
index f0eab43..748bcbb 100644
--- a/lang/python/pyme/core.py
+++ b/lang/python/gpg/core.py
@@ -131,13 +131,13 @@ class GpgmeWrapper(object):
             def _funcwrap(slf, *args):
                 result = func(slf.wrapped, *args)
                 if slf._callback_excinfo:
-                    gpgme.pyme_raise_callback_exception(slf)
+                    gpgme.gpg_raise_callback_exception(slf)
                 return errorcheck(result, "Invocation of " + name)
         else:
             def _funcwrap(slf, *args):
                 result = func(slf.wrapped, *args)
                 if slf._callback_excinfo:
-                    gpgme.pyme_raise_callback_exception(slf)
+                    gpgme.gpg_raise_callback_exception(slf)
                 return result
 
         doc = self._munge_docstring.sub(r'\2.\1(\3', getattr(func, "__doc__"))
@@ -528,7 +528,7 @@ class Context(GpgmeWrapper):
             errptr)
 
         if self._callback_excinfo:
-            gpgme.pyme_raise_callback_exception(self)
+            gpgme.gpg_raise_callback_exception(self)
 
         errorcheck(err)
 
@@ -567,7 +567,7 @@ class Context(GpgmeWrapper):
         result = gpgme.gpgme_op_interact(self.wrapped, key, flags,
                                          opaquedata, sink)
         if self._callback_excinfo:
-            gpgme.pyme_raise_callback_exception(self)
+            gpgme.gpg_raise_callback_exception(self)
         errorcheck(result)
 
     @property
@@ -743,10 +743,10 @@ class Context(GpgmeWrapper):
                 hookdata = (weakref.ref(self), func)
             else:
                 hookdata = (weakref.ref(self), func, hook)
-        gpgme.pyme_set_passphrase_cb(self, hookdata)
+        gpgme.gpg_set_passphrase_cb(self, hookdata)
 
     def _free_passcb(self):
-        if gpgme.pyme_set_passphrase_cb:
+        if gpgme.gpg_set_passphrase_cb:
             self.set_passphrase_cb(None)
 
     def set_progress_cb(self, func, hook=None):
@@ -768,10 +768,10 @@ class Context(GpgmeWrapper):
                 hookdata = (weakref.ref(self), func)
             else:
                 hookdata = (weakref.ref(self), func, hook)
-        gpgme.pyme_set_progress_cb(self, hookdata)
+        gpgme.gpg_set_progress_cb(self, hookdata)
 
     def _free_progresscb(self):
-        if gpgme.pyme_set_progress_cb:
+        if gpgme.gpg_set_progress_cb:
             self.set_progress_cb(None)
 
     def set_status_cb(self, func, hook=None):
@@ -792,10 +792,10 @@ class Context(GpgmeWrapper):
                 hookdata = (weakref.ref(self), func)
             else:
                 hookdata = (weakref.ref(self), func, hook)
-        gpgme.pyme_set_status_cb(self, hookdata)
+        gpgme.gpg_set_status_cb(self, hookdata)
 
     def _free_statuscb(self):
-        if gpgme.pyme_set_status_cb:
+        if gpgme.gpg_set_status_cb:
             self.set_status_cb(None)
 
     @property
@@ -958,7 +958,7 @@ class Data(GpgmeWrapper):
         if self.wrapped != None and gpgme.gpgme_data_release:
             gpgme.gpgme_data_release(self.wrapped)
             if self._callback_excinfo:
-                gpgme.pyme_raise_callback_exception(self)
+                gpgme.gpg_raise_callback_exception(self)
             self.wrapped = None
         self._free_datacbs()
 
@@ -1003,7 +1003,7 @@ class Data(GpgmeWrapper):
         else:
             hookdata = (weakref.ref(self),
                         read_cb, write_cb, seek_cb, release_cb)
-        gpgme.pyme_data_new_from_cbs(self, hookdata, tmp)
+        gpgme.gpg_data_new_from_cbs(self, hookdata, tmp)
         self.wrapped = gpgme.gpgme_data_t_p_value(tmp)
         gpgme.delete_gpgme_data_t_p(tmp)
 
@@ -1057,7 +1057,7 @@ class Data(GpgmeWrapper):
         written = gpgme.gpgme_data_write(self.wrapped, buffer)
         if written < 0:
             if self._callback_excinfo:
-                gpgme.pyme_raise_callback_exception(self)
+                gpgme.gpg_raise_callback_exception(self)
             else:
                 raise GPGMEError.fromSyserror()
         return written
@@ -1078,7 +1078,7 @@ class Data(GpgmeWrapper):
                 result = gpgme.gpgme_data_read(self.wrapped, size)
             except:
                 if self._callback_excinfo:
-                    gpgme.pyme_raise_callback_exception(self)
+                    gpgme.gpg_raise_callback_exception(self)
                 else:
                     raise
             return result
@@ -1089,7 +1089,7 @@ class Data(GpgmeWrapper):
                     result = gpgme.gpgme_data_read(self.wrapped, 4096)
                 except:
                     if self._callback_excinfo:
-                        gpgme.pyme_raise_callback_exception(self)
+                        gpgme.gpg_raise_callback_exception(self)
                     else:
                         raise
                 if len(result) == 0:
diff --git a/lang/python/pyme/errors.py b/lang/python/gpg/errors.py
index 0fd85ef..1ce139e 100644
--- a/lang/python/pyme/errors.py
+++ b/lang/python/gpg/errors.py
@@ -27,11 +27,12 @@ NO_ERROR = None
 EOF = None
 
 util.process_constants('GPG_ERR_', globals())
+del util
 
-class PymeError(Exception):
+class GpgError(Exception):
     pass
 
-class GPGMEError(PymeError):
+class GPGMEError(GpgError):
     def __init__(self, error = None, message = None):
         self.error = error
         self.message = message
@@ -76,7 +77,7 @@ class KeyNotFound(GPGMEError, KeyError):
 
 # These errors are raised in the idiomatic interface code.
 
-class EncryptionError(PymeError):
+class EncryptionError(GpgError):
     pass
 
 class InvalidRecipients(EncryptionError):
@@ -87,7 +88,7 @@ class InvalidRecipients(EncryptionError):
                                          gpgme.gpgme_strerror(r.reason))
                          for r in self.recipients)
 
-class DeryptionError(PymeError):
+class DeryptionError(GpgError):
     pass
 
 class UnsupportedAlgorithm(DeryptionError):
@@ -96,7 +97,7 @@ class UnsupportedAlgorithm(DeryptionError):
     def __str__(self):
         return self.algorithm
 
-class SigningError(PymeError):
+class SigningError(GpgError):
     pass
 
 class InvalidSigners(SigningError):
@@ -107,7 +108,7 @@ class InvalidSigners(SigningError):
                                          gpgme.gpgme_strerror(s.reason))
                          for s in self.signers)
 
-class VerificationError(PymeError):
+class VerificationError(GpgError):
     pass
 
 class BadSignatures(VerificationError):
diff --git a/lang/python/pyme/gpgme.py b/lang/python/gpg/gpgme.py
index ea4983d..238359d 100644
--- a/lang/python/pyme/gpgme.py
+++ b/lang/python/gpg/gpgme.py
@@ -120,6 +120,7 @@ except AttributeError:
 
 
 
+
 # This file is compatible with both classic and new-style classes.
 
 
diff --git a/lang/python/pyme/results.py b/lang/python/gpg/results.py
index 3383896..3383896 100644
--- a/lang/python/pyme/results.py
+++ b/lang/python/gpg/results.py
diff --git a/lang/python/pyme/util.py b/lang/python/gpg/util.py
index e4fca4c..e4fca4c 100644
--- a/lang/python/pyme/util.py
+++ b/lang/python/gpg/util.py
diff --git a/lang/python/pyme/version.py b/lang/python/gpg/version.py
index 13c5129..9ec657d 100644
--- a/lang/python/pyme/version.py
+++ b/lang/python/gpg/version.py
@@ -21,10 +21,10 @@ del absolute_import, print_function
 
 from . import gpgme
 
-productname = 'pyme'
-versionstr = "1.7.1"
+productname = 'gpg'
+versionstr = "1.8.0"
 gpgme_versionstr = gpgme.GPGME_VERSION
-in_tree_build = bool(gpgme.cvar.pyme_in_tree_build)
+in_tree_build = bool(gpgme.cvar.gpg_in_tree_build)
 
 versionlist = versionstr.split(".")
 major = versionlist[0]
diff --git a/lang/python/pyme/version.py.in b/lang/python/gpg/version.py.in
index cfb9510..1a1baf0 100644
--- a/lang/python/pyme/version.py.in
+++ b/lang/python/gpg/version.py.in
@@ -21,10 +21,10 @@ del absolute_import, print_function
 
 from . import gpgme
 
-productname = 'pyme'
+productname = 'gpg'
 versionstr = "@VERSION@"
 gpgme_versionstr = gpgme.GPGME_VERSION
-in_tree_build = bool(gpgme.cvar.pyme_in_tree_build)
+in_tree_build = bool(gpgme.cvar.gpg_in_tree_build)
 
 versionlist = versionstr.split(".")
 major = versionlist[0]
diff --git a/lang/python/gpgme.i b/lang/python/gpgme.i
index 5d074aa..783531f 100644
--- a/lang/python/gpgme.i
+++ b/lang/python/gpgme.i
@@ -159,7 +159,7 @@
     $1 = NULL;
   else {
     PyObject *pypointer;
-    pypointer = _pyme_obj2gpgme_data_t($input, $argnum, &wrapper,
+    pypointer = _gpg_obj2gpgme_data_t($input, $argnum, &wrapper,
                                        &bytesio, &view);
     if (pypointer == NULL)
       return NULL;
@@ -428,7 +428,7 @@
   PyObject *fragile;
   fragile = SWIG_NewPointerObj(SWIG_as_voidptr($1), $1_descriptor,
                                %newpointer_flags);
-  $result = _pyme_wrap_result(fragile, "EncryptResult");
+  $result = _gpg_wrap_result(fragile, "EncryptResult");
   Py_DECREF(fragile);
 }
 
@@ -436,7 +436,7 @@
   PyObject *fragile;
   fragile = SWIG_NewPointerObj(SWIG_as_voidptr($1), $1_descriptor,
                                %newpointer_flags);
-  $result = _pyme_wrap_result(fragile, "DecryptResult");
+  $result = _gpg_wrap_result(fragile, "DecryptResult");
   Py_DECREF(fragile);
 }
 
@@ -444,7 +444,7 @@
   PyObject *fragile;
   fragile = SWIG_NewPointerObj(SWIG_as_voidptr($1), $1_descriptor,
                                %newpointer_flags);
-  $result = _pyme_wrap_result(fragile, "SignResult");
+  $result = _gpg_wrap_result(fragile, "SignResult");
   Py_DECREF(fragile);
 }
 
@@ -452,7 +452,7 @@
   PyObject *fragile;
   fragile = SWIG_NewPointerObj(SWIG_as_voidptr($1), $1_descriptor,
                                %newpointer_flags);
-  $result = _pyme_wrap_result(fragile, "VerifyResult");
+  $result = _gpg_wrap_result(fragile, "VerifyResult");
   Py_DECREF(fragile);
 }
 
@@ -460,7 +460,7 @@
   PyObject *fragile;
   fragile = SWIG_NewPointerObj(SWIG_as_voidptr($1), $1_descriptor,
                                %newpointer_flags);
-  $result = _pyme_wrap_result(fragile, "ImportResult");
+  $result = _gpg_wrap_result(fragile, "ImportResult");
   Py_DECREF(fragile);
 }
 
@@ -468,7 +468,7 @@
   PyObject *fragile;
   fragile = SWIG_NewPointerObj(SWIG_as_voidptr($1), $1_descriptor,
                                %newpointer_flags);
-  $result = _pyme_wrap_result(fragile, "GenkeyResult");
+  $result = _gpg_wrap_result(fragile, "GenkeyResult");
   Py_DECREF(fragile);
 }
 
@@ -476,7 +476,7 @@
   PyObject *fragile;
   fragile = SWIG_NewPointerObj(SWIG_as_voidptr($1), $1_descriptor,
                                %newpointer_flags);
-  $result = _pyme_wrap_result(fragile, "KeylistResult");
+  $result = _gpg_wrap_result(fragile, "KeylistResult");
   Py_DECREF(fragile);
 }
 
@@ -484,7 +484,7 @@
   PyObject *fragile;
   fragile = SWIG_NewPointerObj(SWIG_as_voidptr($1), $1_descriptor,
                                %newpointer_flags);
-  $result = _pyme_wrap_result(fragile, "VFSMountResult");
+  $result = _gpg_wrap_result(fragile, "VFSMountResult");
   Py_DECREF(fragile);
 }
 
@@ -507,7 +507,7 @@
         Py_DECREF($result);
         return NULL;	/* raise */
       }
-    o = _pyme_wrap_result(fragile, "EngineInfo");
+    o = _gpg_wrap_result(fragile, "EngineInfo");
     Py_DECREF(fragile);
     if (o == NULL)
       {
@@ -528,7 +528,7 @@
     return PyErr_Format(PyExc_TypeError,
                         "interact callback must be a tuple of size 2 or 3");
 
-  $1 = (gpgme_interact_cb_t) _pyme_interact_cb;
+  $1 = (gpgme_interact_cb_t) _gpg_interact_cb;
   $2 = $input;
 }
 
@@ -547,7 +547,7 @@
                             "callback must be a tuple of size 2");
       if (! PyCallable_Check(PyTuple_GetItem($input, 1)))
         return PyErr_Format(PyExc_TypeError, "second item must be callable");
-      $1 = _pyme_assuan_data_cb;
+      $1 = _gpg_assuan_data_cb;
       $2 = $input;
     }
 }
@@ -564,7 +564,7 @@
                             "callback must be a tuple of size 2");
       if (! PyCallable_Check(PyTuple_GetItem($input, 1)))
         return PyErr_Format(PyExc_TypeError, "second item must be callable");
-      $1 = _pyme_assuan_inquire_cb;
+      $1 = _gpg_assuan_inquire_cb;
       $2 = $input;
     }
 }
@@ -581,7 +581,7 @@
                             "callback must be a tuple of size 2");
       if (! PyCallable_Check(PyTuple_GetItem($input, 1)))
         return PyErr_Format(PyExc_TypeError, "second item must be callable");
-      $1 = _pyme_assuan_status_cb;
+      $1 = _gpg_assuan_status_cb;
       $2 = $input;
     }
 }
@@ -654,13 +654,13 @@ FILE *fdopen(int fildes, const char *mode);
 
 /* SWIG runtime support for helpers.c  */
 PyObject *
-_pyme_wrap_gpgme_data_t(gpgme_data_t data)
+_gpg_wrap_gpgme_data_t(gpgme_data_t data)
 {
   return SWIG_Python_NewPointerObj(NULL, data, SWIGTYPE_p_gpgme_data, 0);
 }
 
 gpgme_ctx_t
-_pyme_unwrap_gpgme_ctx_t(PyObject *wrapped)
+_gpg_unwrap_gpgme_ctx_t(PyObject *wrapped)
 {
   gpgme_ctx_t result;
   if (SWIG_ConvertPtr(wrapped,
diff --git a/lang/python/helpers.c b/lang/python/helpers.c
index 3724752..8f71a30 100644
--- a/lang/python/helpers.c
+++ b/lang/python/helpers.c
@@ -33,7 +33,7 @@
 #include "private.h"
 
 /* Flag specifying whether this is an in-tree build.  */
-int pyme_in_tree_build =
+int gpg_in_tree_build =
 #if IN_TREE_BUILD
   1
 #else
@@ -43,7 +43,7 @@ int pyme_in_tree_build =
 
 static PyObject *GPGMEError = NULL;
 
-void _pyme_exception_init(void) {
+void _gpg_exception_init(void) {
   if (GPGMEError == NULL) {
     PyObject *errors;
     PyObject *from_list = PyList_New(0);
@@ -58,11 +58,11 @@ void _pyme_exception_init(void) {
 }
 
 static PyObject *
-_pyme_raise_exception(gpgme_error_t err)
+_gpg_raise_exception(gpgme_error_t err)
 {
   PyObject *e;
 
-  _pyme_exception_init();
+  _gpg_exception_init();
   if (GPGMEError == NULL)
     return PyErr_Format(PyExc_RuntimeError, "Got gpgme_error_t %d", err);
 
@@ -76,7 +76,7 @@ _pyme_raise_exception(gpgme_error_t err)
   return NULL;	/* raise */
 }
 
-gpgme_error_t _pyme_exception2code(void) {
+gpgme_error_t _gpg_exception2code(void) {
   gpgme_error_t err_status = gpg_error(GPG_ERR_GENERAL);
   if (GPGMEError && PyErr_ExceptionMatches(GPGMEError)) {
     PyObject *type = 0, *value = 0, *traceback = 0;
@@ -94,7 +94,7 @@ gpgme_error_t _pyme_exception2code(void) {
 /* Exception support for callbacks.  */
 #define EXCINFO	"_callback_excinfo"
 
-static void _pyme_stash_callback_exception(PyObject *weak_self)
+static void _gpg_stash_callback_exception(PyObject *weak_self)
 {
   PyObject *self, *ptype, *pvalue, *ptraceback, *excinfo;
 
@@ -136,7 +136,7 @@ static void _pyme_stash_callback_exception(PyObject *weak_self)
   Py_DECREF(excinfo);
 }
 
-PyObject *pyme_raise_callback_exception(PyObject *self)
+PyObject *gpg_raise_callback_exception(PyObject *self)
 {
   PyGILState_STATE state = PyGILState_Ensure();
   PyObject *ptype, *pvalue, *ptraceback, *excinfo;
@@ -192,7 +192,7 @@ PyObject *pyme_raise_callback_exception(PyObject *self)
 
 /* Convert object to a pointer to gpgme type, generic version.  */
 PyObject *
-_pyme_obj2gpgme_t(PyObject *input, const char *objtype, int argnum)
+_gpg_obj2gpgme_t(PyObject *input, const char *objtype, int argnum)
 {
   PyObject *pyname = NULL, *pypointer = NULL;
   pyname = PyObject_GetAttrString(input, "_ctype");
@@ -229,7 +229,7 @@ _pyme_obj2gpgme_t(PyObject *input, const char *objtype, int argnum)
    objects with a fileno method, returning it in WRAPPER.  This object
    must be de-referenced when no longer needed.  */
 PyObject *
-_pyme_obj2gpgme_data_t(PyObject *input, int argnum, gpgme_data_t *wrapper,
+_gpg_obj2gpgme_data_t(PyObject *input, int argnum, gpgme_data_t *wrapper,
                        PyObject **bytesio, Py_buffer *view)
 {
   gpgme_error_t err;
@@ -242,9 +242,9 @@ _pyme_obj2gpgme_data_t(PyObject *input, int argnum, gpgme_data_t *wrapper,
     err = gpgme_data_new_from_fd(wrapper, (int) PyLong_AsLong(fd));
     Py_DECREF(fd);
     if (err)
-      return _pyme_raise_exception (err);
+      return _gpg_raise_exception (err);
 
-    return _pyme_wrap_gpgme_data_t(*wrapper);
+    return _gpg_wrap_gpgme_data_t(*wrapper);
   }
   else
     PyErr_Clear();
@@ -283,17 +283,17 @@ _pyme_obj2gpgme_data_t(PyObject *input, int argnum, gpgme_data_t *wrapper,
 
       err = gpgme_data_new_from_mem(wrapper, view->buf, (size_t) view->len, 0);
       if (err)
-        return _pyme_raise_exception (err);
+        return _gpg_raise_exception (err);
 
-      return _pyme_wrap_gpgme_data_t(*wrapper);
+      return _gpg_wrap_gpgme_data_t(*wrapper);
     }
 
   /* As last resort we assume it is a wrapped data object.  */
   if (PyObject_HasAttrString(data, "_ctype"))
-    return _pyme_obj2gpgme_t(data, "gpgme_data_t", argnum);
+    return _gpg_obj2gpgme_t(data, "gpgme_data_t", argnum);
 
   return PyErr_Format(PyExc_TypeError,
-                      "arg %d: expected pyme.Data, file, or an object "
+                      "arg %d: expected gpg.Data, file, or an object "
                       "implementing the buffer protocol, got %s",
                       argnum, data->ob_type->tp_name);
 }
@@ -301,7 +301,7 @@ _pyme_obj2gpgme_data_t(PyObject *input, int argnum, gpgme_data_t *wrapper,
 
 
 PyObject *
-_pyme_wrap_result(PyObject *fragile, const char *classname)
+_gpg_wrap_result(PyObject *fragile, const char *classname)
 {
   static PyObject *results;
   PyObject *class;
@@ -348,7 +348,7 @@ static gpgme_error_t pyPassphraseCb(void *hook,
   PyObject *encoded = NULL;
   gpgme_error_t err_status = 0;
 
-  _pyme_exception_init();
+  _gpg_exception_init();
 
   assert (PyTuple_Check(pyhook));
   assert (PyTuple_Size(pyhook) == 2 || PyTuple_Size(pyhook) == 3);
@@ -385,12 +385,12 @@ static gpgme_error_t pyPassphraseCb(void *hook,
   retval = PyObject_CallObject(func, args);
   Py_DECREF(args);
   if (PyErr_Occurred()) {
-    err_status = _pyme_exception2code();
+    err_status = _gpg_exception2code();
   } else {
     if (!retval) {
       if (write(fd, "\n", 1) < 0) {
         err_status = gpgme_error_from_syserror ();
-        _pyme_raise_exception (err_status);
+        _gpg_raise_exception (err_status);
       }
     } else {
       char *buf;
@@ -425,11 +425,11 @@ static gpgme_error_t pyPassphraseCb(void *hook,
 
       if (write(fd, buf, len) < 0) {
         err_status = gpgme_error_from_syserror ();
-        _pyme_raise_exception (err_status);
+        _gpg_raise_exception (err_status);
       }
       if (! err_status && write(fd, "\n", 1) < 0) {
         err_status = gpgme_error_from_syserror ();
-        _pyme_raise_exception (err_status);
+        _gpg_raise_exception (err_status);
       }
 
       Py_DECREF(retval);
@@ -438,7 +438,7 @@ static gpgme_error_t pyPassphraseCb(void *hook,
 
  leave:
   if (err_status)
-    _pyme_stash_callback_exception(self);
+    _gpg_stash_callback_exception(self);
 
   Py_XDECREF(encoded);
   PyGILState_Release(state);
@@ -446,7 +446,7 @@ static gpgme_error_t pyPassphraseCb(void *hook,
 }
 
 PyObject *
-pyme_set_passphrase_cb(PyObject *self, PyObject *cb) {
+gpg_set_passphrase_cb(PyObject *self, PyObject *cb) {
   PyGILState_STATE state = PyGILState_Ensure();
   PyObject *wrapped;
   gpgme_ctx_t ctx;
@@ -459,7 +459,7 @@ pyme_set_passphrase_cb(PyObject *self, PyObject *cb) {
       return NULL;
     }
 
-  ctx = _pyme_unwrap_gpgme_ctx_t(wrapped);
+  ctx = _gpg_unwrap_gpgme_ctx_t(wrapped);
   Py_DECREF(wrapped);
   if (ctx == NULL)
     {
@@ -512,7 +512,7 @@ static void pyProgressCb(void *hook, const char *what, int type, int current,
   PyTuple_SetItem(args, 0, PyUnicode_DecodeUTF8(what, strlen (what),
                                                 "strict"));
   if (PyErr_Occurred()) {
-    _pyme_stash_callback_exception(self);
+    _gpg_stash_callback_exception(self);
     Py_DECREF(args);
     PyGILState_Release(state);
     return;
@@ -527,14 +527,14 @@ static void pyProgressCb(void *hook, const char *what, int type, int current,
 
   retval = PyObject_CallObject(func, args);
   if (PyErr_Occurred())
-    _pyme_stash_callback_exception(self);
+    _gpg_stash_callback_exception(self);
   Py_DECREF(args);
   Py_XDECREF(retval);
   PyGILState_Release(state);
 }
 
 PyObject *
-pyme_set_progress_cb(PyObject *self, PyObject *cb) {
+gpg_set_progress_cb(PyObject *self, PyObject *cb) {
   PyGILState_STATE state = PyGILState_Ensure();
   PyObject *wrapped;
   gpgme_ctx_t ctx;
@@ -547,7 +547,7 @@ pyme_set_progress_cb(PyObject *self, PyObject *cb) {
       return NULL;
     }
 
-  ctx = _pyme_unwrap_gpgme_ctx_t(wrapped);
+  ctx = _gpg_unwrap_gpgme_ctx_t(wrapped);
   Py_DECREF(wrapped);
   if (ctx == NULL)
     {
@@ -624,19 +624,19 @@ static gpgme_error_t pyStatusCb(void *hook, const char *keyword,
 
   retval = PyObject_CallObject(func, pyargs);
   if (PyErr_Occurred())
-    err = _pyme_exception2code();
+    err = _gpg_exception2code();
   Py_DECREF(pyargs);
   Py_XDECREF(retval);
 
  leave:
   if (err)
-    _pyme_stash_callback_exception(self);
+    _gpg_stash_callback_exception(self);
   PyGILState_Release(state);
   return err;
 }
 
 PyObject *
-pyme_set_status_cb(PyObject *self, PyObject *cb) {
+gpg_set_status_cb(PyObject *self, PyObject *cb) {
   PyGILState_STATE state = PyGILState_Ensure();
   PyObject *wrapped;
   gpgme_ctx_t ctx;
@@ -649,7 +649,7 @@ pyme_set_status_cb(PyObject *self, PyObject *cb) {
       return NULL;
     }
 
-  ctx = _pyme_unwrap_gpgme_ctx_t(wrapped);
+  ctx = _gpg_unwrap_gpgme_ctx_t(wrapped);
   Py_DECREF(wrapped);
   if (ctx == NULL)
     {
@@ -684,7 +684,7 @@ pyme_set_status_cb(PyObject *self, PyObject *cb) {
 
 /* Interact callbacks.  */
 gpgme_error_t
-_pyme_interact_cb(void *opaque, const char *keyword,
+_gpg_interact_cb(void *opaque, const char *keyword,
                   const char *args, int fd)
 {
   PyGILState_STATE state = PyGILState_Ensure();
@@ -694,7 +694,7 @@ _pyme_interact_cb(void *opaque, const char *keyword,
   gpgme_error_t err_status = 0;
   PyObject *self = NULL;
 
-  _pyme_exception_init();
+  _gpg_exception_init();
 
   assert (PyTuple_Check(pyopaque));
   assert (PyTuple_Size(pyopaque) == 2 || PyTuple_Size(pyopaque) == 3);
@@ -725,7 +725,7 @@ _pyme_interact_cb(void *opaque, const char *keyword,
   retval = PyObject_CallObject(func, pyargs);
   Py_DECREF(pyargs);
   if (PyErr_Occurred()) {
-    err_status = _pyme_exception2code();
+    err_status = _gpg_exception2code();
   } else {
     if (fd>=0 && retval && PyUnicode_Check(retval)) {
       PyObject *encoded = NULL;
@@ -747,18 +747,18 @@ _pyme_interact_cb(void *opaque, const char *keyword,
 
       if (write(fd, buffer, size) < 0) {
         err_status = gpgme_error_from_syserror ();
-        _pyme_raise_exception (err_status);
+        _gpg_raise_exception (err_status);
       }
       if (! err_status && write(fd, "\n", 1) < 0) {
         err_status = gpgme_error_from_syserror ();
-        _pyme_raise_exception (err_status);
+        _gpg_raise_exception (err_status);
       }
       Py_DECREF(encoded);
     }
   }
  leave:
   if (err_status)
-    _pyme_stash_callback_exception(self);
+    _gpg_stash_callback_exception(self);
 
   Py_XDECREF(retval);
   PyGILState_Release(state);
@@ -804,7 +804,7 @@ static ssize_t pyDataReadCb(void *hook, void *buffer, size_t size)
   retval = PyObject_CallObject(func, pyargs);
   Py_DECREF(pyargs);
   if (PyErr_Occurred()) {
-    _pyme_stash_callback_exception(self);
+    _gpg_stash_callback_exception(self);
     result = -1;
     goto leave;
   }
@@ -813,7 +813,7 @@ static ssize_t pyDataReadCb(void *hook, void *buffer, size_t size)
     PyErr_Format(PyExc_TypeError,
                  "expected bytes from read callback, got %s",
                  retval->ob_type->tp_name);
-    _pyme_stash_callback_exception(self);
+    _gpg_stash_callback_exception(self);
     result = -1;
     goto leave;
   }
@@ -822,7 +822,7 @@ static ssize_t pyDataReadCb(void *hook, void *buffer, size_t size)
     PyErr_Format(PyExc_TypeError,
                  "expected %zu bytes from read callback, got %zu",
                  size, PyBytes_Size(retval));
-    _pyme_stash_callback_exception(self);
+    _gpg_stash_callback_exception(self);
     result = -1;
     goto leave;
   }
@@ -871,7 +871,7 @@ static ssize_t pyDataWriteCb(void *hook, const void *buffer, size_t size)
   retval = PyObject_CallObject(func, pyargs);
   Py_DECREF(pyargs);
   if (PyErr_Occurred()) {
-    _pyme_stash_callback_exception(self);
+    _gpg_stash_callback_exception(self);
     result = -1;
     goto leave;
   }
@@ -887,7 +887,7 @@ static ssize_t pyDataWriteCb(void *hook, const void *buffer, size_t size)
     PyErr_Format(PyExc_TypeError,
                  "expected int from write callback, got %s",
                  retval->ob_type->tp_name);
-    _pyme_stash_callback_exception(self);
+    _gpg_stash_callback_exception(self);
     result = -1;
   }
 
@@ -938,7 +938,7 @@ static off_t pyDataSeekCb(void *hook, off_t offset, int whence)
   retval = PyObject_CallObject(func, pyargs);
   Py_DECREF(pyargs);
   if (PyErr_Occurred()) {
-    _pyme_stash_callback_exception(self);
+    _gpg_stash_callback_exception(self);
     result = -1;
     goto leave;
   }
@@ -958,7 +958,7 @@ static off_t pyDataSeekCb(void *hook, off_t offset, int whence)
     PyErr_Format(PyExc_TypeError,
                  "expected int from seek callback, got %s",
                  retval->ob_type->tp_name);
-    _pyme_stash_callback_exception(self);
+    _gpg_stash_callback_exception(self);
     result = -1;
   }
 
@@ -1000,12 +1000,12 @@ static void pyDataReleaseCb(void *hook)
   Py_XDECREF(retval);
   Py_DECREF(pyargs);
   if (PyErr_Occurred())
-    _pyme_stash_callback_exception(self);
+    _gpg_stash_callback_exception(self);
   PyGILState_Release(state);
 }
 
 PyObject *
-pyme_data_new_from_cbs(PyObject *self,
+gpg_data_new_from_cbs(PyObject *self,
                        PyObject *pycbs,
                        gpgme_data_t *r_data)
 {
@@ -1026,7 +1026,7 @@ pyme_data_new_from_cbs(PyObject *self,
 
   err = gpgme_data_new_from_cbs(r_data, &cbs, (void *) pycbs);
   if (err)
-    return _pyme_raise_exception(err);
+    return _gpg_raise_exception(err);
 
   PyObject_SetAttrString(self, "_data_cbs", pycbs);
 
@@ -1040,7 +1040,7 @@ pyme_data_new_from_cbs(PyObject *self,
 /* The assuan callbacks.  */
 
 gpgme_error_t
-_pyme_assuan_data_cb (void *hook, const void *data, size_t datalen)
+_gpg_assuan_data_cb (void *hook, const void *data, size_t datalen)
 {
   PyGILState_STATE state = PyGILState_Ensure();
   gpgme_error_t err = 0;
@@ -1059,25 +1059,25 @@ _pyme_assuan_data_cb (void *hook, const void *data, size_t datalen)
   py_data = PyBytes_FromStringAndSize(data, datalen);
   if (py_data == NULL)
     {
-      err = _pyme_exception2code();
+      err = _gpg_exception2code();
       goto leave;
     }
 
   retval = PyObject_CallFunctionObjArgs(func, py_data, NULL);
   if (PyErr_Occurred())
-    err = _pyme_exception2code();
+    err = _gpg_exception2code();
   Py_DECREF(py_data);
   Py_XDECREF(retval);
 
  leave:
   if (err)
-    _pyme_stash_callback_exception(self);
+    _gpg_stash_callback_exception(self);
   PyGILState_Release(state);
   return err;
 }
 
 gpgme_error_t
-_pyme_assuan_inquire_cb (void *hook, const char *name, const char *args,
+_gpg_assuan_inquire_cb (void *hook, const char *name, const char *args,
                          gpgme_data_t *r_data)
 {
   PyGILState_STATE state = PyGILState_Ensure();
@@ -1098,20 +1098,20 @@ _pyme_assuan_inquire_cb (void *hook, const char *name, const char *args,
   py_name = PyUnicode_FromString(name);
   if (py_name == NULL)
     {
-      err = _pyme_exception2code();
+      err = _gpg_exception2code();
       goto leave;
     }
 
   py_args = PyUnicode_FromString(args);
   if (py_args == NULL)
     {
-      err = _pyme_exception2code();
+      err = _gpg_exception2code();
       goto leave;
     }
 
   retval = PyObject_CallFunctionObjArgs(func, py_name, py_args, NULL);
   if (PyErr_Occurred())
-    err = _pyme_exception2code();
+    err = _gpg_exception2code();
   Py_XDECREF(retval);
 
   /* FIXME: Returning data is not yet implemented.  */
@@ -1121,13 +1121,13 @@ _pyme_assuan_inquire_cb (void *hook, const char *name, const char *args,
   Py_XDECREF(py_name);
   Py_XDECREF(py_args);
   if (err)
-    _pyme_stash_callback_exception(self);
+    _gpg_stash_callback_exception(self);
   PyGILState_Release(state);
   return err;
 }
 
 gpgme_error_t
-_pyme_assuan_status_cb (void *hook, const char *status, const char *args)
+_gpg_assuan_status_cb (void *hook, const char *status, const char *args)
 {
   PyGILState_STATE state = PyGILState_Ensure();
   gpgme_error_t err = 0;
@@ -1147,27 +1147,27 @@ _pyme_assuan_status_cb (void *hook, const char *status, const char *args)
   py_status = PyUnicode_FromString(status);
   if (py_status == NULL)
     {
-      err = _pyme_exception2code();
+      err = _gpg_exception2code();
       goto leave;
     }
 
   py_args = PyUnicode_FromString(args);
   if (py_args == NULL)
     {
-      err = _pyme_exception2code();
+      err = _gpg_exception2code();
       goto leave;
     }
 
   retval = PyObject_CallFunctionObjArgs(func, py_status, py_args, NULL);
   if (PyErr_Occurred())
-    err = _pyme_exception2code();
+    err = _gpg_exception2code();
   Py_XDECREF(retval);
 
  leave:
   Py_XDECREF(py_status);
   Py_XDECREF(py_args);
   if (err)
-    _pyme_stash_callback_exception(self);
+    _gpg_stash_callback_exception(self);
   PyGILState_Release(state);
   return err;
 }
diff --git a/lang/python/helpers.h b/lang/python/helpers.h
index 67d23b2..61f538e 100644
--- a/lang/python/helpers.h
+++ b/lang/python/helpers.h
@@ -31,13 +31,13 @@
 #endif
 
 /* Flag specifying whether this is an in-tree build.  */
-extern int pyme_in_tree_build;
+extern int gpg_in_tree_build;
 
-PyObject *pyme_raise_callback_exception(PyObject *self);
+PyObject *gpg_raise_callback_exception(PyObject *self);
 
-PyObject *pyme_set_passphrase_cb(PyObject *self, PyObject *cb);
-PyObject *pyme_set_progress_cb(PyObject *self, PyObject *cb);
-PyObject *pyme_set_status_cb(PyObject *self, PyObject *cb);
+PyObject *gpg_set_passphrase_cb(PyObject *self, PyObject *cb);
+PyObject *gpg_set_progress_cb(PyObject *self, PyObject *cb);
+PyObject *gpg_set_status_cb(PyObject *self, PyObject *cb);
 
-PyObject *pyme_data_new_from_cbs(PyObject *self, PyObject *pycbs,
+PyObject *gpg_data_new_from_cbs(PyObject *self, PyObject *pycbs,
 				 gpgme_data_t *r_data);
diff --git a/lang/python/private.h b/lang/python/private.h
index 3a903c1..e7b371f 100644
--- a/lang/python/private.h
+++ b/lang/python/private.h
@@ -19,36 +19,36 @@
 
 #include <gpgme.h>
 
-#ifndef _PYME_PRIVATE_H_
-#define _PYME_PRIVATE_H_
+#ifndef _GPG_PRIVATE_H_
+#define _GPG_PRIVATE_H_
 
 /* GPGME glue.  Implemented in helpers.c.  */
 
-void _pyme_exception_init(void);
-gpgme_error_t _pyme_exception2code(void);
+void _gpg_exception_init(void);
+gpgme_error_t _gpg_exception2code(void);
 
-PyObject *_pyme_obj2gpgme_t(PyObject *input, const char *objtype, int argnum);
-PyObject *_pyme_obj2gpgme_data_t(PyObject *input, int argnum,
+PyObject *_gpg_obj2gpgme_t(PyObject *input, const char *objtype, int argnum);
+PyObject *_gpg_obj2gpgme_data_t(PyObject *input, int argnum,
 				 gpgme_data_t *wrapper,
 				 PyObject **bytesio, Py_buffer *view);
 
-PyObject *_pyme_wrap_result(PyObject *fragile, const char *classname);
+PyObject *_gpg_wrap_result(PyObject *fragile, const char *classname);
 
-gpgme_error_t _pyme_interact_cb(void *opaque, const char *keyword,
+gpgme_error_t _gpg_interact_cb(void *opaque, const char *keyword,
 				const char *args, int fd);
-gpgme_error_t _pyme_assuan_data_cb (void *hook,
+gpgme_error_t _gpg_assuan_data_cb (void *hook,
 				    const void *data, size_t datalen);
-gpgme_error_t _pyme_assuan_inquire_cb (void *hook,
+gpgme_error_t _gpg_assuan_inquire_cb (void *hook,
 				       const char *name, const char *args,
 				       gpgme_data_t *r_data);
-gpgme_error_t _pyme_assuan_status_cb (void *hook,
+gpgme_error_t _gpg_assuan_status_cb (void *hook,
 				      const char *status, const char *args);
 
 
 
 /* SWIG runtime support.  Implemented in gpgme.i.  */
 
-PyObject *_pyme_wrap_gpgme_data_t(gpgme_data_t data);
-gpgme_ctx_t _pyme_unwrap_gpgme_ctx_t(PyObject *wrapped);
+PyObject *_gpg_wrap_gpgme_data_t(gpgme_data_t data);
+gpgme_ctx_t _gpg_unwrap_gpgme_ctx_t(PyObject *wrapped);
 
-#endif /* _PYME_PRIVATE_H_ */
+#endif /* _GPG_PRIVATE_H_ */
diff --git a/lang/python/pyme/__pycache__/__init__.cpython-34.pyc b/lang/python/pyme/__pycache__/__init__.cpython-34.pyc
deleted file mode 100644
index ba78937..0000000
--- a/lang/python/pyme/__pycache__/__init__.cpython-34.pyc
+++ /dev/null
diff --git a/lang/python/pyme/__pycache__/version.cpython-34.pyc b/lang/python/pyme/__pycache__/version.cpython-34.pyc
deleted file mode 100644
index 658008a..0000000
--- a/lang/python/pyme/__pycache__/version.cpython-34.pyc
+++ /dev/null
diff --git a/lang/python/setup.py.in b/lang/python/setup.py.in
index 4c41673..9669c28 100755
--- a/lang/python/setup.py.in
+++ b/lang/python/setup.py.in
@@ -23,7 +23,7 @@ import os, os.path, sys
 import glob
 import subprocess
 
-# Out-of-tree build of the pyme3 bindings.
+# Out-of-tree build of the gpg bindings.
 gpg_error_config = ["gpg-error-config"]
 gpgme_config_flags = ["--thread=pthread"]
 gpgme_config = ["gpgme-config"] + gpgme_config_flags
@@ -75,8 +75,8 @@ if '-' in version:
     version = version.split('-')[0]
 major, minor, patch = map(int, version.split('.'))
 
-if not (major > 1 or (major == 1 and minor >= 6)):
-    sys.exit('Need at least GPGME version 1.6, found {}.'.format(version_raw))
+if not (major > 1 or (major == 1 and minor >= 7)):
+    sys.exit('Need at least GPGME version 1.7, found {}.'.format(version_raw))
 
 if not gpgme_h:
     gpgme_h = os.path.join(getconfig("prefix")[0], "include", "gpgme.h")
@@ -88,7 +88,7 @@ if not os.path.exists(gpg_error_h):
         glob.glob(os.path.join(gpg_error_prefix, "include",
                                "*", "gpg-error.h"))[0]
 
-print("Building pyme3 using {} and {}.".format(gpgme_h, gpg_error_h))
+print("Building python gpg module using {} and {}.".format(gpgme_h, gpg_error_h))
 
 # Cleanup gpgme.h from deprecated functions and typedefs.
 subprocess.check_call([sys.executable, "gpgme-h-clean.py", gpgme_h],
@@ -152,15 +152,15 @@ class BuildExtFirstHack(build):
         self.run_command('build_ext')
         build.run(self)
 
-swige = Extension("pyme._gpgme", ["gpgme.i", "helpers.c"],
+swige = Extension("gpg._gpgme", ["gpgme.i", "helpers.c"],
                   swig_opts = ['-py3', '-builtin', '-threads',
-                               '-outdir', 'pyme'] + extra_swig_opts,
+                               '-outdir', 'gpg'] + extra_swig_opts,
                   include_dirs = include_dirs,
                   define_macros = define_macros,
                   library_dirs = library_dirs,
                   extra_link_args = libs)
 
-setup(name="pyme3",
+setup(name="gpg",
       cmdclass={'build': BuildExtFirstHack},
       version="@VERSION@",
       description='Python bindings for GPGME GnuPG cryptography library',
@@ -170,8 +170,8 @@ setup(name="pyme3",
       author_email='gnupg-devel@gnupg.org',
       url='https://www.gnupg.org',
       ext_modules=[swige],
-      packages = ['pyme', 'pyme.constants', 'pyme.constants.data',
-                  'pyme.constants.keylist', 'pyme.constants.sig'],
+      packages = ['gpg', 'gpg.constants', 'gpg.constants.data',
+                  'gpg.constants.keylist', 'gpg.constants.sig'],
       license="LGPL2.1+ (the library), GPL2+ (tests and examples)",
       classifiers=[
           'Development Status :: 4 - Beta',
diff --git a/lang/python/tests/Makefile.am b/lang/python/tests/Makefile.am
index aa88bdc..39f532c 100644
--- a/lang/python/tests/Makefile.am
+++ b/lang/python/tests/Makefile.am
@@ -89,7 +89,7 @@ clean-local:
 
 
 ./private-keys-v1.d/gpg-sample.stamp: $(private_keys)
-	test -d ./private-keys-v1.d || mkdir ./private-keys-v1.d
+	$(MKDIR_P) ./private-keys-v1.d
 	for k in $(private_keys); do \
           cp $$k private-keys-v1.d/$${k#$(test_srcdir)/}.key; \
         done
diff --git a/lang/python/tests/Makefile.in b/lang/python/tests/Makefile.in
index 3886bf4..ce60cd5 100644
--- a/lang/python/tests/Makefile.in
+++ b/lang/python/tests/Makefile.in
@@ -268,6 +268,9 @@ SWIG = @SWIG@
 SWIG_LIB = @SWIG_LIB@
 SYSROOT = @SYSROOT@
 VERSION = @VERSION@
+VERSION_MAJOR = @VERSION_MAJOR@
+VERSION_MICRO = @VERSION_MICRO@
+VERSION_MINOR = @VERSION_MINOR@
 VERSION_NUMBER = @VERSION_NUMBER@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -591,7 +594,7 @@ clean-local:
 	-rm -fR -- private-keys-v1.d openpgp-revocs.d S.gpg-agent sshcontrol
 
 ./private-keys-v1.d/gpg-sample.stamp: $(private_keys)
-	test -d ./private-keys-v1.d || mkdir ./private-keys-v1.d
+	$(MKDIR_P) ./private-keys-v1.d
 	for k in $(private_keys); do \
           cp $$k private-keys-v1.d/$${k#$(test_srcdir)/}.key; \
         done
diff --git a/lang/python/tests/initial.py b/lang/python/tests/initial.py
index 2d4827a..ebe7f8a 100755
--- a/lang/python/tests/initial.py
+++ b/lang/python/tests/initial.py
@@ -22,14 +22,14 @@ del absolute_import, print_function, unicode_literals
 
 import os
 import subprocess
-import pyme
+import gpg
 import support
-support.init_gpgme(pyme.constants.PROTOCOL_OpenPGP)
+support.init_gpgme(gpg.constants.protocol.OpenPGP)
 
 subprocess.check_call([os.path.join(os.getenv('top_srcdir'),
                                     "tests", "start-stop-agent"), "--start"])
 
-with pyme.Context() as c:
+with gpg.Context() as c:
     alpha = c.get_key("A0FF4590BB6122EDEF6E3C542D727CC768697734", False)
     bob = c.get_key("D695676BDCEDCC2CDD6152BCFE180B1DA9E3B0B2", False)
 
diff --git a/lang/python/tests/support.py b/lang/python/tests/support.py
index f1ffdc3..f991c6d 100644
--- a/lang/python/tests/support.py
+++ b/lang/python/tests/support.py
@@ -20,7 +20,7 @@ del absolute_import, print_function, unicode_literals
 
 import sys
 import os
-from pyme import core
+import gpg
 
 # known keys
 alpha = "A0FF4590BB6122EDEF6E3C542D727CC768697734"
@@ -36,7 +36,7 @@ def in_srcdir(name):
     return os.path.join(os.environ['srcdir'], name)
 
 def init_gpgme(proto):
-    core.engine_check_version(proto)
+    gpg.core.engine_check_version(proto)
 
 verbose = int(os.environ.get('verbose', 0)) > 1
 def print_data(data):
@@ -66,5 +66,5 @@ def mark_key_trusted(ctx, key):
             else:
                 result = None
             return result
-    with core.Data() as sink:
+    with gpg.Data() as sink:
         ctx.op_edit(key, Editor().edit, sink, sink)
diff --git a/lang/python/tests/t-callbacks.py b/lang/python/tests/t-callbacks.py
index b3b4349..eed50bc 100755
--- a/lang/python/tests/t-callbacks.py
+++ b/lang/python/tests/t-callbacks.py
@@ -21,16 +21,16 @@ from __future__ import absolute_import, print_function, unicode_literals
 del absolute_import, print_function, unicode_literals
 
 import os
-from pyme import core, constants
+import gpg
 import support
 
-support.init_gpgme(constants.PROTOCOL_OpenPGP)
+support.init_gpgme(gpg.constants.protocol.OpenPGP)
 
-c = core.Context()
-c.set_pinentry_mode(constants.PINENTRY_MODE_LOOPBACK)
+c = gpg.Context()
+c.set_pinentry_mode(gpg.constants.PINENTRY_MODE_LOOPBACK)
 
-source = core.Data("Hallo Leute\n")
-sink = core.Data()
+source = gpg.Data("Hallo Leute\n")
+sink = gpg.Data()
 
 # Valid passphrases, both as string and bytes.
 for passphrase in ('foo', b'foo'):
@@ -87,7 +87,7 @@ Key-Type: RSA
 Key-Length: 1024
 Name-Real: Joe Tester
 Name-Comment: with stupid passphrase
-Name-Email: joe+pyme@example.org
+Name-Email: joe+gpg@example.org
 Passphrase: Crypt0R0cks
 Expire-Date: 2020-12-31
 </GnupgKeyParms>
@@ -100,7 +100,7 @@ def progress_cb(what, typ, current, total, hook=None):
         "PROGRESS UPDATE: what = {}, type = {}, current = {}, total = {}"
         .format(what, typ, current, total))
 
-c = core.Context()
+c = gpg.Context()
 c.set_progress_cb(progress_cb, messages)
 c.op_genkey(parms, None, None)
 assert len(messages) > 0
@@ -109,7 +109,7 @@ assert len(messages) > 0
 def progress_cb(what, typ, current, total, hook=None):
     raise myException
 
-c = core.Context()
+c = gpg.Context()
 c.set_progress_cb(progress_cb, None)
 try:
     c.op_genkey(parms, None, None)
@@ -120,10 +120,10 @@ else:
 
 
 # Test the edit callback.
-c = core.Context()
-c.set_pinentry_mode(constants.PINENTRY_MODE_LOOPBACK)
+c = gpg.Context()
+c.set_pinentry_mode(gpg.constants.PINENTRY_MODE_LOOPBACK)
 c.set_passphrase_cb(lambda *args: "abc")
-sink = core.Data()
+sink = gpg.Data()
 alpha = c.get_key("A0FF4590BB6122EDEF6E3C542D727CC768697734", False)
 
 cookie = object()
@@ -137,10 +137,10 @@ c.op_edit(alpha, edit_cb, cookie, sink)
 assert edit_cb_called
 
 # Test exceptions.
-c = core.Context()
-c.set_pinentry_mode(constants.PINENTRY_MODE_LOOPBACK)
+c = gpg.Context()
+c.set_pinentry_mode(gpg.constants.PINENTRY_MODE_LOOPBACK)
 c.set_passphrase_cb(lambda *args: "abc")
-sink = core.Data()
+sink = gpg.Data()
 
 def edit_cb(status, args):
     raise myException
@@ -154,8 +154,8 @@ else:
 
 
 # Test the status callback.
-source = core.Data("Hallo Leute\n")
-sink = core.Data()
+source = gpg.Data("Hallo Leute\n")
+sink = gpg.Data()
 
 status_cb_called = False
 def status_cb(keyword, args, hook=None):
@@ -163,24 +163,24 @@ def status_cb(keyword, args, hook=None):
     status_cb_called = True
     assert hook == cookie
 
-c = core.Context()
+c = gpg.Context()
 c.set_status_cb(status_cb, cookie)
 c.set_ctx_flag("full-status", "1")
-c.op_encrypt([alpha], constants.ENCRYPT_ALWAYS_TRUST, source, sink)
+c.op_encrypt([alpha], gpg.constants.ENCRYPT_ALWAYS_TRUST, source, sink)
 assert status_cb_called
 
 # Test exceptions.
-source = core.Data("Hallo Leute\n")
-sink = core.Data()
+source = gpg.Data("Hallo Leute\n")
+sink = gpg.Data()
 
 def status_cb(keyword, args):
     raise myException
 
-c = core.Context()
+c = gpg.Context()
 c.set_status_cb(status_cb, None)
 c.set_ctx_flag("full-status", "1")
 try:
-    c.op_encrypt([alpha], constants.ENCRYPT_ALWAYS_TRUST, source, sink)
+    c.op_encrypt([alpha], gpg.constants.ENCRYPT_ALWAYS_TRUST, source, sink)
 except Exception as e:
     assert e == myException
 else:
@@ -194,7 +194,7 @@ def read_cb(amount, hook=None):
     return 0
 def release_cb(hook=None):
     assert hook == cookie
-data = core.Data(cbs=(read_cb, None, None, release_cb, cookie))
+data = gpg.Data(cbs=(read_cb, None, None, release_cb, cookie))
 try:
     data.read()
 except Exception as e:
@@ -204,7 +204,7 @@ else:
 
 def read_cb(amount):
     raise myException
-data = core.Data(cbs=(read_cb, None, None, lambda: None))
+data = gpg.Data(cbs=(read_cb, None, None, lambda: None))
 try:
     data.read()
 except Exception as e:
@@ -216,7 +216,7 @@ else:
 def write_cb(what, hook=None):
     assert hook == cookie
     return "wrong type"
-data = core.Data(cbs=(None, write_cb, None, release_cb, cookie))
+data = gpg.Data(cbs=(None, write_cb, None, release_cb, cookie))
 try:
     data.write(b'stuff')
 except Exception as e:
@@ -226,7 +226,7 @@ else:
 
 def write_cb(what):
     raise myException
-data = core.Data(cbs=(None, write_cb, None, lambda: None))
+data = gpg.Data(cbs=(None, write_cb, None, lambda: None))
 try:
     data.write(b'stuff')
 except Exception as e:
@@ -238,7 +238,7 @@ else:
 def seek_cb(offset, whence, hook=None):
     assert hook == cookie
     return "wrong type"
-data = core.Data(cbs=(None, None, seek_cb, release_cb, cookie))
+data = gpg.Data(cbs=(None, None, seek_cb, release_cb, cookie))
 try:
     data.seek(0, os.SEEK_SET)
 except Exception as e:
@@ -248,7 +248,7 @@ else:
 
 def seek_cb(offset, whence):
     raise myException
-data = core.Data(cbs=(None, None, seek_cb, lambda: None))
+data = gpg.Data(cbs=(None, None, seek_cb, lambda: None))
 try:
     data.seek(0, os.SEEK_SET)
 except Exception as e:
diff --git a/lang/python/tests/t-data.py b/lang/python/tests/t-data.py
index 4812a2e..d1facd4 100755
--- a/lang/python/tests/t-data.py
+++ b/lang/python/tests/t-data.py
@@ -23,9 +23,9 @@ del absolute_import, print_function, unicode_literals
 import io
 import os
 import tempfile
-from pyme import core
+import gpg
 
-data = core.Data('Hello world!')
+data = gpg.Data('Hello world!')
 assert data.read() == b'Hello world!'
 assert data.read() == b''
 
@@ -33,29 +33,29 @@ data.seek(0, os.SEEK_SET)
 assert data.read() == b'Hello world!'
 assert data.read() == b''
 
-data = core.Data(b'Hello world!')
+data = gpg.Data(b'Hello world!')
 assert data.read() == b'Hello world!'
 
-data = core.Data(b'Hello world!', copy=False)
+data = gpg.Data(b'Hello world!', copy=False)
 assert data.read() == b'Hello world!'
 
-data = core.Data()
+data = gpg.Data()
 data.write('Hello world!')
 data.seek(0, os.SEEK_SET)
 assert data.read() == b'Hello world!'
 
-data = core.Data()
+data = gpg.Data()
 data.write(b'Hello world!')
 data.seek(0, os.SEEK_SET)
 assert data.read() == b'Hello world!'
 
 binjunk = bytes(range(256))
-data = core.Data()
+data = gpg.Data()
 data.write(binjunk)
 data.seek(0, os.SEEK_SET)
 assert data.read() == binjunk
 
-data = core.Data()
+data = gpg.Data()
 data.set_file_name("foobar")
 assert data.get_file_name() == "foobar"
 
@@ -66,26 +66,26 @@ with tempfile.NamedTemporaryFile() as tmp:
     tmp.seek(0)
 
     # Open using name.
-    data = core.Data(file=tmp.name)
+    data = gpg.Data(file=tmp.name)
     assert data.read() == binjunk
 
     # Open using name, without copying.
     if False:
         # delayed reads are not yet supported
-        data = core.Data(file=tmp.name, copy=False)
+        data = gpg.Data(file=tmp.name, copy=False)
         assert data.read() == binjunk
 
     # Open using stream.
     tmp.seek(0)
-    data = core.Data(file=tmp)
+    data = gpg.Data(file=tmp)
     assert data.read() == binjunk
 
     # Open using stream, offset, and length.
-    data = core.Data(file=tmp, offset=0, length=42)
+    data = gpg.Data(file=tmp, offset=0, length=42)
     assert data.read() == binjunk[:42]
 
     # Open using name, offset, and length.
-    data = core.Data(file=tmp.name, offset=23, length=42)
+    data = gpg.Data(file=tmp.name, offset=23, length=42)
     assert data.read() == binjunk[23:23+42]
 
 # Test callbacks.
@@ -112,7 +112,7 @@ class DataObject(object):
 
 do = DataObject()
 cookie = object()
-data = core.Data(cbs=(do.read, do.write, do.seek, do.release, cookie))
+data = gpg.Data(cbs=(do.read, do.write, do.seek, do.release, cookie))
 data.write('Hello world!')
 data.seek(0, os.SEEK_SET)
 assert data.read() == b'Hello world!'
@@ -121,7 +121,7 @@ assert do.released
 
 # Again, without the cookie.
 do = DataObject()
-data = core.Data(cbs=(do.read, do.write, do.seek, do.release))
+data = gpg.Data(cbs=(do.read, do.write, do.seek, do.release))
 data.write('Hello world!')
 data.seek(0, os.SEEK_SET)
 assert data.read() == b'Hello world!'
diff --git a/lang/python/tests/t-decrypt-verify.py b/lang/python/tests/t-decrypt-verify.py
index a38a965..6243167 100755
--- a/lang/python/tests/t-decrypt-verify.py
+++ b/lang/python/tests/t-decrypt-verify.py
@@ -20,8 +20,7 @@
 from __future__ import absolute_import, print_function, unicode_literals
 del absolute_import, print_function, unicode_literals
 
-import pyme
-from pyme import core, constants, errors
+import gpg
 import support
 
 def check_verify_result(result, summary, fpr, status):
@@ -29,17 +28,17 @@ def check_verify_result(result, summary, fpr, status):
     sig = result.signatures[0]
     assert sig.summary == summary, "Unexpected signature summary"
     assert sig.fpr == fpr
-    assert errors.GPGMEError(sig.status).getcode() == status
+    assert gpg.errors.GPGMEError(sig.status).getcode() == status
     assert len(sig.notations) == 0
     assert not sig.wrong_key_usage
-    assert sig.validity == constants.VALIDITY_FULL
-    assert errors.GPGMEError(sig.validity_reason).getcode() == errors.NO_ERROR
+    assert sig.validity == gpg.constants.validity.FULL
+    assert gpg.errors.GPGMEError(sig.validity_reason).getcode() == gpg.errors.NO_ERROR
 
-support.init_gpgme(constants.PROTOCOL_OpenPGP)
-c = core.Context()
+support.init_gpgme(gpg.constants.protocol.OpenPGP)
+c = gpg.Context()
 
-source = core.Data(file=support.make_filename("cipher-2.asc"))
-sink = core.Data()
+source = gpg.Data(file=support.make_filename("cipher-2.asc"))
+sink = gpg.Data()
 
 c.op_decrypt_verify(source, sink)
 result = c.op_decrypt_result()
@@ -50,12 +49,12 @@ support.print_data(sink)
 
 verify_result = c.op_verify_result()
 check_verify_result(verify_result,
-                    constants.SIGSUM_VALID | constants.SIGSUM_GREEN,
+                    gpg.constants.sigsum.VALID | gpg.constants.sigsum.GREEN,
                     "A0FF4590BB6122EDEF6E3C542D727CC768697734",
-                    errors.NO_ERROR)
+                    gpg.errors.NO_ERROR)
 
 # Idiomatic interface.
-with pyme.Context() as c:
+with gpg.Context() as c:
     alpha = c.get_key("A0FF4590BB6122EDEF6E3C542D727CC768697734", False)
     bob = c.get_key("D695676BDCEDCC2CDD6152BCFE180B1DA9E3B0B2", False)
     plaintext, _, verify_result = \
@@ -63,14 +62,14 @@ with pyme.Context() as c:
     assert plaintext.find(b'Wenn Sie dies lesen k') >= 0, \
         'Plaintext not found'
     check_verify_result(verify_result,
-                        constants.SIGSUM_VALID | constants.SIGSUM_GREEN,
+                        gpg.constants.sigsum.VALID | gpg.constants.sigsum.GREEN,
                         "A0FF4590BB6122EDEF6E3C542D727CC768697734",
-                        errors.NO_ERROR)
+                        gpg.errors.NO_ERROR)
 
     try:
         c.decrypt(open(support.make_filename("cipher-2.asc")),
                   verify=[alpha, bob])
-    except errors.MissingSignatures as e:
+    except gpg.errors.MissingSignatures as e:
         assert len(e.missing) == 1
         assert e.missing[0] == bob
     else:
diff --git a/lang/python/tests/t-decrypt.py b/lang/python/tests/t-decrypt.py
index 2d85bc2..1af0562 100755
--- a/lang/python/tests/t-decrypt.py
+++ b/lang/python/tests/t-decrypt.py
@@ -20,15 +20,14 @@
 from __future__ import absolute_import, print_function, unicode_literals
 del absolute_import, print_function, unicode_literals
 
-import pyme
-from pyme import core, constants
+import gpg
 import support
 
-support.init_gpgme(constants.PROTOCOL_OpenPGP)
-c = core.Context()
+support.init_gpgme(gpg.constants.protocol.OpenPGP)
+c = gpg.Context()
 
-source = core.Data(file=support.make_filename("cipher-1.asc"))
-sink = core.Data()
+source = gpg.Data(file=support.make_filename("cipher-1.asc"))
+sink = gpg.Data()
 
 c.op_decrypt(source, sink)
 result = c.op_decrypt_result()
@@ -38,7 +37,7 @@ assert not result.unsupported_algorithm, \
 support.print_data(sink)
 
 # Idiomatic interface.
-with pyme.Context() as c:
+with gpg.Context() as c:
     plaintext, _, _ = c.decrypt(open(support.make_filename("cipher-1.asc")))
     assert len(plaintext) > 0
     assert plaintext.find(b'Wenn Sie dies lesen k') >= 0, \
diff --git a/lang/python/tests/t-edit.py b/lang/python/tests/t-edit.py
index 18bcb94..bd70e7e 100755
--- a/lang/python/tests/t-edit.py
+++ b/lang/python/tests/t-edit.py
@@ -23,7 +23,7 @@ del absolute_import, print_function, unicode_literals
 
 import sys
 import os
-from pyme import core, constants
+import gpg
 import support
 
 class KeyEditor(object):
@@ -51,10 +51,10 @@ class KeyEditor(object):
 
         return result
 
-support.init_gpgme(constants.PROTOCOL_OpenPGP)
+support.init_gpgme(gpg.constants.protocol.OpenPGP)
 
-c = core.Context()
-c.set_pinentry_mode(constants.PINENTRY_MODE_LOOPBACK)
+c = gpg.Context()
+c.set_pinentry_mode(gpg.constants.PINENTRY_MODE_LOOPBACK)
 c.set_passphrase_cb(lambda *args: "abc")
 c.set_armor(True)
 
@@ -65,7 +65,7 @@ c.interact(c.get_key("A0FF4590BB6122EDEF6E3C542D727CC768697734", False),
 assert editor.done
 
 # The deprecated interface.
-sink = core.Data()
+sink = gpg.Data()
 editor = KeyEditor()
 c.op_edit(c.get_key("A0FF4590BB6122EDEF6E3C542D727CC768697734", False),
           editor.edit_fnc, sink, sink)
diff --git a/lang/python/tests/t-encrypt-large.py b/lang/python/tests/t-encrypt-large.py
index b9cc3b5..cdb4a32 100755
--- a/lang/python/tests/t-encrypt-large.py
+++ b/lang/python/tests/t-encrypt-large.py
@@ -22,7 +22,7 @@ del absolute_import, print_function, unicode_literals
 
 import sys
 import random
-from pyme import core, constants
+import gpg
 import support
 
 if len(sys.argv) == 2:
@@ -30,8 +30,8 @@ if len(sys.argv) == 2:
 else:
     nbytes = 100000
 
-support.init_gpgme(constants.PROTOCOL_OpenPGP)
-c = core.Context()
+support.init_gpgme(gpg.constants.protocol.OpenPGP)
+c = gpg.Context()
 
 ntoread = nbytes
 def read_cb(amount):
@@ -48,14 +48,14 @@ def write_cb(data):
     nwritten += len(data)
     return len(data)
 
-source = core.Data(cbs=(read_cb, None, None, lambda: None))
-sink = core.Data(cbs=(None, write_cb, None, lambda: None))
+source = gpg.Data(cbs=(read_cb, None, None, lambda: None))
+sink = gpg.Data(cbs=(None, write_cb, None, lambda: None))
 
 keys = []
 keys.append(c.get_key("A0FF4590BB6122EDEF6E3C542D727CC768697734", False))
 keys.append(c.get_key("D695676BDCEDCC2CDD6152BCFE180B1DA9E3B0B2", False))
 
-c.op_encrypt(keys, constants.ENCRYPT_ALWAYS_TRUST, source, sink)
+c.op_encrypt(keys, gpg.constants.ENCRYPT_ALWAYS_TRUST, source, sink)
 result = c.op_encrypt_result()
 assert not result.invalid_recipients, \
     "Invalid recipient encountered: {}".format(result.invalid_recipients.fpr)
diff --git a/lang/python/tests/t-encrypt-sign.py b/lang/python/tests/t-encrypt-sign.py
index a453f79..094a2b0 100755
--- a/lang/python/tests/t-encrypt-sign.py
+++ b/lang/python/tests/t-encrypt-sign.py
@@ -21,12 +21,11 @@ from __future__ import absolute_import, print_function, unicode_literals
 del absolute_import, print_function, unicode_literals
 
 import sys
-import pyme
-from pyme import core, constants
+import gpg
 import support
 
-support.init_gpgme(constants.PROTOCOL_OpenPGP)
-c = core.Context()
+support.init_gpgme(gpg.constants.protocol.OpenPGP)
+c = gpg.Context()
 c.set_armor(True)
 
 def check_result(r, typ):
@@ -40,11 +39,11 @@ def check_result(r, typ):
     if signature.type != typ:
         sys.exit("Wrong type of signature created")
 
-    if signature.pubkey_algo != constants.PK_DSA:
+    if signature.pubkey_algo != gpg.constants.pk.DSA:
         sys.exit("Wrong pubkey algorithm reported: {}".format(
             signature.pubkey_algo))
 
-    if signature.hash_algo not in (constants.MD_SHA1, constants.MD_RMD160):
+    if signature.hash_algo not in (gpg.constants.md.SHA1, gpg.constants.md.RMD160):
         sys.exit("Wrong hash algorithm reported: {}".format(
             signature.hash_algo))
 
@@ -60,30 +59,30 @@ keys.append(c.get_key("A0FF4590BB6122EDEF6E3C542D727CC768697734", False))
 keys.append(c.get_key("D695676BDCEDCC2CDD6152BCFE180B1DA9E3B0B2", False))
 
 for recipients in (keys, []):
-    source = core.Data("Hallo Leute\n")
-    sink = core.Data()
+    source = gpg.Data("Hallo Leute\n")
+    sink = gpg.Data()
 
-    c.op_encrypt_sign(recipients, constants.ENCRYPT_ALWAYS_TRUST, source, sink)
+    c.op_encrypt_sign(recipients, gpg.constants.ENCRYPT_ALWAYS_TRUST, source, sink)
     result = c.op_encrypt_result()
     assert not result.invalid_recipients, \
         "Invalid recipient encountered: {}".format(
             result.invalid_recipients.fpr)
 
     result = c.op_sign_result()
-    check_result(result, constants.SIG_MODE_NORMAL)
+    check_result(result, gpg.constants.sig.mode.NORMAL)
 
     support.print_data(sink)
 
 
 # Idiomatic interface.
-with pyme.Context(armor=True) as c:
+with gpg.Context(armor=True) as c:
     message = "Hallo Leute\n".encode()
     ciphertext, _, sig_result = c.encrypt(message,
                                           recipients=keys,
                                           always_trust=True)
     assert len(ciphertext) > 0
     assert ciphertext.find(b'BEGIN PGP MESSAGE') > 0, 'Marker not found'
-    check_result(sig_result, constants.SIG_MODE_NORMAL)
+    check_result(sig_result, gpg.constants.sig.mode.NORMAL)
 
     c.signers = [c.get_key(support.sign_only, True)]
     c.encrypt(message, recipients=keys, always_trust=True)
@@ -91,7 +90,7 @@ with pyme.Context(armor=True) as c:
     c.signers = [c.get_key(support.encrypt_only, True)]
     try:
         c.encrypt(message, recipients=keys, always_trust=True)
-    except pyme.errors.InvalidSigners as e:
+    except gpg.errors.InvalidSigners as e:
         assert len(e.signers) == 1
         assert support.encrypt_only.endswith(e.signers[0].fpr)
     else:
diff --git a/lang/python/tests/t-encrypt-sym.py b/lang/python/tests/t-encrypt-sym.py
index d577184..07e6b62 100755
--- a/lang/python/tests/t-encrypt-sym.py
+++ b/lang/python/tests/t-encrypt-sym.py
@@ -21,19 +21,18 @@ from __future__ import absolute_import, print_function, unicode_literals
 del absolute_import, print_function, unicode_literals
 
 import os
-import pyme
-from pyme import core, constants
+import gpg
 import support
 
-support.init_gpgme(constants.PROTOCOL_OpenPGP)
+support.init_gpgme(gpg.constants.protocol.OpenPGP)
 
 for passphrase in ("abc", b"abc"):
-    c = core.Context()
+    c = gpg.Context()
     c.set_armor(True)
-    c.set_pinentry_mode(constants.PINENTRY_MODE_LOOPBACK)
+    c.set_pinentry_mode(gpg.constants.PINENTRY_MODE_LOOPBACK)
 
-    source = core.Data("Hallo Leute\n")
-    cipher = core.Data()
+    source = gpg.Data("Hallo Leute\n")
+    cipher = gpg.Data()
 
     passphrase_cb_called = 0
     def passphrase_cb(hint, desc, prev_bad, hook=None):
@@ -48,11 +47,11 @@ for passphrase in ("abc", b"abc"):
         "Callback called {} times".format(passphrase_cb_called)
     support.print_data(cipher)
 
-    c = core.Context()
+    c = gpg.Context()
     c.set_armor(True)
-    c.set_pinentry_mode(constants.PINENTRY_MODE_LOOPBACK)
+    c.set_pinentry_mode(gpg.constants.PINENTRY_MODE_LOOPBACK)
     c.set_passphrase_cb(passphrase_cb, None)
-    plain = core.Data()
+    plain = gpg.Data()
     cipher.seek(0, os.SEEK_SET)
 
     c.op_decrypt(cipher, plain)
@@ -68,7 +67,7 @@ for passphrase in ("abc", b"abc"):
 
 # Idiomatic interface.
 for passphrase in ("abc", b"abc"):
-    with pyme.Context(armor=True) as c:
+    with gpg.Context(armor=True) as c:
         # Check that the passphrase callback is not altered.
         def f(*args):
             assert False
diff --git a/lang/python/tests/t-encrypt.py b/lang/python/tests/t-encrypt.py
index 65e7d24..0c0ca35 100755
--- a/lang/python/tests/t-encrypt.py
+++ b/lang/python/tests/t-encrypt.py
@@ -20,29 +20,28 @@
 from __future__ import absolute_import, print_function, unicode_literals
 del absolute_import, print_function, unicode_literals
 
-import pyme
-from pyme import core, constants
+import gpg
 import support
 
-support.init_gpgme(constants.PROTOCOL_OpenPGP)
-c = core.Context()
+support.init_gpgme(gpg.constants.protocol.OpenPGP)
+c = gpg.Context()
 c.set_armor(True)
 
-source = core.Data("Hallo Leute\n")
-sink = core.Data()
+source = gpg.Data("Hallo Leute\n")
+sink = gpg.Data()
 
 keys = []
 keys.append(c.get_key("A0FF4590BB6122EDEF6E3C542D727CC768697734", False))
 keys.append(c.get_key("D695676BDCEDCC2CDD6152BCFE180B1DA9E3B0B2", False))
 
-c.op_encrypt(keys, constants.ENCRYPT_ALWAYS_TRUST, source, sink)
+c.op_encrypt(keys, gpg.constants.ENCRYPT_ALWAYS_TRUST, source, sink)
 result = c.op_encrypt_result()
 assert not result.invalid_recipients, \
   "Invalid recipients: {}".format(", ".join(r.fpr for r in result.recipients))
 support.print_data(sink)
 
 # Idiomatic interface.
-with pyme.Context(armor=True) as c:
+with gpg.Context(armor=True) as c:
     ciphertext, _, _ = c.encrypt("Hallo Leute\n".encode(),
                                  recipients=keys,
                                  sign=False,
@@ -58,7 +57,7 @@ with pyme.Context(armor=True) as c:
         c.encrypt("Hallo Leute\n".encode(),
                   recipients=[c.get_key(support.sign_only, False)],
                   sign=False, always_trust=True)
-    except pyme.errors.InvalidRecipients as e:
+    except gpg.errors.InvalidRecipients as e:
         assert len(e.recipients) == 1
         assert support.sign_only.endswith(e.recipients[0].fpr)
     else:
diff --git a/lang/python/tests/t-export.py b/lang/python/tests/t-export.py
index db36b98..4927beb 100755
--- a/lang/python/tests/t-export.py
+++ b/lang/python/tests/t-export.py
@@ -20,14 +20,14 @@
 from __future__ import absolute_import, print_function, unicode_literals
 del absolute_import, print_function, unicode_literals
 
-from pyme import core, constants
+import gpg
 import support
 
-support.init_gpgme(constants.PROTOCOL_OpenPGP)
-c = core.Context()
+support.init_gpgme(gpg.constants.protocol.OpenPGP)
+c = gpg.Context()
 c.set_armor(True)
 
-sink = core.Data()
+sink = gpg.Data()
 c.op_export_ext(['Alpha', 'Bob'], 0, sink)
 support.print_data(sink)
 
@@ -35,6 +35,6 @@ support.print_data(sink)
 keys = []
 keys.append(c.get_key("0x68697734", False)) # Alpha
 keys.append(c.get_key("0xA9E3B0B2", False)) # Bob
-sink = core.Data()
+sink = gpg.Data()
 c.op_export_keys(keys, 0, sink)
 support.print_data(sink)
diff --git a/lang/python/tests/t-file-name.py b/lang/python/tests/t-file-name.py
index e93b120..d12afb8 100755
--- a/lang/python/tests/t-file-name.py
+++ b/lang/python/tests/t-file-name.py
@@ -21,24 +21,24 @@ from __future__ import absolute_import, print_function, unicode_literals
 del absolute_import, print_function, unicode_literals
 
 import os
-from pyme import core, constants
+import gpg
 import support
 
 testname = "abcde12345"
 
-support.init_gpgme(constants.PROTOCOL_OpenPGP)
-c = core.Context()
+support.init_gpgme(gpg.constants.protocol.OpenPGP)
+c = gpg.Context()
 c.set_armor(True)
 
-source = core.Data("Hallo Leute\n")
+source = gpg.Data("Hallo Leute\n")
 source.set_file_name(testname)
-cipher = core.Data()
-plain = core.Data()
+cipher = gpg.Data()
+plain = gpg.Data()
 
 keys = []
 keys.append(c.get_key("A0FF4590BB6122EDEF6E3C542D727CC768697734", False))
 
-c.op_encrypt(keys, constants.ENCRYPT_ALWAYS_TRUST, source, cipher)
+c.op_encrypt(keys, gpg.constants.ENCRYPT_ALWAYS_TRUST, source, cipher)
 cipher.seek(0, os.SEEK_SET)
 c.op_decrypt(cipher, plain)
 result = c.op_decrypt_result()
diff --git a/lang/python/tests/t-idiomatic.py b/lang/python/tests/t-idiomatic.py
index f063206..485f048 100755
--- a/lang/python/tests/t-idiomatic.py
+++ b/lang/python/tests/t-idiomatic.py
@@ -24,13 +24,13 @@ import sys
 import io
 import os
 import tempfile
-import pyme
+import gpg
 import support
 
-support.init_gpgme(pyme.constants.PROTOCOL_OpenPGP)
+support.init_gpgme(gpg.constants.protocol.OpenPGP)
 
 # Both Context and Data can be used as context manager:
-with pyme.Context() as c, pyme.Data() as d:
+with gpg.Context() as c, gpg.Data() as d:
     c.get_engine_info()
     d.write(b"Halloechen")
     leak_c = c
@@ -39,17 +39,17 @@ assert leak_c.wrapped == None
 assert leak_d.wrapped == None
 
 def sign_and_verify(source, signed, sink):
-    with pyme.Context() as c:
-        c.op_sign(source, signed, pyme.constants.SIG_MODE_NORMAL)
+    with gpg.Context() as c:
+        c.op_sign(source, signed, gpg.constants.sig.mode.NORMAL)
         signed.seek(0, os.SEEK_SET)
         c.op_verify(signed, None, sink)
         result = c.op_verify_result()
 
     assert len(result.signatures) == 1, "Unexpected number of signatures"
     sig = result.signatures[0]
-    assert sig.summary == (pyme.constants.SIGSUM_VALID |
-                           pyme.constants.SIGSUM_GREEN)
-    assert pyme.errors.GPGMEError(sig.status).getcode() == pyme.errors.NO_ERROR
+    assert sig.summary == (gpg.constants.sigsum.VALID |
+                           gpg.constants.sigsum.GREEN)
+    assert gpg.errors.GPGMEError(sig.status).getcode() == gpg.errors.NO_ERROR
 
     sink.seek(0, os.SEEK_SET)
     assert sink.read() == b"Hallo Leute\n"
@@ -80,5 +80,5 @@ if sys.version_info[0] == 3:
 
     # Demonstrate automatic wrapping of objects implementing the buffer
     # interface, and the use of data objects with the 'with' statement.
-    with io.BytesIO(preallocate) as signed, pyme.Data() as sink:
+    with io.BytesIO(preallocate) as signed, gpg.Data() as sink:
         sign_and_verify(b"Hallo Leute\n", signed, sink)
diff --git a/lang/python/tests/t-import.py b/lang/python/tests/t-import.py
index 0b50d02..5b0576f 100755
--- a/lang/python/tests/t-import.py
+++ b/lang/python/tests/t-import.py
@@ -20,7 +20,7 @@
 from __future__ import absolute_import, print_function, unicode_literals
 del absolute_import, print_function, unicode_literals
 
-from pyme import core, constants
+import gpg
 import support
 
 def check_result(result, fpr, secret):
@@ -67,13 +67,13 @@ def check_result(result, fpr, secret):
     assert len(result.imports) == 1 or fpr == result.imports[1].fpr
     assert result.imports[0].result == 0
 
-support.init_gpgme(constants.PROTOCOL_OpenPGP)
-c = core.Context()
+support.init_gpgme(gpg.constants.protocol.OpenPGP)
+c = gpg.Context()
 
-c.op_import(core.Data(file=support.make_filename("pubkey-1.asc")))
+c.op_import(gpg.Data(file=support.make_filename("pubkey-1.asc")))
 result = c.op_import_result()
 check_result(result, "ADAB7FCC1F4DE2616ECFA402AF82244F9CD9FD55", False)
 
-c.op_import(core.Data(file=support.make_filename("seckey-1.asc")))
+c.op_import(gpg.Data(file=support.make_filename("seckey-1.asc")))
 result = c.op_import_result()
 check_result(result, "ADAB7FCC1F4DE2616ECFA402AF82244F9CD9FD55", True)
diff --git a/lang/python/tests/t-keylist.py b/lang/python/tests/t-keylist.py
index f7f6674..ea2a724 100755
--- a/lang/python/tests/t-keylist.py
+++ b/lang/python/tests/t-keylist.py
@@ -20,12 +20,11 @@
 from __future__ import absolute_import, print_function, unicode_literals
 del absolute_import, print_function, unicode_literals
 
-import pyme
-from pyme import core, constants
+import gpg
 import support
 
-support.init_gpgme(constants.PROTOCOL_OpenPGP)
-c = core.Context()
+support.init_gpgme(gpg.constants.protocol.OpenPGP)
+c = gpg.Context()
 
 # Check expration of keys.  This test assumes three subkeys of which
 # 2 are expired; it is used with the "Whisky" test key.  It has
@@ -109,7 +108,7 @@ def check_global(key, uids, n_subkeys):
     assert key.can_sign, "Key unexpectedly unusable for signing"
     assert key.can_certify, "Key unexpectedly unusable for certifications"
     assert not key.secret, "Key unexpectedly secret"
-    assert not key.protocol != constants.PROTOCOL_OpenPGP, \
+    assert not key.protocol != gpg.constants.protocol.OpenPGP, \
         "Key has unexpected protocol: {}".format(key.protocol)
     assert not key.issuer_serial, \
         "Key unexpectedly carries issuer serial: {}".format(key.issuer_serial)
@@ -120,10 +119,10 @@ def check_global(key, uids, n_subkeys):
 
     # Only key Alfa is trusted
     assert key.uids[0].name == 'Alfa Test' \
-      or key.owner_trust == constants.VALIDITY_UNKNOWN, \
+      or key.owner_trust == gpg.constants.validity.UNKNOWN, \
         "Key has unexpected owner trust: {}".format(key.owner_trust)
     assert key.uids[0].name != 'Alfa Test' \
-      or key.owner_trust == constants.VALIDITY_ULTIMATE, \
+      or key.owner_trust == gpg.constants.validity.ULTIMATE, \
         "Key has unexpected owner trust: {}".format(key.owner_trust)
 
     assert len(key.subkeys) - 1 == n_subkeys, \
@@ -154,8 +153,8 @@ def check_subkey(fpr, which, subkey):
     assert not subkey.secret, which + " key unexpectedly secret"
     assert not subkey.is_cardkey, "Public key marked as card key"
     assert not subkey.card_number, "Public key with card number set"
-    assert not subkey.pubkey_algo != (constants.PK_DSA if which == "Primary"
-                                      else constants.PK_ELG_E), \
+    assert not subkey.pubkey_algo != (gpg.constants.pk.DSA if which == "Primary"
+                                      else gpg.constants.pk.ELG_E), \
         which + " key has unexpected public key algo: {}".\
             format(subkey.pubkey_algo)
     assert subkey.length == 1024, \
@@ -170,10 +169,10 @@ def check_subkey(fpr, which, subkey):
 def check_uid(which, ref, uid):
     assert not uid.revoked, which + " user ID unexpectedly revoked"
     assert not uid.invalid, which + " user ID unexpectedly invalid"
-    assert uid.validity == (constants.VALIDITY_UNKNOWN
+    assert uid.validity == (gpg.constants.validity.UNKNOWN
                             if uid.name.split()[0]
                             not in {'Alfa', 'Alpha', 'Alice'} else
-                            constants.VALIDITY_ULTIMATE), \
+                            gpg.constants.validity.ULTIMATE), \
       which + " user ID has unexpectedly validity: {}".format(uid.validity)
     assert not uid.signatures, which + " user ID unexpectedly signed"
     assert uid.name == ref[0], \
@@ -248,7 +247,7 @@ for i, key in enumerate(c.keylist()):
 
 
 # check get_key()
-with pyme.Context() as c:
+with gpg.Context() as c:
   c.get_key(support.alpha)
   c.get_key(support.alpha, secret=True)
 
@@ -263,7 +262,7 @@ with pyme.Context() as c:
   # Legacy error
   try:
     c.get_key(support.no_such_key)
-  except pyme.errors.GPGMEError:
+  except gpg.errors.GPGMEError:
     pass
   else:
     assert False, "Expected GPGMEError"
diff --git a/lang/python/tests/t-protocol-assuan.py b/lang/python/tests/t-protocol-assuan.py
index 172c7d0..0084a6b 100755
--- a/lang/python/tests/t-protocol-assuan.py
+++ b/lang/python/tests/t-protocol-assuan.py
@@ -20,17 +20,17 @@
 from __future__ import absolute_import, print_function, unicode_literals
 del absolute_import, print_function, unicode_literals
 
-import pyme
+import gpg
 
-with pyme.Context(protocol=pyme.constants.PROTOCOL_ASSUAN) as c:
+with gpg.Context(protocol=gpg.constants.protocol.ASSUAN) as c:
     # Do nothing.
     c.assuan_transact('nop')
     c.assuan_transact('NOP')
     c.assuan_transact(['NOP'])
 
     err = c.assuan_transact('idontexist')
-    assert err.getsource() == pyme.errors.SOURCE_GPGAGENT
-    assert err.getcode() == pyme.errors.ASS_UNKNOWN_CMD
+    assert err.getsource() == gpg.errors.SOURCE_GPGAGENT
+    assert err.getcode() == gpg.errors.ASS_UNKNOWN_CMD
 
     # Invoke the pinentry to get a confirmation.
     c.assuan_transact(['GET_CONFIRMATION', 'Hello there'])
diff --git a/lang/python/tests/t-sig-notation.py b/lang/python/tests/t-sig-notation.py
index eb5b111..f1342b1 100755
--- a/lang/python/tests/t-sig-notation.py
+++ b/lang/python/tests/t-sig-notation.py
@@ -21,19 +21,19 @@ from __future__ import absolute_import, print_function, unicode_literals
 del absolute_import, print_function, unicode_literals
 
 import os
-from pyme import core, constants
+import gpg
 import support
 
 expected_notations = {
-    "laughing@me": ("Just Squeeze Me", constants.SIG_NOTATION_HUMAN_READABLE),
+    "laughing@me": ("Just Squeeze Me", gpg.constants.sig.notation.HUMAN_READABLE),
     "preferred-email-encoding@pgp.com": ("pgpmime",
-                                         constants.SIG_NOTATION_HUMAN_READABLE
-                                         | constants.SIG_NOTATION_CRITICAL),
+                                         gpg.constants.sig.notation.HUMAN_READABLE
+                                         | gpg.constants.sig.notation.CRITICAL),
     None: ("http://www.gnu.org/policy/", 0),
 }
 
 # GnuPG prior to 2.1.13 did not report the critical flag correctly.
-with core.Context() as c:
+with gpg.Context() as c:
     version = c.engine_info.version
     have_correct_sig_data = not (version.startswith("1.")
                                  or version.startswith("2.0.")
@@ -55,26 +55,26 @@ def check_result(result):
         assert r.value == value, \
             "Expected {!r}, got {!r}".format(value, r.value)
         assert r.human_readable \
-            == bool(flags&constants.SIG_NOTATION_HUMAN_READABLE)
+            == bool(flags & gpg.constants.sig.notation.HUMAN_READABLE)
         assert r.critical \
-            == (bool(flags&constants.SIG_NOTATION_CRITICAL)
+            == (bool(flags & gpg.constants.sig.notation.CRITICAL)
                 if have_correct_sig_data else False)
 
     assert len(expected_notations) == 0
 
-support.init_gpgme(constants.PROTOCOL_OpenPGP)
+support.init_gpgme(gpg.constants.protocol.OpenPGP)
 
-source = core.Data("Hallo Leute\n")
-signed = core.Data()
+source = gpg.Data("Hallo Leute\n")
+signed = gpg.Data()
 
-c = core.Context()
+c = gpg.Context()
 for name, (value, flags) in expected_notations.items():
     c.sig_notation_add(name, value, flags)
 
-c.op_sign(source, signed, constants.SIG_MODE_NORMAL)
+c.op_sign(source, signed, gpg.constants.sig.mode.NORMAL)
 
 signed.seek(0, os.SEEK_SET)
-sink = core.Data()
+sink = gpg.Data()
 c.op_verify(signed, None, sink)
 result = c.op_verify_result()
 check_result(result)
diff --git a/lang/python/tests/t-sign.py b/lang/python/tests/t-sign.py
index b0e211a..9418ed8 100755
--- a/lang/python/tests/t-sign.py
+++ b/lang/python/tests/t-sign.py
@@ -21,8 +21,7 @@ from __future__ import absolute_import, print_function, unicode_literals
 del absolute_import, print_function, unicode_literals
 
 import os
-import pyme
-from pyme import core, constants
+import gpg
 import support
 
 def fail(msg):
@@ -39,11 +38,11 @@ def check_result(r, typ):
     if signature.type != typ:
         fail("Wrong type of signature created")
 
-    if signature.pubkey_algo != constants.PK_DSA:
+    if signature.pubkey_algo != gpg.constants.pk.DSA:
         fail("Wrong pubkey algorithm reported: {}".format(
             signature.pubkey_algo))
 
-    if signature.hash_algo != constants.MD_SHA1:
+    if signature.hash_algo != gpg.constants.md.SHA1:
         fail("Wrong hash algorithm reported: {}".format(
             signature.hash_algo))
 
@@ -55,58 +54,58 @@ def check_result(r, typ):
         fail("Wrong fingerprint reported: {}".format(signature.fpr))
 
 
-support.init_gpgme(constants.PROTOCOL_OpenPGP)
-c = core.Context()
+support.init_gpgme(gpg.constants.protocol.OpenPGP)
+c = gpg.Context()
 c.set_textmode(True)
 c.set_armor(True)
 
-source = core.Data("Hallo Leute\n")
-sink = core.Data()
+source = gpg.Data("Hallo Leute\n")
+sink = gpg.Data()
 
-c.op_sign(source, sink, constants.SIG_MODE_NORMAL)
+c.op_sign(source, sink, gpg.constants.sig.mode.NORMAL)
 
 result = c.op_sign_result()
-check_result(result, constants.SIG_MODE_NORMAL)
+check_result(result, gpg.constants.sig.mode.NORMAL)
 support.print_data(sink)
 
 # Now a detached signature.
 source.seek(0, os.SEEK_SET)
-sink = core.Data()
+sink = gpg.Data()
 
-c.op_sign(source, sink, constants.SIG_MODE_DETACH)
+c.op_sign(source, sink, gpg.constants.sig.mode.DETACH)
 
 result = c.op_sign_result()
-check_result(result, constants.SIG_MODE_DETACH)
+check_result(result, gpg.constants.sig.mode.DETACH)
 support.print_data(sink)
 
 # And finally a cleartext signature.  */
 source.seek(0, os.SEEK_SET)
-sink = core.Data()
+sink = gpg.Data()
 
-c.op_sign(source, sink, constants.SIG_MODE_CLEAR)
+c.op_sign(source, sink, gpg.constants.sig.mode.CLEAR)
 
 result = c.op_sign_result()
-check_result(result, constants.SIG_MODE_CLEAR)
+check_result(result, gpg.constants.sig.mode.CLEAR)
 support.print_data(sink)
 
 # Idiomatic interface.
-with pyme.Context(armor=True, textmode=True) as c:
+with gpg.Context(armor=True, textmode=True) as c:
     message = "Hallo Leute\n".encode()
     signed, _ = c.sign(message)
     assert len(signed) > 0
     assert signed.find(b'BEGIN PGP MESSAGE') > 0, 'Message not found'
 
-    signed, _ = c.sign(message, mode=pyme.constants.SIG_MODE_DETACH)
+    signed, _ = c.sign(message, mode=gpg.constants.sig.mode.DETACH)
     assert len(signed) > 0
     assert signed.find(b'BEGIN PGP SIGNATURE') > 0, 'Signature not found'
 
-    signed, _ = c.sign(message, mode=pyme.constants.SIG_MODE_CLEAR)
+    signed, _ = c.sign(message, mode=gpg.constants.sig.mode.CLEAR)
     assert len(signed) > 0
     assert signed.find(b'BEGIN PGP SIGNED MESSAGE') > 0, 'Message not found'
     assert signed.find(message) > 0, 'Message content not found'
     assert signed.find(b'BEGIN PGP SIGNATURE') > 0, 'Signature not found'
 
-with pyme.Context() as c:
+with gpg.Context() as c:
     message = "Hallo Leute\n".encode()
 
     c.signers = [c.get_key(support.sign_only, True)]
@@ -115,7 +114,7 @@ with pyme.Context() as c:
     c.signers = [c.get_key(support.encrypt_only, True)]
     try:
         c.sign(message)
-    except pyme.errors.InvalidSigners as e:
+    except gpg.errors.InvalidSigners as e:
         assert len(e.signers) == 1
         assert support.encrypt_only.endswith(e.signers[0].fpr)
     else:
diff --git a/lang/python/tests/t-signers.py b/lang/python/tests/t-signers.py
index 11403af..80e797c 100755
--- a/lang/python/tests/t-signers.py
+++ b/lang/python/tests/t-signers.py
@@ -20,8 +20,7 @@
 from __future__ import absolute_import, print_function, unicode_literals
 del absolute_import, print_function, unicode_literals
 
-import pyme
-from pyme import core, constants
+import gpg
 import support
 
 def fail(msg):
@@ -38,11 +37,11 @@ def check_result(r, typ):
         if signature.type != typ:
             fail("Wrong type of signature created")
 
-        if signature.pubkey_algo != constants.PK_DSA:
+        if signature.pubkey_algo != gpg.constants.pk.DSA:
             fail("Wrong pubkey algorithm reported: {}".format(
                 signature.pubkey_algo))
 
-        if signature.hash_algo != constants.MD_SHA1:
+        if signature.hash_algo != gpg.constants.md.SHA1:
             fail("Wrong hash algorithm reported: {}".format(
                 signature.hash_algo))
 
@@ -55,8 +54,8 @@ def check_result(r, typ):
             fail("Wrong fingerprint reported: {}".format(signature.fpr))
 
 
-support.init_gpgme(constants.PROTOCOL_OpenPGP)
-c = core.Context()
+support.init_gpgme(gpg.constants.protocol.OpenPGP)
+c = gpg.Context()
 c.set_textmode(True)
 c.set_armor(True)
 
@@ -69,10 +68,10 @@ c.op_keylist_end()
 c.signers_add(keys[0])
 c.signers_add(keys[1])
 
-for mode in (constants.SIG_MODE_NORMAL, constants.SIG_MODE_DETACH,
-             constants.SIG_MODE_CLEAR):
-    source = core.Data("Hallo Leute\n")
-    sink = core.Data()
+for mode in (gpg.constants.sig.mode.NORMAL, gpg.constants.sig.mode.DETACH,
+             gpg.constants.sig.mode.CLEAR):
+    source = gpg.Data("Hallo Leute\n")
+    sink = gpg.Data()
 
     c.op_sign(source, sink, mode)
 
@@ -81,18 +80,18 @@ for mode in (constants.SIG_MODE_NORMAL, constants.SIG_MODE_DETACH,
     support.print_data(sink)
 
 # Idiomatic interface.
-with pyme.Context(armor=True, textmode=True, signers=keys) as c:
+with gpg.Context(armor=True, textmode=True, signers=keys) as c:
     message = "Hallo Leute\n".encode()
     signed, result = c.sign(message)
-    check_result(result, constants.SIG_MODE_NORMAL)
+    check_result(result, gpg.constants.sig.mode.NORMAL)
     assert signed.find(b'BEGIN PGP MESSAGE') > 0, 'Message not found'
 
-    signed, result = c.sign(message, mode=constants.SIG_MODE_DETACH)
-    check_result(result, constants.SIG_MODE_DETACH)
+    signed, result = c.sign(message, mode=gpg.constants.sig.mode.DETACH)
+    check_result(result, gpg.constants.sig.mode.DETACH)
     assert signed.find(b'BEGIN PGP SIGNATURE') > 0, 'Signature not found'
 
-    signed, result = c.sign(message, mode=constants.SIG_MODE_CLEAR)
-    check_result(result, constants.SIG_MODE_CLEAR)
+    signed, result = c.sign(message, mode=gpg.constants.sig.mode.CLEAR)
+    check_result(result, gpg.constants.sig.mode.CLEAR)
     assert signed.find(b'BEGIN PGP SIGNED MESSAGE') > 0, 'Message not found'
     assert signed.find(message) > 0, 'Message content not found'
     assert signed.find(b'BEGIN PGP SIGNATURE') > 0, 'Signature not found'
diff --git a/lang/python/tests/t-trustlist.py b/lang/python/tests/t-trustlist.py
index 4253bd7..8c5e214 100755
--- a/lang/python/tests/t-trustlist.py
+++ b/lang/python/tests/t-trustlist.py
@@ -20,11 +20,11 @@
 from __future__ import absolute_import, print_function, unicode_literals
 del absolute_import, print_function, unicode_literals
 
-from pyme import core, constants
+import gpg
 import support
 
-support.init_gpgme(constants.PROTOCOL_OpenPGP)
-c = core.Context()
+support.init_gpgme(gpg.constants.protocol.OpenPGP)
+c = gpg.Context()
 
 def dump_item(item):
     print("l={} k={} t={} o={} v={} u={}".format(
diff --git a/lang/python/tests/t-verify.py b/lang/python/tests/t-verify.py
index 39f6176..f18e1dd 100755
--- a/lang/python/tests/t-verify.py
+++ b/lang/python/tests/t-verify.py
@@ -22,8 +22,7 @@ del absolute_import, print_function, unicode_literals
 
 import sys
 import os
-import pyme
-from pyme import core, constants, errors
+import gpg
 import support
 
 test_text1 = b"Just GNU it!\n"
@@ -67,7 +66,7 @@ def check_result(result, summary, validity, fpr, status, notation):
         "Unexpected signature summary: {}, want: {}".format(sig.summary,
                                                             summary)
     assert sig.fpr == fpr
-    assert errors.GPGMEError(sig.status).getcode() == status
+    assert gpg.errors.GPGMEError(sig.status).getcode() == status
 
     if notation:
         expected_notations = {
@@ -96,87 +95,87 @@ def check_result(result, summary, validity, fpr, status, notation):
     assert sig.validity == validity, \
         "Unexpected signature validity: {}, want: {}".format(
             sig.validity, validity)
-    assert errors.GPGMEError(sig.validity_reason).getcode() == errors.NO_ERROR
+    assert gpg.errors.GPGMEError(sig.validity_reason).getcode() == gpg.errors.NO_ERROR
 
 
-support.init_gpgme(constants.PROTOCOL_OpenPGP)
-c = core.Context()
+support.init_gpgme(gpg.constants.protocol.OpenPGP)
+c = gpg.Context()
 c.set_armor(True)
 
 # Checking a valid message.
-text = core.Data(test_text1)
-sig = core.Data(test_sig1)
+text = gpg.Data(test_text1)
+sig = gpg.Data(test_sig1)
 c.op_verify(sig, text, None)
 result = c.op_verify_result()
-check_result(result, constants.SIGSUM_VALID | constants.SIGSUM_GREEN,
-             constants.VALIDITY_FULL,
+check_result(result, gpg.constants.sigsum.VALID | gpg.constants.sigsum.GREEN,
+             gpg.constants.validity.FULL,
              "A0FF4590BB6122EDEF6E3C542D727CC768697734",
-             errors.NO_ERROR, True)
+             gpg.errors.NO_ERROR, True)
 
 
 # Checking a manipulated message.
-text = core.Data(test_text1f)
+text = gpg.Data(test_text1f)
 sig.seek(0, os.SEEK_SET)
 c.op_verify(sig, text, None)
 result = c.op_verify_result()
-check_result(result, constants.SIGSUM_RED, constants.VALIDITY_UNKNOWN,
-             "2D727CC768697734", errors.BAD_SIGNATURE, False)
+check_result(result, gpg.constants.sigsum.RED, gpg.constants.validity.UNKNOWN,
+             "2D727CC768697734", gpg.errors.BAD_SIGNATURE, False)
 
 # Checking a normal signature.
-text = core.Data()
-sig = core.Data(test_sig2)
+text = gpg.Data()
+sig = gpg.Data(test_sig2)
 c.op_verify(sig, None, text)
 result = c.op_verify_result()
-check_result(result, constants.SIGSUM_VALID | constants.SIGSUM_GREEN,
-             constants.VALIDITY_FULL,
+check_result(result, gpg.constants.sigsum.VALID | gpg.constants.sigsum.GREEN,
+             gpg.constants.validity.FULL,
              "A0FF4590BB6122EDEF6E3C542D727CC768697734",
-             errors.NO_ERROR, False)
+             gpg.errors.NO_ERROR, False)
 
 # Checking an invalid message.
-text = core.Data()
-sig = core.Data(double_plaintext_sig)
+text = gpg.Data()
+sig = gpg.Data(double_plaintext_sig)
 try:
     c.op_verify(sig, None, text)
 except Exception as e:
-    assert type(e) == errors.GPGMEError
-    assert e.getcode() == errors.BAD_DATA
+    assert type(e) == gpg.errors.GPGMEError
+    assert e.getcode() == gpg.errors.BAD_DATA
 else:
     assert False, "Expected an error but got none."
 
 
 # Idiomatic interface.
-with pyme.Context(armor=True) as c:
+with gpg.Context(armor=True) as c:
     # Checking a valid message.
     _, result = c.verify(test_text1, test_sig1)
-    check_result(result, constants.SIGSUM_VALID | constants.SIGSUM_GREEN,
-                 constants.VALIDITY_FULL,
+    check_result(result, gpg.constants.sigsum.VALID | gpg.constants.sigsum.GREEN,
+                 gpg.constants.validity.FULL,
                  "A0FF4590BB6122EDEF6E3C542D727CC768697734",
-                 errors.NO_ERROR, True)
+                 gpg.errors.NO_ERROR, True)
 
     # Checking a manipulated message.
     try:
         c.verify(test_text1f, test_sig1)
-    except errors.BadSignatures as e:
-        check_result(e.result, constants.SIGSUM_RED,
-                     constants.VALIDITY_UNKNOWN,
-                     "2D727CC768697734", errors.BAD_SIGNATURE, False)
+    except gpg.errors.BadSignatures as e:
+        check_result(e.result, gpg.constants.sigsum.RED,
+                     gpg.constants.validity.UNKNOWN,
+                     "2D727CC768697734", gpg.errors.BAD_SIGNATURE, False)
     else:
         assert False, "Expected an error but got none."
 
     # Checking a normal signature.
-    sig = core.Data(test_sig2)
+    sig = gpg.Data(test_sig2)
     data, result = c.verify(test_sig2)
-    check_result(result, constants.SIGSUM_VALID | constants.SIGSUM_GREEN,
-                 constants.VALIDITY_FULL,
+    check_result(result, gpg.constants.sigsum.VALID | gpg.constants.sigsum.GREEN,
+                 gpg.constants.validity.FULL,
                  "A0FF4590BB6122EDEF6E3C542D727CC768697734",
-                 errors.NO_ERROR, False)
+                 gpg.errors.NO_ERROR, False)
     assert data == test_text1
 
     # Checking an invalid message.
     try:
         c.verify(double_plaintext_sig)
-    except errors.GPGMEError as e:
-        assert e.getcode() == errors.BAD_DATA
+    except gpg.errors.GPGMEError as e:
+        assert e.getcode() == gpg.errors.BAD_DATA
     else:
         assert False, "Expected an error but got none."
 
@@ -188,7 +187,7 @@ with pyme.Context(armor=True) as c:
 
     try:
         c.verify(test_text1, test_sig1, verify=[alpha, bob])
-    except errors.MissingSignatures as e:
+    except gpg.errors.MissingSignatures as e:
         assert len(e.missing) == 1
         assert e.missing[0] == bob
     else:
diff --git a/lang/python/tests/t-wait.py b/lang/python/tests/t-wait.py
index b7d9a34..b1f2043 100755
--- a/lang/python/tests/t-wait.py
+++ b/lang/python/tests/t-wait.py
@@ -21,16 +21,16 @@ from __future__ import absolute_import, print_function, unicode_literals
 del absolute_import, print_function, unicode_literals
 
 import time
-from pyme import core, constants, errors
+import gpg
 import support
 
-support.init_gpgme(constants.PROTOCOL_OpenPGP)
-c = core.Context()
+support.init_gpgme(gpg.constants.protocol.OpenPGP)
+c = gpg.Context()
 c.set_armor(True)
 
 # Checking a message without a signature.
-sig = core.Data("foo\n")
-text = core.Data()
+sig = gpg.Data("foo\n")
+text = gpg.Data()
 c.op_verify_start(sig, None, text)
 
 try:
@@ -40,6 +40,6 @@ try:
             break
         time.sleep(0.1)
 except Exception as e:
-    assert e.getcode() == errors.NO_DATA
+    assert e.getcode() == gpg.errors.NO_DATA
 else:
     assert False, "Expected an error, got none"
diff --git a/lang/python/tests/t-wrapper.py b/lang/python/tests/t-wrapper.py
index d260264..79f047f 100755
--- a/lang/python/tests/t-wrapper.py
+++ b/lang/python/tests/t-wrapper.py
@@ -17,9 +17,9 @@
 # You should have received a copy of the GNU Lesser General Public
 # License along with this program; if not, see <http://www.gnu.org/licenses/>.
 
-from pyme import core
+import gpg
 
-d0 = core.Data()
+d0 = gpg.Data()
 d0.seek # trigger on-demand-wrapping
 assert d0.seek == d0.seek, "Generated wrapper functions are not cached"
-assert hasattr(core.Data, 'seek'), "Generated wrapper functions are not shared"
+assert hasattr(gpg.Data, 'seek'), "Generated wrapper functions are not shared"