diff --git a/code/index.js b/code/index.js
index 400b6e0..dad9486 100755
--- a/code/index.js
+++ b/code/index.js
@@ -33,15 +33,15 @@ catch (error) {
         session_duration: 60
     }
 }
-if (process.env['NETRADIUS_PORT_RADIUS_AUTH']) config.ports.radius_authentication = process.env['NETRADIUS_PORT_RADIUS_AUTH'];
-if (process.env['NETRADIUS_PORT_RADIUS_ACCT']) config.ports.radius_accounting = process.env['NETRADIUS_PORT_RADIUS_ACCT'];
-if (process.env['NETRADIUS_PORT_API']) config.ports.api = process.env['NETRADIUS_PORT_API'];
-if (process.env['NETRADIUS_STORAGE']) config.storage = process.env['NETRADIUS_STORAGE'];
-if (process.env['NETRADIUS_DEFAULT_VLAN']) config.default_vlan_enabled = process.env['NETRADIUS_DEFAULT_VLAN'];
-if (process.env['NETRADIUS_DEFAULT_VLAN_ID']) config.default_vlan_id = process.env['NETRADIUS_DEFAULT_VLAN_ID'];
-if (process.env['NETRADIUS_CLIENT_SECRET']) config.client_secret = process.env['NETRADIUS_CLIENT_SECRET'];
-if (process.env['NETRADIUS_MAC_AUTH_ONLY']) config.mac_auth_only = process.env['NETRADIUS_MAC_AUTH_ONLY'];
-if (process.env['NETRADIUS_SESSION_DURATION']) config.session_duration = process.env['NETRADIUS_SESSION_DURATION'];
+if (process.env['SINATRA_PORT_RADIUS_AUTH']) config.ports.radius_authentication = process.env['SINATRA_PORT_RADIUS_AUTH'];
+if (process.env['SINATRA_PORT_RADIUS_ACCT']) config.ports.radius_accounting = process.env['SINATRA_PORT_RADIUS_ACCT'];
+if (process.env['SINATRA_PORT_API']) config.ports.api = process.env['SINATRA_PORT_API'];
+if (process.env['SINATRA_STORAGE']) config.storage = process.env['SINATRA_STORAGE'];
+if (process.env['SINATRA_DEFAULT_VLAN']) config.default_vlan_enabled = process.env['SINATRA_DEFAULT_VLAN'];
+if (process.env['SINATRA_DEFAULT_VLAN_ID']) config.default_vlan_id = process.env['SINATRA_DEFAULT_VLAN_ID'];
+if (process.env['SINATRA_CLIENT_SECRET']) config.client_secret = process.env['SINATRA_CLIENT_SECRET'];
+if (process.env['SINATRA_MAC_AUTH_ONLY']) config.mac_auth_only = process.env['SINATRA_MAC_AUTH_ONLY'];
+if (process.env['SINATRA_SESSION_DURATION']) config.session_duration = process.env['SINATRA_SESSION_DURATION'];
 
 // Set defaults
 if (!config.ports.radius_authentication) config.ports.radius_authentication = 1812;
diff --git a/code/lib/handlers.js b/code/lib/handlers.js
index a4ed61c..6de95bb 100755
--- a/code/lib/handlers.js
+++ b/code/lib/handlers.js
@@ -44,7 +44,7 @@ module.exports = {
                             "Tunnel-Medium-Type": 6,
                             "Tunnel-Type": 13,
                             "Tunnel-Private-Group-Id": vlan,
-                            "Session-Timeout": config.radius.session_duration || 60
+                            "Session-Timeout": config.session_duration || 60
                         }
                     });
                     callback (response, null);