diff --git a/reposync.nomad.tpl b/reposync.nomad.tpl
index 4854e257adf8458d64d31862a56eeadc3834760a..dcb734a52e5b846f54aa93e1fa53b5976f02c5d5 100644
--- a/reposync.nomad.tpl
+++ b/reposync.nomad.tpl
@@ -61,8 +61,8 @@ job "${PREFIX}_reposync_${REPOID}" {
       RHNCHECK_RHN_PASSWORD = "$RHNCHECK_RHN_PASSWORD"
       RHNCHECK_SYSTEMS = "$RHNCHECK_SYSTEMS"
       RHSM_OFFLINE_TOKEN = "$RHSM_OFFLINE_TOKEN"
-      RHSM_ACTIVATION_KEY = "$RHSM_ACTIVATION_KEY"
-      RHSM_ORG = "$RHSM_ORG"
+      RHN_ACTIVATION_KEY = "$RHN_ACTIVATION_KEY"
+      RHN_ORG = "$RHN_ORG"
       TAG = "${PREFIX}_reposync"
     }
 
diff --git a/reposync/rhncheck.py b/reposync/rhncheck.py
index 89ad4615f55776b53a92dfa7906b944e31abe3be..d757d81a8f223b908e17354020603bd3129d8be8 100755
--- a/reposync/rhncheck.py
+++ b/reposync/rhncheck.py
@@ -152,8 +152,8 @@ login = os.getenv('RHNCHECK_RHN_USER')
 password = os.getenv('RHNCHECK_RHN_PASSWORD')
 rhn_systems = os.getenv('RHNCHECK_SYSTEMS')
 offline_token = os.getenv('RHSM_OFFLINE_TOKEN')
-activation_key = os.getenv('RHSM_ACTIVATION_KEY')
-org = os.getenv('RHSM_ORG')
+activation_key = os.getenv('RHN_ACTIVATION_KEY')
+org = os.getenv('RHN_ORG')
 if (
     admin_email is None
     or login is None