diff --git a/README.md b/README.md
index 362977d..cf897db 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ Systems.  It is intended to provide a example on how to plug an HSM into
 Barbican.
 
 In particular, the SoftHSM2 plugin charm (as a subordinate) implements the
-barbican-hsm-plugin interface which transfers the credentials to the Barbican
+barbican-hsm interface which transfers the credentials to the Barbican
 charm to be able to access the the HSM.
 
 From [the GitHub page](https://github.com/opendnssec/SoftHSMv2):
@@ -46,11 +46,11 @@ http://bugs.launchpad.net/charms/+source/barbican/).
 Barbican communicates with HSM devices via a local (to Barbican) PKCS11
 library.  Thus an HSM plugin needs to be local to the unit that a Barbican is
 installed on, and so a plugin charm is subordinate to the Barbican charm.  A
-plugin provides the barbican-hsm-plugin interface that provides sufficient
+plugin provides the barbican-hsm interface that provides sufficient
 details to the Barbican charm to be able to configure barbican to access the
 HSM's PKCS11 libary.
 
-The barbican-hsm-plugin interface transfers `login`, `slot_id` and
+The barbican-hsm interface transfers `login`, `slot_id` and
 `library_path` parameters to the Barbican charm, which uses them to configure
 Barbican to access the PKCS11 compliant library of the HSM.
 
diff --git a/src/layer.yaml b/src/layer.yaml
index a4e495a..f43c119 100644
--- a/src/layer.yaml
+++ b/src/layer.yaml
@@ -1,4 +1,4 @@
-includes: ['layer:openstack', 'interface:barbican-hsm-plugin']
+includes: ['layer:openstack', 'interface:barbican-hsm']
 options:
   basic:
     use_venv: True
diff --git a/src/metadata.yaml b/src/metadata.yaml
index c89317f..79d6a5f 100644
--- a/src/metadata.yaml
+++ b/src/metadata.yaml
@@ -5,12 +5,12 @@ subordinate: true
 description: |
   Barbican provides a secure storage for keys and other secrets and
   additionally has features to provide certificates to OpenStack applications.
-  The barbican-softhsm-plugin is for testing purposes only, and demonstrates
-  the barbican-hsm-plugin interface for interfacing real HSM providers with
+  The barbican-softhsm is for testing purposes only, and demonstrates
+  the barbican-hsm interface for interfacing real HSM providers with
   Barbican.
 provides:
   hsm:
-    interface: barbican-hsm-plugin
+    interface: barbican-hsm
     scope: container
 requires:
   juju-info:
diff --git a/tox.ini b/tox.ini
index c8708cf..d853cfe 100644
--- a/tox.ini
+++ b/tox.ini
@@ -32,7 +32,7 @@ basepython = python3.5
 deps = -r{toxinidir}/test-requirements.txt
 commands = ostestr {posargs}
 
-[testenv:lint]
+[testenv:pep8]
 basepython = python2.7
 deps = -r{toxinidir}/test-requirements.txt
 commands = flake8 {posargs} src