diff --git a/application/views/components/js_language_script.php b/application/views/components/js_lang_script.php
similarity index 100%
rename from application/views/components/js_language_script.php
rename to application/views/components/js_lang_script.php
diff --git a/application/views/components/js_config_script.php b/application/views/components/js_vars_script.php
similarity index 59%
rename from application/views/components/js_config_script.php
rename to application/views/components/js_vars_script.php
index 65064c96..fb34ccf3 100644
--- a/application/views/components/js_config_script.php
+++ b/application/views/components/js_vars_script.php
@@ -4,6 +4,6 @@
  */
 ?>
 <script <?= $attributes ?>>
-    window.App.Config = <?= json_encode(js_config()) ?>
+    window.App.Vars = <?= json_encode(script_vars()) ?>
 </script>
 
diff --git a/application/views/layouts/account_layout.php b/application/views/layouts/account_layout.php
index f65ac910..923acb6c 100644
--- a/application/views/layouts/account_layout.php
+++ b/application/views/layouts/account_layout.php
@@ -54,8 +54,8 @@
 <script src="<?= asset_url('assets/js/layouts/account_layout.js') ?>"></script>
 <script src="<?= asset_url('assets/js/utils/general_functions.js') ?>"></script>
 
-<?php component('js_config_script') ?>
-<?php component('js_language_script') ?>
+<?php component('js_vars_script') ?>
+<?php component('js_lang_script') ?>
 
 <script>
     const GlobalVariables = {
diff --git a/application/views/layouts/backend_layout.php b/application/views/layouts/backend_layout.php
index bc59a097..dc1c4aa0 100644
--- a/application/views/layouts/backend_layout.php
+++ b/application/views/layouts/backend_layout.php
@@ -58,8 +58,8 @@
 <script src="<?= asset_url('assets/js/layouts/backend_layout.js') ?>"></script>
 <script src="<?= asset_url('assets/js/utils/general_functions.js') ?>"></script>
 
-<?php component('js_config_script') ?>
-<?php component('js_language_script') ?>
+<?php component('js_vars_script') ?>
+<?php component('js_lang_script') ?>
 
 <?php slot('scripts') ?>
 
diff --git a/application/views/layouts/booking_layout.php b/application/views/layouts/booking_layout.php
index a4d7a2d3..c0ab49a7 100644
--- a/application/views/layouts/booking_layout.php
+++ b/application/views/layouts/booking_layout.php
@@ -69,10 +69,11 @@
 
 <script>
     const GlobalVariables = {
-        availableServices: <?= json_encode($available_services) ?>,
-        availableProviders: <?= json_encode($available_providers) ?>,
+        csrfToken: <?= json_encode($this->security->get_csrf_hash()) ?>,
         baseUrl: <?= json_encode(config('base_url')) ?>,
         manageMode: <?= $manage_mode ? 'true' : 'false' ?>,
+        availableServices: <?= json_encode($available_services) ?>,
+        availableProviders: <?= json_encode($available_providers) ?>,
         customerToken: <?= json_encode($customer_token) ?>,
         dateFormat: <?= json_encode($date_format) ?>,
         timeFormat: <?= json_encode($time_format) ?>,
@@ -81,8 +82,6 @@
         appointmentData: <?= json_encode($appointment_data) ?>,
         providerData: <?= json_encode($provider_data) ?>,
         customerData: <?= json_encode($customer_data) ?>,
-        displayAnyProvider: <?= json_encode($display_any_provider) ?>,
-        csrfToken: <?= json_encode($this->security->get_csrf_hash()) ?>
     };
 
     const availableLanguages = <?= json_encode(config('available_languages')) ?>;
@@ -103,8 +102,8 @@
 <script src="<?= asset_url('assets/js/layouts/booking_layout.js') ?>"></script>
 <script src="<?= asset_url('assets/js/utils/general_functions.js') ?>"></script>
 
-<?php component('js_config_script') ?>
-<?php component('js_language_script') ?>
+<?php component('js_vars_script') ?>
+<?php component('js_lang_script') ?>
 
 <script>
     $(function () {
diff --git a/application/views/layouts/message_layout.php b/application/views/layouts/message_layout.php
index 465483fb..b5600cb1 100644
--- a/application/views/layouts/message_layout.php
+++ b/application/views/layouts/message_layout.php
@@ -59,8 +59,8 @@
 <script src="<?= asset_url('assets/js/layouts/message_layout.js') ?>"></script>
 <script src="<?= asset_url('assets/js/utils/general_functions.js') ?>"></script>
 
-<?php component('js_config_script') ?>
-<?php component('js_language_script') ?>
+<?php component('js_vars_script') ?>
+<?php component('js_lang_script') ?>
 
 <?php google_analytics_script() ?>