diff --git a/client/main.lua b/client/main.lua
index dbb79b32..c4a981e0 100644
--- a/client/main.lua
+++ b/client/main.lua
@@ -29,7 +29,7 @@ AddEventHandler('esx:onPlayerDeath', function()
 	IsDead = true
 end)
 
-AddEventHandler('playerSpawned', function(spawn)
+AddEventHandler('esx:onPlayerSpawn', function(spawn)
 	if IsDead then
 		TriggerEvent('esx_basicneeds:resetStatus')
 	end
diff --git a/esx_basicneeds.sql b/esx_basicneeds.sql
index 2bf6df1f..13256c59 100644
--- a/esx_basicneeds.sql
+++ b/esx_basicneeds.sql
@@ -1,4 +1,4 @@
-USE `essentialmode`;
+USE `es_extended`;
 
 INSERT INTO `items` (`name`, `label`, `weight`) VALUES
 	('bread', 'Pain', 1),
diff --git a/localization/br_esx_basicneeds.sql b/localization/br_esx_basicneeds.sql
index f7b5b6ca..01ffb90f 100644
--- a/localization/br_esx_basicneeds.sql
+++ b/localization/br_esx_basicneeds.sql
@@ -1,4 +1,4 @@
-USE `essentialmode`;
+USE `es_extended`;
 
 INSERT INTO `items` (`name`, `label`, `weight`) VALUES
 	('bread', 'Pao', 1),
diff --git a/localization/cs_esx_basicneeds.sql b/localization/cs_esx_basicneeds.sql
index cca74355..5e71921e 100644
--- a/localization/cs_esx_basicneeds.sql
+++ b/localization/cs_esx_basicneeds.sql
@@ -1,4 +1,4 @@
-USE `essentialmode`;
+USE `es_extended`;
 
 INSERT INTO `items` (`name`, `label`, `weight`) VALUES
 	('bread', 'Chleba', 1),
diff --git a/localization/de_esx_basicneeds.sql b/localization/de_esx_basicneeds.sql
index 6dcf8319..bf1fcf23 100644
--- a/localization/de_esx_basicneeds.sql
+++ b/localization/de_esx_basicneeds.sql
@@ -1,4 +1,4 @@
-USE `essentialmode`;
+USE `es_extended`;
 
 INSERT INTO `items` (`name`, `label`, `weight`) VALUES
 	('bread', 'Brot', 1),
diff --git a/localization/fi_esx_basicneeds.sql b/localization/fi_esx_basicneeds.sql
index 96a7a19d..b29b37b3 100644
--- a/localization/fi_esx_basicneeds.sql
+++ b/localization/fi_esx_basicneeds.sql
@@ -1,4 +1,4 @@
-USE `essentialmode`;
+USE `es_extended`;
 
 INSERT INTO `items` (`name`, `label`, `weight`) VALUES
 	('bread', 'Leipä', 1),
diff --git a/localization/pl_esx_basicneeds.sql b/localization/pl_esx_basicneeds.sql
index 3510f9cd..96edfe34 100644
--- a/localization/pl_esx_basicneeds.sql
+++ b/localization/pl_esx_basicneeds.sql
@@ -1,4 +1,4 @@
-USE `essentialmode`;
+USE `es_extended`;
 
 INSERT INTO `items` (`name`, `label`, `weight`) VALUES
 	('bread', 'Chleb', 1),
diff --git a/localization/sv_esx_basicneeds.sql b/localization/sv_esx_basicneeds.sql
index be91ddc8..27b0a4ee 100644
--- a/localization/sv_esx_basicneeds.sql
+++ b/localization/sv_esx_basicneeds.sql
@@ -1,4 +1,4 @@
-USE `essentialmode`;
+USE `es_extended`;
 
 INSERT INTO `items` (`name`, `label`, `weight`) VALUES
 	('bread', 'Bröd', 1),