diff --git a/WiFi/examples/WifiCosmClient/WifiCosmClient.ino b/WiFi/examples/WifiPachubeClient/WifiPachubeClient.ino
similarity index 91%
rename from WiFi/examples/WifiCosmClient/WifiCosmClient.ino
rename to WiFi/examples/WifiPachubeClient/WifiPachubeClient.ino
index bd43d59fa..bf590c998 100644
--- a/WiFi/examples/WifiCosmClient/WifiCosmClient.ino
+++ b/WiFi/examples/WifiPachubeClient/WifiPachubeClient.ino
@@ -1,13 +1,13 @@
 /*
-  Wifi Cosm sensor client
+  Wifi Pachube sensor client
  
- This sketch connects an analog sensor to Cosm (http://www.cosm.com)
+ This sketch connects an analog sensor to Pachube (http://www.pachube.com)
  using an Arduino Wifi shield.
  
  This example is written for a network using WPA encryption. For 
  WEP or WPA, change the Wifi.begin() call accordingly.
  
- This example has been updated to use version 2.0 of the Cosm.com API. 
+ This example has been updated to use version 2.0 of the Pachube API. 
  To make it work, create a feed with a datastream, and give it the ID
  sensor1. Or change the code below to match your feed.
  
@@ -18,6 +18,8 @@
  created 13 Mar 2012
  modified 14 May 2012
  by Tom Igoe
+ modified 8 Sept 2012
+ by Scott Fitzgerald
  
  This code is in the public domain.
  
@@ -25,7 +27,7 @@
 #include <SPI.h>
 #include <WiFi.h>
 
-#define APIKEY         "YOUR API KEY GOES HERE" // replace your cosm api key here
+#define APIKEY         "YOUR API KEY GOES HERE" // replace your pachube api key here
 #define FEEDID         00000                    // replace your feed ID
 #define USERAGENT      "My Arduino Project"     // user agent is the project name
 
@@ -38,12 +40,12 @@ int status = WL_IDLE_STATUS;
 WiFiClient client;
 // if you don't want to use DNS (and reduce your sketch size)
 // use the numeric IP instead of the name for the server:
-IPAddress server(216,52,233,121);      // numeric IP for api.cosm.com
-//char server[] = "api.cosm.com";   // name address for cosm API
+IPAddress server(216,52,233,121);      // numeric IP for api.pachube.com
+//char server[] = "api.pachube.com";   // name address for pachube API
 
 unsigned long lastConnectionTime = 0;          // last time you connected to the server, in milliseconds
 boolean lastConnected = false;                 // state of the connection last time through the main loop
-const unsigned long postingInterval = 10*1000; //delay between updates to Cosm.com
+const unsigned long postingInterval = 10*1000; //delay between updates to pachube.com
 
 void setup() {
   // start serial port:
@@ -101,7 +103,7 @@ void sendData(int thisData) {
     client.print("PUT /v2/feeds/");
     client.print(FEEDID);
     client.println(".csv HTTP/1.1");
-    client.println("Host: api.cosm.com");
+    client.println("Host: api.pachube.com");
     client.print("X-ApiKey: ");
     client.println(APIKEY);
     client.print("User-Agent: ");
diff --git a/WiFi/examples/WifiCosmClientString/WifiCosmClientString.ino b/WiFi/examples/WifiPachubeClientString/WifiPachubeClientString.ino
similarity index 91%
rename from WiFi/examples/WifiCosmClientString/WifiCosmClientString.ino
rename to WiFi/examples/WifiPachubeClientString/WifiPachubeClientString.ino
index ec3da3174..0a939d417 100644
--- a/WiFi/examples/WifiCosmClientString/WifiCosmClientString.ino
+++ b/WiFi/examples/WifiPachubeClientString/WifiPachubeClientString.ino
@@ -1,13 +1,13 @@
 /*
-  Wifi Cosm sensor client with Strings
+  Wifi Pachube sensor client with Strings
  
- This sketch connects an analog sensor to Cosm (http://www.cosm.com)
+ This sketch connects an analog sensor to Pachube (http://www.pachube.com)
  using a Arduino Wifi shield.
  
  This example is written for a network using WPA encryption. For 
  WEP or WPA, change the Wifi.begin() call accordingly.
  
- This example has been updated to use version 2.0 of the cosm.com API. 
+ This example has been updated to use version 2.0 of the pachube.com API. 
  To make it work, create a feed with a datastream, and give it the ID
  sensor1. Or change the code below to match your feed.
  
@@ -21,6 +21,8 @@
  created 16 Mar 2012
  modified 14 May 2012
  by Tom Igoe
+ modified 8 Sept 2012
+ by Scott Fitzgerald
  
  This code is in the public domain.
  
@@ -43,12 +45,12 @@ WiFiClient client;
 
 // if you don't want to use DNS (and reduce your sketch size)
 // use the numeric IP instead of the name for the server:
-//IPAddress server(216,52,233,121);      // numeric IP for api.cosm.com
-char server[] = "api.cosm.com";   // name address for pachube API
+//IPAddress server(216,52,233,121);      // numeric IP for api.pachube.com
+char server[] = "api.pachube.com";   // name address for pachube API
 
 unsigned long lastConnectionTime = 0;          // last time you connected to the server, in milliseconds
 boolean lastConnected = false;                 // state of the connection last time through the main loop
-const unsigned long postingInterval = 10*1000;  //delay between updates to cosm.com
+const unsigned long postingInterval = 10*1000;  //delay between updates to pachube.com
 
 void setup() {
   // start serial port:
@@ -115,7 +117,7 @@ void sendData(String thisData) {
     client.print("PUT /v2/feeds/");
     client.print(FEEDID);
     client.println(".csv HTTP/1.1");
-    client.println("Host: api.cosm.com");
+    client.println("Host: api.pachube.com");
     client.print("X-ApiKey: ");
     client.println(APIKEY);
     client.print("User-Agent: ");