diff --git a/application/controllers/Logbook.php b/application/controllers/Logbook.php
index a6a8cf3f..1944b4a1 100755
--- a/application/controllers/Logbook.php
+++ b/application/controllers/Logbook.php
@@ -189,7 +189,7 @@ class Logbook extends CI_Controller {
 			} else {
 				$query = $this->db->query('
 					SELECT *
-					FROM dxcc
+					FROM dxcc_entities
 					WHERE prefix = SUBSTRING( \''.$row->COL_CALL.'\', 1, LENGTH( prefix ) )
 					ORDER BY LENGTH( prefix ) DESC
 					LIMIT 1
diff --git a/application/models/Dxcc.php b/application/models/Dxcc.php
index 59a74464..4cf8052e 100644
--- a/application/models/Dxcc.php
+++ b/application/models/Dxcc.php
@@ -103,7 +103,7 @@ class DXCC extends CI_Model {
 
 			$query = $this->db->query('
 					SELECT *
-					FROM dxcc
+					FROM dxcc_entities
 					WHERE prefix = SUBSTRING( \''.$callsign.'\', 1, LENGTH( prefix ) )
 					ORDER BY LENGTH( prefix ) DESC
 					LIMIT 1