diff --git a/project/base_settings/restclients_settings.py b/project/base_settings/restclients_settings.py
index ec1375b..c010c60 100644
--- a/project/base_settings/restclients_settings.py
+++ b/project/base_settings/restclients_settings.py
@@ -151,16 +151,16 @@
 
 if os.getenv('GRADEPAGE_ENV') in RESTCLIENTS_DEFAULT_ENVS:
     RESTCLIENTS_GRADEPAGE_DAO_CLASS = 'Live'
-    RESTCLIENTS_GRADEPAG_CONNECT_TIMEOUT = os.getenv(
-        "GRADEPAG_CONNECT_TIMEOUT", RESTCLIENTS_DEFAULT_CONNECT_TIMEOUT)
-    RESTCLIENTS_GRADEPAGE_DAO_CLASS_TIMEOUT = os.getenv(
-        "GRADEPAGE_DAO_CLASS_TIMEOUT", RESTCLIENTS_DEFAULT_TIMEOUT)
-    RESTCLIENTS_GRADEPAGE_DAO_CLASS_POOL_SIZE = os.getenv(
-        "GRADEPAGE_DAO_CLASS_POOL_SIZE", RESTCLIENTS_DEFAULT_POOL_SIZE)
+    RESTCLIENTS_GRADEPAGE_CONNECT_TIMEOUT = os.getenv(
+        "GRADEPAGE_CONNECT_TIMEOUT", RESTCLIENTS_DEFAULT_CONNECT_TIMEOUT)
+    RESTCLIENTS_GRADEPAGE_TIMEOUT = os.getenv(
+        "GRADEPAGE_TIMEOUT", RESTCLIENTS_DEFAULT_TIMEOUT)
+    RESTCLIENTS_GRADEPAGE_POOL_SIZE = os.getenv(
+        "GRADEPAGE_POOL_SIZE", RESTCLIENTS_DEFAULT_POOL_SIZE)
     if os.getenv('GRADEPAGE_ENV') == 'PROD':
         RESTCLIENTS_GRADEPAGE_HOST = 'https://gradepage.uw.edu'
     else:
-        RESTCLIENTS_GRADEPAGE_HOST = 'https://gradepage-test.s.uw.edu'
+        RESTCLIENTS_GRADEPAGE_HOST = 'https://test.gradepage.uw.edu'
 
 if os.getenv('BOOKSTORE_ENV') in RESTCLIENTS_DEFAULT_ENVS:
     RESTCLIENTS_BOOK_DAO_CLASS = 'Live'