taverna-credential-manager-api
diff --git a/README.md b/README.md
index 437e468..a798fe2 100644
--- a/README.md
+++ b/README.md
@@ -132,7 +132,7 @@
 * [taverna-activity-test-utils](taverna-activity-test-utils/) Apache Taverna Activity test utils
 * [taverna-capability-api](taverna-capability-api/) Apache Taverna Platform Capability API
 * [taverna-capability-impl](taverna-capability-impl/) Apache Taverna Platform Capability impl
-* [taverna-credential-manager](taverna-credential-manager/) Apache Taverna Credential manager
+* [taverna-credential-manager-api](taverna-credential-manager-api/) Apache Taverna Credential Manager API
 * [taverna-credential-manager-impl](taverna-credential-manager-impl/) Apache Taverna Credential Manager impl
 * [taverna-database-configuration-api](taverna-database-configuration-api/) Apache Taverna Database Configuration API
 * [taverna-database-configuration-impl](taverna-database-configuration-impl/) Apache Taverna Database Configuration impl
diff --git a/pom.xml b/pom.xml
index 10765c7..c905d45 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,7 +50,7 @@
 		<module>taverna-activity-test-utils</module>
 		<module>taverna-capability-api</module>
 		<module>taverna-capability-impl</module>
-		<module>taverna-credential-manager</module>
+		<module>taverna-credential-manager-api</module>
 		<module>taverna-credential-manager-impl</module>
 		<module>taverna-database-configuration-api</module>
 		<module>taverna-database-configuration-impl</module>
diff --git a/taverna-credential-manager/pom.xml b/taverna-credential-manager-api/pom.xml
similarity index 95%
rename from taverna-credential-manager/pom.xml
rename to taverna-credential-manager-api/pom.xml
index 2a9ba6e..5127f80 100644
--- a/taverna-credential-manager/pom.xml
+++ b/taverna-credential-manager-api/pom.xml
@@ -24,9 +24,9 @@
     <artifactId>apache-taverna-engine</artifactId>
     <version>3.1.0-incubating-SNAPSHOT</version>
 	</parent>
-	<artifactId>taverna-credential-manager</artifactId>
+	<artifactId>taverna-credential-manager-api</artifactId>
 	<packaging>bundle</packaging>
-	<name>Apache Taverna Credential manager</name>
+	<name>Apache Taverna Credential Manager API</name>
 	<dependencies>
 		<dependency>
       <groupId>${project.parent.groupId}</groupId>
diff --git a/taverna-credential-manager/src/main/java/org/apache/taverna/security/credentialmanager/CMException.java b/taverna-credential-manager-api/src/main/java/org/apache/taverna/security/credentialmanager/CMException.java
similarity index 100%
rename from taverna-credential-manager/src/main/java/org/apache/taverna/security/credentialmanager/CMException.java
rename to taverna-credential-manager-api/src/main/java/org/apache/taverna/security/credentialmanager/CMException.java
diff --git a/taverna-credential-manager/src/main/java/org/apache/taverna/security/credentialmanager/CMNotInitialisedException.java b/taverna-credential-manager-api/src/main/java/org/apache/taverna/security/credentialmanager/CMNotInitialisedException.java
similarity index 100%
rename from taverna-credential-manager/src/main/java/org/apache/taverna/security/credentialmanager/CMNotInitialisedException.java
rename to taverna-credential-manager-api/src/main/java/org/apache/taverna/security/credentialmanager/CMNotInitialisedException.java
diff --git a/taverna-credential-manager/src/main/java/org/apache/taverna/security/credentialmanager/CredentialManager.java b/taverna-credential-manager-api/src/main/java/org/apache/taverna/security/credentialmanager/CredentialManager.java
similarity index 100%
rename from taverna-credential-manager/src/main/java/org/apache/taverna/security/credentialmanager/CredentialManager.java
rename to taverna-credential-manager-api/src/main/java/org/apache/taverna/security/credentialmanager/CredentialManager.java
diff --git a/taverna-credential-manager/src/main/java/org/apache/taverna/security/credentialmanager/DistinguishedNameParser.java b/taverna-credential-manager-api/src/main/java/org/apache/taverna/security/credentialmanager/DistinguishedNameParser.java
similarity index 100%
rename from taverna-credential-manager/src/main/java/org/apache/taverna/security/credentialmanager/DistinguishedNameParser.java
rename to taverna-credential-manager-api/src/main/java/org/apache/taverna/security/credentialmanager/DistinguishedNameParser.java
diff --git a/taverna-credential-manager/src/main/java/org/apache/taverna/security/credentialmanager/JavaTruststorePasswordProvider.java b/taverna-credential-manager-api/src/main/java/org/apache/taverna/security/credentialmanager/JavaTruststorePasswordProvider.java
similarity index 100%
rename from taverna-credential-manager/src/main/java/org/apache/taverna/security/credentialmanager/JavaTruststorePasswordProvider.java
rename to taverna-credential-manager-api/src/main/java/org/apache/taverna/security/credentialmanager/JavaTruststorePasswordProvider.java
diff --git a/taverna-credential-manager/src/main/java/org/apache/taverna/security/credentialmanager/KeystoreChangedEvent.java b/taverna-credential-manager-api/src/main/java/org/apache/taverna/security/credentialmanager/KeystoreChangedEvent.java
similarity index 100%
rename from taverna-credential-manager/src/main/java/org/apache/taverna/security/credentialmanager/KeystoreChangedEvent.java
rename to taverna-credential-manager-api/src/main/java/org/apache/taverna/security/credentialmanager/KeystoreChangedEvent.java
diff --git a/taverna-credential-manager/src/main/java/org/apache/taverna/security/credentialmanager/MasterPasswordProvider.java b/taverna-credential-manager-api/src/main/java/org/apache/taverna/security/credentialmanager/MasterPasswordProvider.java
similarity index 100%
rename from taverna-credential-manager/src/main/java/org/apache/taverna/security/credentialmanager/MasterPasswordProvider.java
rename to taverna-credential-manager-api/src/main/java/org/apache/taverna/security/credentialmanager/MasterPasswordProvider.java
diff --git a/taverna-credential-manager/src/main/java/org/apache/taverna/security/credentialmanager/ParsedDistinguishedName.java b/taverna-credential-manager-api/src/main/java/org/apache/taverna/security/credentialmanager/ParsedDistinguishedName.java
similarity index 100%
rename from taverna-credential-manager/src/main/java/org/apache/taverna/security/credentialmanager/ParsedDistinguishedName.java
rename to taverna-credential-manager-api/src/main/java/org/apache/taverna/security/credentialmanager/ParsedDistinguishedName.java
diff --git a/taverna-credential-manager/src/main/java/org/apache/taverna/security/credentialmanager/ServiceUsernameAndPasswordProvider.java b/taverna-credential-manager-api/src/main/java/org/apache/taverna/security/credentialmanager/ServiceUsernameAndPasswordProvider.java
similarity index 100%
rename from taverna-credential-manager/src/main/java/org/apache/taverna/security/credentialmanager/ServiceUsernameAndPasswordProvider.java
rename to taverna-credential-manager-api/src/main/java/org/apache/taverna/security/credentialmanager/ServiceUsernameAndPasswordProvider.java
diff --git a/taverna-credential-manager/src/main/java/org/apache/taverna/security/credentialmanager/TrustConfirmationProvider.java b/taverna-credential-manager-api/src/main/java/org/apache/taverna/security/credentialmanager/TrustConfirmationProvider.java
similarity index 100%
rename from taverna-credential-manager/src/main/java/org/apache/taverna/security/credentialmanager/TrustConfirmationProvider.java
rename to taverna-credential-manager-api/src/main/java/org/apache/taverna/security/credentialmanager/TrustConfirmationProvider.java
diff --git a/taverna-credential-manager/src/main/java/org/apache/taverna/security/credentialmanager/UsernamePassword.java b/taverna-credential-manager-api/src/main/java/org/apache/taverna/security/credentialmanager/UsernamePassword.java
similarity index 100%
rename from taverna-credential-manager/src/main/java/org/apache/taverna/security/credentialmanager/UsernamePassword.java
rename to taverna-credential-manager-api/src/main/java/org/apache/taverna/security/credentialmanager/UsernamePassword.java
diff --git a/taverna-credential-manager/src/main/resources/META-INF/services/org.apache.taverna.security.credentialmanager.CredentialProviderSPI b/taverna-credential-manager-api/src/main/resources/META-INF/services/org.apache.taverna.security.credentialmanager.CredentialProviderSPI
similarity index 100%
rename from taverna-credential-manager/src/main/resources/META-INF/services/org.apache.taverna.security.credentialmanager.CredentialProviderSPI
rename to taverna-credential-manager-api/src/main/resources/META-INF/services/org.apache.taverna.security.credentialmanager.CredentialProviderSPI
diff --git a/taverna-credential-manager/src/test/resources/html/test.html b/taverna-credential-manager-api/src/test/resources/html/test.html
similarity index 100%
rename from taverna-credential-manager/src/test/resources/html/test.html
rename to taverna-credential-manager-api/src/test/resources/html/test.html
diff --git a/taverna-credential-manager/src/test/resources/realm.properties b/taverna-credential-manager-api/src/test/resources/realm.properties
similarity index 100%
rename from taverna-credential-manager/src/test/resources/realm.properties
rename to taverna-credential-manager-api/src/test/resources/realm.properties
diff --git a/taverna-credential-manager-impl/pom.xml b/taverna-credential-manager-impl/pom.xml
index 2b29560..3f200e7 100644
--- a/taverna-credential-manager-impl/pom.xml
+++ b/taverna-credential-manager-impl/pom.xml
@@ -64,7 +64,7 @@
 	<dependencies>
 		<dependency>
       <groupId>${project.parent.groupId}</groupId>
-			<artifactId>taverna-credential-manager</artifactId>
+			<artifactId>taverna-credential-manager-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>