diff --git a/helloWorld_Consumer.c b/helloWorld_Consumer.c
index 600a091..060fae9 100644
--- a/helloWorld_Consumer.c
+++ b/helloWorld_Consumer.c
@@ -19,7 +19,7 @@
 
 #include <parc/security/parc_Security.h>
 #include <parc/security/parc_IdentityFile.h>
-#include <parc/security/parc_PublicKeySignerPkcs12Store.h>
+#include <parc/security/parc_Pkcs12KeyStore.h>
 
 #include <parc/algol/parc_Memory.h>
 
@@ -32,9 +32,9 @@ createAndGetIdentity(void)
     unsigned int validityDays = 30;
     char *subjectName = "consumer";
 
-    bool success = parcPublicKeySignerPkcs12Store_CreateFile(keystoreName, keystorePassword, subjectName, keyLength, validityDays);
+    bool success = parcPkcs12KeyStore_CreateFile(keystoreName, keystorePassword, subjectName, keyLength, validityDays);
     assertTrue(success,
-               "parcPublicKeySignerPkcs12Store_CreateFile('%s', '%s', '%s', %d, %d) failed.",
+               "parcPkcs12KeyStore_CreateFile('%s', '%s', '%s', %d, %d) failed.",
                keystoreName, keystorePassword, subjectName, keyLength, validityDays);
 
     PARCIdentityFile *identityFile = parcIdentityFile_Create(keystoreName, keystorePassword);
@@ -65,7 +65,7 @@ consumer(void)
 
     assertNotNull(portal, "Expected a non-null CCNxPortal pointer.");
 
-    CCNxName *name = ccnxName_CreateFromURI("lci:/Hello/World");
+    CCNxName *name = ccnxName_CreateFromCString("lci:/Hello/World");
 
     CCNxInterest *interest = ccnxInterest_CreateSimple(name);
     ccnxName_Release(&name);
diff --git a/helloWorld_ConsumerForever.c b/helloWorld_ConsumerForever.c
index 3411f87..639b935 100644
--- a/helloWorld_ConsumerForever.c
+++ b/helloWorld_ConsumerForever.c
@@ -19,7 +19,7 @@
 
 #include <parc/security/parc_Security.h>
 #include <parc/security/parc_IdentityFile.h>
-#include <parc/security/parc_PublicKeySignerPkcs12Store.h>
+#include <parc/security/parc_Pkcs12KeyStore.h>
 
 #include <parc/algol/parc_Memory.h>
 
@@ -34,9 +34,9 @@ createAndGetIdentity(void)
     unsigned int validityDays = 30;
     char *subjectName = "consumer";
 
-    bool success = parcPublicKeySignerPkcs12Store_CreateFile(keystoreName, keystorePassword, subjectName, keyLength, validityDays);
+    bool success = parcPkcs12KeyStore_CreateFile(keystoreName, keystorePassword, subjectName, keyLength, validityDays);
     assertTrue(success,
-               "parcPublicKeySignerPkcs12Store_CreateFile('%s', '%s', '%s', %d, %d) failed.",
+               "parcPkcs12KeyStore_CreateFile('%s', '%s', '%s', %d, %d) failed.",
                keystoreName, keystorePassword, subjectName, keyLength, validityDays);
 
     PARCIdentityFile *identityFile = parcIdentityFile_Create(keystoreName, keystorePassword);
@@ -68,7 +68,7 @@ consumer(void)
 
     assertNotNull(portal, "Expected a non-null CCNxPortal pointer.");
     
-    CCNxName *name = ccnxName_CreateFromURI("lci:/Hello/World");
+    CCNxName *name = ccnxName_CreateFromCString("lci:/Hello/World");
     CCNxInterest *interest = ccnxInterest_CreateSimple(name);
     ccnxName_Release(&name);
     
diff --git a/helloWorld_Producer.c b/helloWorld_Producer.c
index 66ff8ac..bf634fc 100644
--- a/helloWorld_Producer.c
+++ b/helloWorld_Producer.c
@@ -19,7 +19,7 @@
 #include <ccnx/api/ccnx_Portal/ccnx_PortalRTA.h>
 
 #include <parc/security/parc_Security.h>
-#include <parc/security/parc_PublicKeySignerPkcs12Store.h>
+#include <parc/security/parc_Pkcs12KeyStore.h>
 #include <parc/security/parc_IdentityFile.h>
 
 #include <ccnx/common/ccnx_Name.h>
@@ -33,9 +33,9 @@ createAndGetIdentity(void)
     unsigned int validityDays = 30;
     char *subjectName = "producer";
 
-    bool success = parcPublicKeySignerPkcs12Store_CreateFile(keystoreName, keystorePassword, subjectName, keyLength, validityDays);
+    bool success = parcPkcs12KeyStore_CreateFile(keystoreName, keystorePassword, subjectName, keyLength, validityDays);
     assertTrue(success,
-               "parcPublicKeySignerPkcs12Store_CreateFile('%s', '%s', '%s', %d, %d) failed.",
+               "parcPkcs12KeyStore_CreateFile('%s', '%s', '%s', %d, %d) failed.",
                keystoreName, keystorePassword, subjectName, keyLength, validityDays);
 
     PARCIdentityFile *identityFile = parcIdentityFile_Create(keystoreName, keystorePassword);
@@ -79,9 +79,9 @@ producer(void)
     
     assertNotNull(portal, "Expected a non-null CCNxPortal pointer.");
 
-    CCNxName *listenName = ccnxName_CreateFromURI("lci:/Hello");
-    CCNxName *goodbye = ccnxName_CreateFromURI("lci:/Hello/Goodbye%21");
-    CCNxName *contentName = ccnxName_CreateFromURI("lci:/Hello/World");
+    CCNxName *listenName = ccnxName_CreateFromCString("lci:/Hello");
+    CCNxName *goodbye = ccnxName_CreateFromCString("lci:/Hello/Goodbye%21");
+    CCNxName *contentName = ccnxName_CreateFromCString("lci:/Hello/World");
 
     if (ccnxPortal_Listen(portal, listenName, 60 * 60 * 24 * 365, CCNxStackTimeout_Never)) {
         while (true) {
@@ -100,7 +100,7 @@ producer(void)
 
                     PARCBuffer *payload = makePayload();
 
-                    CCNxContentObject *contentObject = ccnxContentObject_CreateWithDataPayload(contentName, payload);
+                    CCNxContentObject *contentObject = ccnxContentObject_CreateWithNameAndPayload(contentName, payload);
 
                     CCNxMetaMessage *message = ccnxMetaMessage_CreateFromContentObject(contentObject);