diff --git a/README.rst b/README.rst
index dd6057c..52d2850 100644
--- a/README.rst
+++ b/README.rst
@@ -40,7 +40,7 @@ Create an Adafruit IO Client object
 
 .. code-block:: python
 
-   io = RESTClient(ADAFRUIT_IO_USER, ADAFRUIT_IO_KEY, wifi)
+   io = RESTClient(aio_username, aio_key, wifi)
 
 Sending data to an Adafruit IO feed
 
diff --git a/examples/adafruit_io_simpletest_analog_in.py b/examples/adafruit_io_simpletest_analog_in.py
index b44bd02..569c9b4 100644
--- a/examples/adafruit_io_simpletest_analog_in.py
+++ b/examples/adafruit_io_simpletest_analog_in.py
@@ -51,11 +51,11 @@
 # Set your Adafruit IO Username and Key in secrets.py
 # (visit io.adafruit.com if you need to create an account,
 # or if you need your Adafruit IO key.)
-ADAFRUIT_IO_USER = secrets['adafruit_io_user']
-ADAFRUIT_IO_KEY = secrets['adafruit_io_key']
+aio_username = secrets['aio_username']
+aio_key = secrets['aio_key']
 
 # Create an instance of the Adafruit IO REST client
-io = RESTClient(ADAFRUIT_IO_USER, ADAFRUIT_IO_KEY, wifi)
+io = RESTClient(aio_username, aio_key, wifi)
 
 try:
     # Get the 'light' feed from Adafruit IO
diff --git a/examples/adafruit_io_simpletest_data.py b/examples/adafruit_io_simpletest_data.py
index 78908f5..a24f28f 100644
--- a/examples/adafruit_io_simpletest_data.py
+++ b/examples/adafruit_io_simpletest_data.py
@@ -48,11 +48,11 @@
 # Set your Adafruit IO Username and Key in secrets.py
 # (visit io.adafruit.com if you need to create an account,
 # or if you need your Adafruit IO key.)
-ADAFRUIT_IO_USER = secrets['adafruit_io_user']
-ADAFRUIT_IO_KEY = secrets['adafruit_io_key']
+aio_username = secrets['aio_username']
+aio_key = secrets['aio_key']
 
 # Create an instance of the Adafruit IO REST client
-io = RESTClient(ADAFRUIT_IO_USER, ADAFRUIT_IO_KEY, wifi)
+io = RESTClient(aio_username, aio_key, wifi)
 
 try:
     # Get the 'temperature' feed from Adafruit IO
diff --git a/examples/adafruit_io_simpletest_digital_out.py b/examples/adafruit_io_simpletest_digital_out.py
index 57e3e61..fe46bc7 100644
--- a/examples/adafruit_io_simpletest_digital_out.py
+++ b/examples/adafruit_io_simpletest_digital_out.py
@@ -49,11 +49,11 @@
 # Set your Adafruit IO Username and Key in secrets.py
 # (visit io.adafruit.com if you need to create an account,
 # or if you need your Adafruit IO key.)
-ADAFRUIT_IO_USER = secrets['adafruit_io_user']
-ADAFRUIT_IO_KEY = secrets['adafruit_io_key']
+aio_username = secrets['aio_username']
+aio_key = secrets['aio_key']
 
 # Create an instance of the Adafruit IO REST client
-io = RESTClient(ADAFRUIT_IO_USER, ADAFRUIT_IO_KEY, wifi)
+io = RESTClient(aio_username, aio_key, wifi)
 
 try:
     # Get the 'digital' feed from Adafruit IO
diff --git a/examples/adafruit_io_simpletest_esp_at.py b/examples/adafruit_io_simpletest_esp_at.py
index 2025037..f75eb29 100644
--- a/examples/adafruit_io_simpletest_esp_at.py
+++ b/examples/adafruit_io_simpletest_esp_at.py
@@ -59,11 +59,11 @@
 # Set your Adafruit IO Username and Key in secrets.py
 # (visit io.adafruit.com if you need to create an account,
 # or if you need your Adafruit IO key.)
-ADAFRUIT_IO_USER = secrets['adafruit_io_user']
-ADAFRUIT_IO_KEY = secrets['adafruit_io_key']
+aio_username = secrets['aio_username']
+aio_key = secrets['aio_key']
 
 # Create an instance of the Adafruit IO REST client
-io = RESTClient(ADAFRUIT_IO_USER, ADAFRUIT_IO_KEY, wifi)
+io = RESTClient(aio_username, aio_key, wifi)
 
 try:
     # Get the 'temperature' feed from Adafruit IO
diff --git a/examples/adafruit_io_simpletest_feeds.py b/examples/adafruit_io_simpletest_feeds.py
index ae2e502..cf45f57 100644
--- a/examples/adafruit_io_simpletest_feeds.py
+++ b/examples/adafruit_io_simpletest_feeds.py
@@ -47,11 +47,11 @@
 # Set your Adafruit IO Username and Key in secrets.py
 # (visit io.adafruit.com if you need to create an account,
 # or if you need your Adafruit IO key.)
-ADAFRUIT_IO_USER = secrets['adafruit_io_user']
-ADAFRUIT_IO_KEY = secrets['adafruit_io_key']
+aio_username = secrets['aio_username']
+aio_key = secrets['aio_key']
 
 # Create an instance of the Adafruit IO REST client
-io = RESTClient(ADAFRUIT_IO_USER, ADAFRUIT_IO_KEY, wifi)
+io = RESTClient(aio_username, aio_key, wifi)
 
 # Create a new 'circuitpython' feed with a description
 print('Creating new Adafruit IO feed...')
diff --git a/examples/adafruit_io_simpletest_groups.py b/examples/adafruit_io_simpletest_groups.py
index dcdb8f1..a542d4b 100644
--- a/examples/adafruit_io_simpletest_groups.py
+++ b/examples/adafruit_io_simpletest_groups.py
@@ -47,11 +47,11 @@
 # Set your Adafruit IO Username and Key in secrets.py
 # (visit io.adafruit.com if you need to create an account,
 # or if you need your Adafruit IO key.)
-ADAFRUIT_IO_USER = secrets['adafruit_io_user']
-ADAFRUIT_IO_KEY = secrets['adafruit_io_key']
+aio_username = secrets['aio_username']
+aio_key = secrets['aio_key']
 
 # Create an instance of the Adafruit IO REST client
-io = RESTClient(ADAFRUIT_IO_USER, ADAFRUIT_IO_KEY, wifi)
+io = RESTClient(aio_username, aio_key, wifi)
 
 # Create a new group
 print('Creating a new Adafruit IO Group...')
diff --git a/examples/adafruit_io_simpletest_metadata.py b/examples/adafruit_io_simpletest_metadata.py
index 6145f4c..2b3ba6d 100644
--- a/examples/adafruit_io_simpletest_metadata.py
+++ b/examples/adafruit_io_simpletest_metadata.py
@@ -48,11 +48,11 @@
 # Set your Adafruit IO Username and Key in secrets.py
 # (visit io.adafruit.com if you need to create an account,
 # or if you need your Adafruit IO key.)
-ADAFRUIT_IO_USER = secrets['adafruit_io_user']
-ADAFRUIT_IO_KEY = secrets['adafruit_io_key']
+aio_username = secrets['aio_username']
+aio_key = secrets['aio_key']
 
 # Create an instance of the Adafruit IO REST client
-io = RESTClient(ADAFRUIT_IO_USER, ADAFRUIT_IO_KEY, wifi)
+io = RESTClient(aio_username, aio_key, wifi)
 
 try:
     # Get the 'location' feed from Adafruit IO
diff --git a/examples/adafruit_io_simpletest_randomizer.py b/examples/adafruit_io_simpletest_randomizer.py
index 7010fa7..2324f2c 100644
--- a/examples/adafruit_io_simpletest_randomizer.py
+++ b/examples/adafruit_io_simpletest_randomizer.py
@@ -49,11 +49,11 @@
 # Set your Adafruit IO Username and Key in secrets.py
 # (visit io.adafruit.com if you need to create an account,
 # or if you need your Adafruit IO key.)
-ADAFRUIT_IO_USER = secrets['adafruit_io_user']
-ADAFRUIT_IO_KEY = secrets['adafruit_io_key']
+aio_username = secrets['aio_username']
+aio_key = secrets['aio_key']
 
 # Create an instance of the Adafruit IO REST client
-io = RESTClient(ADAFRUIT_IO_USER, ADAFRUIT_IO_KEY, wifi)
+io = RESTClient(aio_username, aio_key, wifi)
 
 # Random Data ID
 # (to obtain this value, visit
diff --git a/examples/adafruit_io_simpletest_temperature.py b/examples/adafruit_io_simpletest_temperature.py
index 63f8c5f..a0cae64 100644
--- a/examples/adafruit_io_simpletest_temperature.py
+++ b/examples/adafruit_io_simpletest_temperature.py
@@ -56,11 +56,11 @@
 # Set your Adafruit IO Username and Key in secrets.py
 # (visit io.adafruit.com if you need to create an account,
 # or if you need your Adafruit IO key.)
-ADAFRUIT_IO_USER = secrets['adafruit_io_user']
-ADAFRUIT_IO_KEY = secrets['adafruit_io_key']
+aio_username = secrets['aio_username']
+aio_key = secrets['aio_key']
 
 # Create an instance of the Adafruit IO REST client
-io = RESTClient(ADAFRUIT_IO_USER, ADAFRUIT_IO_KEY, wifi)
+io = RESTClient(aio_username, aio_key, wifi)
 
 try:
     # Get the 'temperature' feed from Adafruit IO
diff --git a/examples/adafruit_io_simpletest_weather.py b/examples/adafruit_io_simpletest_weather.py
index 3b9ac82..32cce3f 100644
--- a/examples/adafruit_io_simpletest_weather.py
+++ b/examples/adafruit_io_simpletest_weather.py
@@ -50,11 +50,11 @@
 # Set your Adafruit IO Username and Key in secrets.py
 # (visit io.adafruit.com if you need to create an account,
 # or if you need your Adafruit IO key.)
-ADAFRUIT_IO_USER = secrets['adafruit_io_user']
-ADAFRUIT_IO_KEY = secrets['adafruit_io_key']
+aio_username = secrets['aio_username']
+aio_key = secrets['aio_key']
 
 # Create an instance of the Adafruit IO REST client
-io = RESTClient(ADAFRUIT_IO_USER, ADAFRUIT_IO_KEY, wifi)
+io = RESTClient(aio_username, aio_key, wifi)
 
 # Weather Location ID
 # (to obtain this value, visit