diff --git a/Examples/first-client.m b/Examples/first-client.m
index babb0988d..1215c7a07 100644
--- a/Examples/first-client.m
+++ b/Examples/first-client.m
@@ -2,7 +2,7 @@
 #include <gnustep/base/Connection.h>
 #include <gnustep/base/Proxy.h>
 #include "first-server.h"
-#include <gnustep/base/String.h>
+#include <Foundation/NSString.h>
 
 int main(int argc, char *argv[])
 {
@@ -13,7 +13,7 @@ int main(int argc, char *argv[])
       printf("Looking for connection named `firstserver' on host `%s'...\n",
 	     argv[2]);
       s = [Connection rootProxyAtName:@"firstserver" 
-		      onHost:[String stringWithCString:argv[2]]];
+		      onHost:[NSString stringWithCString:argv[2]]];
     }
   else
     {
diff --git a/Examples/first-server.m b/Examples/first-server.m
index 0fe778cd6..432409704 100644
--- a/Examples/first-server.m
+++ b/Examples/first-server.m
@@ -1,7 +1,7 @@
 
 #include <gnustep/base/Connection.h>
 #include "first-server.h"
-#include <gnustep/base/String.h>
+#include <Foundation/NSString.h>
 #include <gnustep/base/RunLoop.h>
 #include <sys/file.h>
 
diff --git a/Examples/second-client.m b/Examples/second-client.m
index 806408c33..7d0527dcb 100644
--- a/Examples/second-client.m
+++ b/Examples/second-client.m
@@ -1,5 +1,5 @@
 #include "second-client.h"
-#include <gnustep/base/String.h>
+#include <Foundation/NSString.h>
 #include <gnustep/base/Notification.h>
 #include <gnustep/base/Invocation.h>
 #include <gnustep/base/RunLoop.h>
@@ -25,7 +25,8 @@ int main(int argc, char *argv[])
 
   printf("Looking up server object on localhost with name `secondserver'\n");
   if (argc > 1)
-    server = [Connection rootProxyAtName: [String stringWithCString: argv[1]]];
+    server = [Connection rootProxyAtName: 
+			   [NSString stringWithCString: argv[1]]];
   else
     server = [Connection rootProxyAtName: @"secondserver"];
   printf("Found server.\n");
diff --git a/Examples/second-server.m b/Examples/second-server.m
index 21870a12d..32ddd324f 100644
--- a/Examples/second-server.m
+++ b/Examples/second-server.m
@@ -2,7 +2,7 @@
 #include "second-client.h"
 #include <gnustep/base/Connection.h>
 #include <gnustep/base/TcpPort.h>
-#include <gnustep/base/String.h>
+#include <Foundation/NSString.h>
 #include <gnustep/base/Notification.h>
 #include <gnustep/base/Invocation.h>
 
@@ -128,7 +128,8 @@ int main(int argc, char *argv[])
 
   if (argc > 1)
     {
-      c = [Connection newRegisteringAtName: [String stringWithCString: argv[1]]
+      c = [Connection newRegisteringAtName: 
+			[NSString stringWithCString: argv[1]]
 		      withRootObject:s];
       printf("Regsitered server object on localhost with "
 	     "name `%s'\n", argv[1]);