diff --git a/client/main.lua b/client/main.lua
index 9420831a..715611bf 100644
--- a/client/main.lua
+++ b/client/main.lua
@@ -669,7 +669,7 @@ AddEventHandler('instance:loaded', function()
 	end)
 end)
 
-AddEventHandler('playerSpawned', function()
+AddEventHandler('esx:onPlayerSpawn', function()
 	if firstSpawn then
 		Citizen.CreateThread(function()
 			while not ESX.IsPlayerLoaded() do
diff --git a/esx_property.sql b/esx_property.sql
index a2e2439f..bc39b25d 100644
--- a/esx_property.sql
+++ b/esx_property.sql
@@ -1,4 +1,4 @@
-USE `essentialmode`;
+USE `es_extended`;
 
 ALTER TABLE `users`
   ADD COLUMN `last_property` VARCHAR(255) NULL
diff --git a/localization/de_esx_property.sql b/localization/de_esx_property.sql
index 900472cd..ea2748d4 100644
--- a/localization/de_esx_property.sql
+++ b/localization/de_esx_property.sql
@@ -1,4 +1,4 @@
-USE `essentialmode`;
+USE `es_extended`;
 
 ALTER TABLE `users`
   ADD COLUMN `last_property` VARCHAR(255) NULL
diff --git a/localization/en_esx_property.sql b/localization/en_esx_property.sql
index f01bb700..40b7859f 100644
--- a/localization/en_esx_property.sql
+++ b/localization/en_esx_property.sql
@@ -1,4 +1,4 @@
-USE `essentialmode`;
+USE `es_extended`;
 
 ALTER TABLE `users`
   ADD COLUMN `last_property` VARCHAR(255) NULL
diff --git a/localization/fi_esx_property.sql b/localization/fi_esx_property.sql
index 42f670a3..7bf0e492 100644
--- a/localization/fi_esx_property.sql
+++ b/localization/fi_esx_property.sql
@@ -1,4 +1,4 @@
-USE `essentialmode`;
+USE `es_extended`;
 
 ALTER TABLE `users`
   ADD COLUMN `last_property` VARCHAR(255) NULL
diff --git a/localization/pl_esx_property.sql b/localization/pl_esx_property.sql
index 4ec2f594..e41e36a4 100644
--- a/localization/pl_esx_property.sql
+++ b/localization/pl_esx_property.sql
@@ -1,4 +1,4 @@
-USE `essentialmode`;
+USE `es_extended`;
 
 ALTER TABLE `users`
   ADD COLUMN `last_property` VARCHAR(255) NULL
diff --git a/offices.sql b/offices.sql
index be9544eb..3c7ec94f 100644
--- a/offices.sql
+++ b/offices.sql
@@ -1,4 +1,4 @@
-USE `essentialmode`;
+USE `es_extended`;
 
 INSERT INTO `properties` VALUES
   (43, 'MazeBankBuilding', 'Maze Bank Building', '{\"x\":-79.18,\"y\":-795.92,\"z\":43.35}', NULL, NULL, '{\"x\":-72.50,\"y\":-786.92,\"z\":43.40}', '[]', NULL, 0, 0, 1, NULL, 0),