diff --git a/cordapp-cpk2/src/main/java/net/corda/plugins/cpb2/CpbTask.java b/cordapp-cpk2/src/main/java/net/corda/plugins/cpb2/CpbTask.java
index 51dd7103e..11505c2fa 100644
--- a/cordapp-cpk2/src/main/java/net/corda/plugins/cpb2/CpbTask.java
+++ b/cordapp-cpk2/src/main/java/net/corda/plugins/cpb2/CpbTask.java
@@ -82,7 +82,7 @@ private boolean isValidCPK(@NotNull FileTreeElement element) {
             if (cpkCordappName != null) {
                 if (cpkNames.containsKey(cpkCordappName)) {
                     if (!cpkNames.get(cpkCordappName).equals(manifest)) {
-                        throw new InvalidUserDataException("Two CPKs may not share a cordappName. Error in " + cpkCordappName);
+                        throw new InvalidUserDataException("Two CPKs may not share a cordappCpkName. Error in " + cpkCordappName);
                     }
                 } else {
                     cpkNames.put(cpkCordappName, manifest);
diff --git a/cordapp-cpk2/src/test/kotlin/net/corda/plugins/cpb2/CpbSharedName.kt b/cordapp-cpk2/src/test/kotlin/net/corda/plugins/cpb2/CpbSharedName.kt
index 0c659b979..e884d5b58 100644
--- a/cordapp-cpk2/src/test/kotlin/net/corda/plugins/cpb2/CpbSharedName.kt
+++ b/cordapp-cpk2/src/test/kotlin/net/corda/plugins/cpb2/CpbSharedName.kt
@@ -43,7 +43,7 @@ class CpbSharedName {
                 )
         }
 
-        val expectedMessage = "Two CPKs may not share a cordappName."
+        val expectedMessage = "Two CPKs may not share a cordappCpkName."
         assert(e.message!!.contains(expectedMessage)) {
             "Error message does not match expected value. Error message should contain \"$expectedMessage\""
         }