diff --git a/CHANGELOG.md b/CHANGELOG.md
index 74a749a..f9380f8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # OYM - Geo Address Changelog
 
+## 3.0.0 - 2024-03-18
+### Updated
+- Updated Craft namespace to \Craft
+- Updated PHP version  to 8.2 or higher
+- Updated craftcms/cms version to 5.0.0-beta.1 or higher
+- Updated phpcs.xml
+
+### Removed
+- Removed deprecated.php
+
 ## 2.1.0 - 2024-03-04
 ### Updated
 - Updated TDE > OYM
diff --git a/README.md b/README.md
index 9631a9c..619e8bb 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,10 @@
-# OYM - Geo Address plugin for Craft CMS 4.x
+# OYM - Geo Address plugin for Craft CMS 5.x
 
-Geo Address field for Craft 4 Sections.
+Geo Address field for Craft CMS.
 
 ## Requirements
 
-This plugin requires Craft CMS 4.0.0 or later.
+This plugin requires Craft CMS 5.0.0 or later.
 
 ## Installation
 
diff --git a/composer.json b/composer.json
index b48b431..ab2e0d9 100644
--- a/composer.json
+++ b/composer.json
@@ -14,15 +14,14 @@
         }
     ],
     "require": {
-		"php": "^8.0",
-        "craftcms/cms": "^4.0.0",
-        "ext-curl": "*"
+        "php": "^8.2",
+        "ext-curl": "*",
+        "craftcms/cms": "^5.0.0-beta.1"
 	},
     "autoload": {
         "psr-4": {
           "oym\\craft\\geoaddress\\": "src/"
-        },
-        "files": ["src/deprecated.php"]
+        }
     },
     "extra": {
         "name": "OYM - Geo Address Fields",
diff --git a/geoaddress-sample.php b/geoaddress-sample.php
index 13b8847..2429dd5 100644
--- a/geoaddress-sample.php
+++ b/geoaddress-sample.php
@@ -2,244 +2,244 @@
 
 return [
     'countries' => [
-        'Afghanistan' => Craft::t('site', 'Afghanistan'),
-        'Albania' => Craft::t('site', 'Albania'),
-        'Algeria' => Craft::t('site', 'Algeria'),
-        'American Samoa' => Craft::t('site', 'American Samoa'),
-        'Andorra' => Craft::t('site', 'Andorra'),
-        'Angola' => Craft::t('site', 'Angola'),
-        'Anguilla' => Craft::t('site', 'Anguilla'),
-        'Antarctica' => Craft::t('site', 'Antarctica'),
-        'Antigua and Barbuda' => Craft::t('site', 'Antigua and Barbuda'),
-        'Argentina' => Craft::t('site', 'Argentina'),
-        'Armenia' => Craft::t('site', 'Armenia'),
-        'Aruba' => Craft::t('site', 'Aruba'),
-        'Australia' => Craft::t('site', 'Australia'),
-        'Austria' => Craft::t('site', 'Austria'),
-        'Azerbaijan' => Craft::t('site', 'Azerbaijan'),
-        'Bahamas' => Craft::t('site', 'Bahamas'),
-        'Bahrain' => Craft::t('site', 'Bahrain'),
-        'Bangladesh' => Craft::t('site', 'Bangladesh'),
-        'Barbados' => Craft::t('site', 'Barbados'),
-        'Belarus' => Craft::t('site', 'Belarus'),
-        'Belgium' => Craft::t('site', 'Belgium'),
-        'Belize' => Craft::t('site', 'Belize'),
-        'Benin' => Craft::t('site', 'Benin'),
-        'Bermuda' => Craft::t('site', 'Bermuda'),
-        'Bhutan' => Craft::t('site', 'Bhutan'),
-        'Bolivia' => Craft::t('site', 'Bolivia'),
-        'Bosnia and Herzegowina' => Craft::t('site', 'Bosnia and Herzegowina'),
-        'Botswana' => Craft::t('site', 'Botswana'),
-        'Bouvet Island' => Craft::t('site', 'Bouvet Island'),
-        'Brazil' => Craft::t('site', 'Brazil'),
-        'British Indian Ocean Territory' => Craft::t('site', 'British Indian Ocean Territory'),
-        'Brunei Darussalam' => Craft::t('site', 'Brunei Darussalam'),
-        'Bulgaria' => Craft::t('site', 'Bulgaria'),
-        'Burkina Faso' => Craft::t('site', 'Burkina Faso'),
-        'Burundi' => Craft::t('site', 'Burundi'),
-        'Cambodia' => Craft::t('site', 'Cambodia'),
-        'Cameroon' => Craft::t('site', 'Cameroon'),
-        'Canada' => Craft::t('site', 'Canada'),
-        'Cape Verde' => Craft::t('site', 'Cape Verde'),
-        'Cayman Islands' => Craft::t('site', 'Cayman Islands'),
-        'Central African Republic' => Craft::t('site', 'Central African Republic'),
-        'Chad' => Craft::t('site', 'Chad'),
-        'Chile' => Craft::t('site', 'Chile'),
-        'China' => Craft::t('site', 'China'),
-        'Christmas Island' => Craft::t('site', 'Christmas Island'),
-        'Cocos (Keeling) Islands' => Craft::t('site', 'Cocos (Keeling) Islands'),
-        'Colombia' => Craft::t('site', 'Colombia'),
-        'Comoros' => Craft::t('site', 'Comoros'),
-        'Congo' => Craft::t('site', 'Congo'),
-        'Congo, the Democratic Republic of the' => Craft::t('site', 'Congo, the Democratic Republic of the'),
-        'Cook Islands' => Craft::t('site', 'Cook Islands'),
-        'Costa Rica' => Craft::t('site', 'Costa Rica'),
-        'Cote d\'Ivoire' => Craft::t('site', 'Cote d\'Ivoire'),
-        'Croatia (Hrvatska)' => Craft::t('site', 'Croatia (Hrvatska)'),
-        'Cuba' => Craft::t('site', 'Cuba'),
-        'Cyprus' => Craft::t('site', 'Cyprus'),
-        'Czech Republic' => Craft::t('site', 'Czech Republic'),
-        'Denmark' => Craft::t('site', 'Denmark'),
-        'Djibouti' => Craft::t('site', 'Djibouti'),
-        'Dominica' => Craft::t('site', 'Dominica'),
-        'Dominican Republic' => Craft::t('site', 'Dominican Republic'),
-        'East Timor' => Craft::t('site', 'East Timor'),
-        'Ecuador' => Craft::t('site', 'Ecuador'),
-        'Egypt' => Craft::t('site', 'Egypt'),
-        'El Salvador' => Craft::t('site', 'El Salvador'),
-        'Equatorial Guinea' => Craft::t('site', 'Equatorial Guinea'),
-        'Eritrea' => Craft::t('site', 'Eritrea'),
-        'Estonia' => Craft::t('site', 'Estonia'),
-        'Ethiopia' => Craft::t('site', 'Ethiopia'),
-        'Falkland Islands (Malvinas)' => Craft::t('site', 'Falkland Islands (Malvinas)'),
-        'Faroe Islands' => Craft::t('site', 'Faroe Islands'),
-        'Fiji' => Craft::t('site', 'Fiji'),
-        'Finland' => Craft::t('site', 'Finland'),
-        'France' => Craft::t('site', 'France'),
-        'France Metropolitan' => Craft::t('site', 'France Metropolitan'),
-        'French Guiana' => Craft::t('site', 'French Guiana'),
-        'French Polynesia' => Craft::t('site', 'French Polynesia'),
-        'French Southern Territories' => Craft::t('site', 'French Southern Territories'),
-        'Gabon' => Craft::t('site', 'Gabon'),
-        'Gambia' => Craft::t('site', 'Gambia'),
-        'Georgia' => Craft::t('site', 'Georgia'),
-        'Germany' => Craft::t('site', 'Germany'),
-        'Ghana' => Craft::t('site', 'Ghana'),
-        'Gibraltar' => Craft::t('site', 'Gibraltar'),
-        'Greece' => Craft::t('site', 'Greece'),
-        'Greenland' => Craft::t('site', 'Greenland'),
-        'Grenada' => Craft::t('site', 'Grenada'),
-        'Guadeloupe' => Craft::t('site', 'Guadeloupe'),
-        'Guam' => Craft::t('site', 'Guam'),
-        'Guatemala' => Craft::t('site', 'Guatemala'),
-        'Guinea' => Craft::t('site', 'Guinea'),
-        'Guinea-Bissau' => Craft::t('site', 'Guinea-Bissau'),
-        'Guyana' => Craft::t('site', 'Guyana'),
-        'Haiti' => Craft::t('site', 'Haiti'),
-        'Heard and Mc Donald Islands' => Craft::t('site', 'Heard and Mc Donald Islands'),
-        'Holy See (Vatican City State)' => Craft::t('site', 'Holy See (Vatican City State)'),
-        'Honduras' => Craft::t('site', 'Honduras'),
-        'Hong Kong' => Craft::t('site', 'Hong Kong'),
-        'Hungary' => Craft::t('site', 'Hungary'),
-        'Iceland' => Craft::t('site', 'Iceland'),
-        'India' => Craft::t('site', 'India'),
-        'Indonesia' => Craft::t('site', 'Indonesia'),
-        'Iran (Islamic Republic of)' => Craft::t('site', 'Iran (Islamic Republic of)'),
-        'Iraq' => Craft::t('site', 'Iraq'),
-        'Ireland' => Craft::t('site', 'Ireland'),
-        'Israel' => Craft::t('site', 'Israel'),
-        'Italy' => Craft::t('site', 'Italy'),
-        'Jamaica' => Craft::t('site', 'Jamaica'),
-        'Japan' => Craft::t('site', 'Japan'),
-        'Jordan' => Craft::t('site', 'Jordan'),
-        'Kazakhstan' => Craft::t('site', 'Kazakhstan'),
-        'Kenya' => Craft::t('site', 'Kenya'),
-        'Kiribati' => Craft::t('site', 'Kiribati'),
-        'Korea, Democratic People\'s Republic of' => Craft::t('site', 'Korea, Democratic People\'s Republic of'),
-        'Korea, Republic of' => Craft::t('site', 'Korea, Republic of'),
-        'Kuwait' => Craft::t('site', 'Kuwait'),
-        'Kyrgyzstan' => Craft::t('site', 'Kyrgyzstan'),
-        'Lao, People\'s Democratic Republic' => Craft::t('site', 'Lao, People\'s Democratic Republic'),
-        'Latvia' => Craft::t('site', 'Latvia'),
-        'Lebanon' => Craft::t('site', 'Lebanon'),
-        'Lesotho' => Craft::t('site', 'Lesotho'),
-        'Liberia' => Craft::t('site', 'Liberia'),
-        'Libyan Arab Jamahiriya' => Craft::t('site', 'Libyan Arab Jamahiriya'),
-        'Liechtenstein' => Craft::t('site', 'Liechtenstein'),
-        'Lithuania' => Craft::t('site', 'Lithuania'),
-        'Luxembourg' => Craft::t('site', 'Luxembourg'),
-        'Macau' => Craft::t('site', 'Macau'),
-        'Macedonia, The Former Yugoslav Republic of' => Craft::t('site', 'Macedonia, The Former Yugoslav Republic of'),
-        'Madagascar' => Craft::t('site', 'Madagascar'),
-        'Malawi' => Craft::t('site', 'Malawi'),
-        'Malaysia' => Craft::t('site', 'Malaysia'),
-        'Maldives' => Craft::t('site', 'Maldives'),
-        'Mali' => Craft::t('site', 'Mali'),
-        'Malta' => Craft::t('site', 'Malta'),
-        'Marshall Islands' => Craft::t('site', 'Marshall Islands'),
-        'Martinique' => Craft::t('site', 'Martinique'),
-        'Mauritania' => Craft::t('site', 'Mauritania'),
-        'Mauritius' => Craft::t('site', 'Mauritius'),
-        'Mayotte' => Craft::t('site', 'Mayotte'),
-        'Mexico' => Craft::t('site', 'Mexico'),
-        'Micronesia, Federated States of' => Craft::t('site', 'Micronesia, Federated States of'),
-        'Moldova, Republic of' => Craft::t('site', 'Moldova, Republic of'),
-        'Monaco' => Craft::t('site', 'Monaco'),
-        'Mongolia' => Craft::t('site', 'Mongolia'),
-        'Montserrat' => Craft::t('site', 'Montserrat'),
-        'Morocco' => Craft::t('site', 'Morocco'),
-        'Mozambique' => Craft::t('site', 'Mozambique'),
-        'Myanmar' => Craft::t('site', 'Myanmar'),
-        'Namibia' => Craft::t('site', 'Namibia'),
-        'Nauru' => Craft::t('site', 'Nauru'),
-        'Nepal' => Craft::t('site', 'Nepal'),
-        'Netherlands' => Craft::t('site', 'Netherlands'),
-        'Netherlands Antilles' => Craft::t('site', 'Netherlands Antilles'),
-        'New Caledonia' => Craft::t('site', 'New Caledonia'),
-        'New Zealand' => Craft::t('site', 'New Zealand'),
-        'Nicaragua' => Craft::t('site', 'Nicaragua'),
-        'Niger' => Craft::t('site', 'Niger'),
-        'Nigeria' => Craft::t('site', 'Nigeria'),
-        'Niue' => Craft::t('site', 'Niue'),
-        'Norfolk Island' => Craft::t('site', 'Norfolk Island'),
-        'Northern Mariana Islands' => Craft::t('site', 'Northern Mariana Islands'),
-        'Norway' => Craft::t('site', 'Norway'),
-        'Oman' => Craft::t('site', 'Oman'),
-        'Pakistan' => Craft::t('site', 'Pakistan'),
-        'Palau' => Craft::t('site', 'Palau'),
-        'Panama' => Craft::t('site', 'Panama'),
-        'Papua New Guinea' => Craft::t('site', 'Papua New Guinea'),
-        'Paraguay' => Craft::t('site', 'Paraguay'),
-        'Peru' => Craft::t('site', 'Peru'),
-        'Philippines' => Craft::t('site', 'Philippines'),
-        'Pitcairn' => Craft::t('site', 'Pitcairn'),
-        'Poland' => Craft::t('site', 'Poland'),
-        'Portugal' => Craft::t('site', 'Portugal'),
-        'Puerto Rico' => Craft::t('site', 'Puerto Rico'),
-        'Qatar' => Craft::t('site', 'Qatar'),
-        'Reunion' => Craft::t('site', 'Reunion'),
-        'Romania' => Craft::t('site', 'Romania'),
-        'Russian Federation' => Craft::t('site', 'Russian Federation'),
-        'Rwanda' => Craft::t('site', 'Rwanda'),
-        'Saint Kitts and Nevis' => Craft::t('site', 'Saint Kitts and Nevis'),
-        'Saint Lucia' => Craft::t('site', 'Saint Lucia'),
-        'Saint Vincent and the Grenadines' => Craft::t('site', 'Saint Vincent and the Grenadines'),
-        'Samoa' => Craft::t('site', 'Samoa'),
-        'San Marino' => Craft::t('site', 'San Marino'),
-        'Sao Tome and Principe' => Craft::t('site', 'Sao Tome and Principe'),
-        'Saudi Arabia' => Craft::t('site', 'Saudi Arabia'),
-        'Senegal' => Craft::t('site', 'Senegal'),
-        'Seychelles' => Craft::t('site', 'Seychelles'),
-        'Sierra Leone' => Craft::t('site', 'Sierra Leone'),
-        'Singapore' => Craft::t('site', 'Singapore'),
-        'Slovakia (Slovak Republic)' => Craft::t('site', 'Slovakia (Slovak Republic)'),
-        'Slovenia' => Craft::t('site', 'Slovenia'),
-        'Solomon Islands' => Craft::t('site', 'Solomon Islands'),
-        'Somalia' => Craft::t('site', 'Somalia'),
-        'South Africa' => Craft::t('site', 'South Africa'),
-        'South Georgia and the South Sandwich Islands' => Craft::t('site', 'South Georgia and the South Sandwich Islands'),
-        'Spain' => Craft::t('site', 'Spain'),
-        'Sri Lanka' => Craft::t('site', 'Sri Lanka'),
-        'St. Helena' => Craft::t('site', 'St. Helena'),
-        'St. Pierre and Miquelon' => Craft::t('site', 'St. Pierre and Miquelon'),
-        'Sudan' => Craft::t('site', 'Sudan'),
-        'Suriname' => Craft::t('site', 'Suriname'),
-        'Svalbard and Jan Mayen Islands' => Craft::t('site', 'Svalbard and Jan Mayen Islands'),
-        'Swaziland' => Craft::t('site', 'Swaziland'),
-        'Sweden' => Craft::t('site', 'Sweden'),
-        'Switzerland' => Craft::t('site', 'Switzerland'),
-        'Syrian Arab Republic' => Craft::t('site', 'Syrian Arab Republic'),
-        'Taiwan, Province of China' => Craft::t('site', 'Taiwan, Province of China'),
-        'Tajikistan' => Craft::t('site', 'Tajikistan'),
-        'Tanzania, United Republic of' => Craft::t('site', 'Tanzania, United Republic of'),
-        'Thailand' => Craft::t('site', 'Thailand'),
-        'Togo' => Craft::t('site', 'Togo'),
-        'Tokelau' => Craft::t('site', 'Tokelau'),
-        'Tonga' => Craft::t('site', 'Tonga'),
-        'Trinidad and Tobago' => Craft::t('site', 'Trinidad and Tobago'),
-        'Tunisia' => Craft::t('site', 'Tunisia'),
-        'Turkey' => Craft::t('site', 'Turkey'),
-        'Turkmenistan' => Craft::t('site', 'Turkmenistan'),
-        'Turks and Caicos Islands' => Craft::t('site', 'Turks and Caicos Islands'),
-        'Tuvalu' => Craft::t('site', 'Tuvalu'),
-        'Uganda' => Craft::t('site', 'Uganda'),
-        'Ukraine' => Craft::t('site', 'Ukraine'),
-        'United Arab Emirates' => Craft::t('site', 'United Arab Emirates'),
-        'United Kingdom' => Craft::t('site', 'United Kingdom'),
-        'United States' => Craft::t('site', 'United States'),
-        'United States Minor Outlying Islands' => Craft::t('site', 'United States Minor Outlying Islands'),
-        'Uruguay' => Craft::t('site', 'Uruguay'),
-        'Uzbekistan' => Craft::t('site', 'Uzbekistan'),
-        'Vanuatu' => Craft::t('site', 'Vanuatu'),
-        'Venezuela' => Craft::t('site', 'Venezuela'),
-        'Vietnam' => Craft::t('site', 'Vietnam'),
-        'Virgin Islands (British)' => Craft::t('site', 'Virgin Islands (British)'),
-        'Virgin Islands (U.S.)' => Craft::t('site', 'Virgin Islands (U.S.)'),
-        'Wallis and Futuna Islands' => Craft::t('site', 'Wallis and Futuna Islands'),
-        'Western Sahara' => Craft::t('site', 'Western Sahara'),
-        'Yemen' => Craft::t('site', 'Yemen'),
-        'Yugoslavia' => Craft::t('site', 'Yugoslavia'),
-        'Zambia' => Craft::t('site', 'Zambia'),
-        'Zimbabwe' => Craft::t('site', 'Zimbabwe'),
+        'Afghanistan' => \Craft::t('site', 'Afghanistan'),
+        'Albania' => \Craft::t('site', 'Albania'),
+        'Algeria' => \Craft::t('site', 'Algeria'),
+        'American Samoa' => \Craft::t('site', 'American Samoa'),
+        'Andorra' => \Craft::t('site', 'Andorra'),
+        'Angola' => \Craft::t('site', 'Angola'),
+        'Anguilla' => \Craft::t('site', 'Anguilla'),
+        'Antarctica' => \Craft::t('site', 'Antarctica'),
+        'Antigua and Barbuda' => \Craft::t('site', 'Antigua and Barbuda'),
+        'Argentina' => \Craft::t('site', 'Argentina'),
+        'Armenia' => \Craft::t('site', 'Armenia'),
+        'Aruba' => \Craft::t('site', 'Aruba'),
+        'Australia' => \Craft::t('site', 'Australia'),
+        'Austria' => \Craft::t('site', 'Austria'),
+        'Azerbaijan' => \Craft::t('site', 'Azerbaijan'),
+        'Bahamas' => \Craft::t('site', 'Bahamas'),
+        'Bahrain' => \Craft::t('site', 'Bahrain'),
+        'Bangladesh' => \Craft::t('site', 'Bangladesh'),
+        'Barbados' => \Craft::t('site', 'Barbados'),
+        'Belarus' => \Craft::t('site', 'Belarus'),
+        'Belgium' => \Craft::t('site', 'Belgium'),
+        'Belize' => \Craft::t('site', 'Belize'),
+        'Benin' => \Craft::t('site', 'Benin'),
+        'Bermuda' => \Craft::t('site', 'Bermuda'),
+        'Bhutan' => \Craft::t('site', 'Bhutan'),
+        'Bolivia' => \Craft::t('site', 'Bolivia'),
+        'Bosnia and Herzegowina' => \Craft::t('site', 'Bosnia and Herzegowina'),
+        'Botswana' => \Craft::t('site', 'Botswana'),
+        'Bouvet Island' => \Craft::t('site', 'Bouvet Island'),
+        'Brazil' => \Craft::t('site', 'Brazil'),
+        'British Indian Ocean Territory' => \Craft::t('site', 'British Indian Ocean Territory'),
+        'Brunei Darussalam' => \Craft::t('site', 'Brunei Darussalam'),
+        'Bulgaria' => \Craft::t('site', 'Bulgaria'),
+        'Burkina Faso' => \Craft::t('site', 'Burkina Faso'),
+        'Burundi' => \Craft::t('site', 'Burundi'),
+        'Cambodia' => \Craft::t('site', 'Cambodia'),
+        'Cameroon' => \Craft::t('site', 'Cameroon'),
+        'Canada' => \Craft::t('site', 'Canada'),
+        'Cape Verde' => \Craft::t('site', 'Cape Verde'),
+        'Cayman Islands' => \Craft::t('site', 'Cayman Islands'),
+        'Central African Republic' => \Craft::t('site', 'Central African Republic'),
+        'Chad' => \Craft::t('site', 'Chad'),
+        'Chile' => \Craft::t('site', 'Chile'),
+        'China' => \Craft::t('site', 'China'),
+        'Christmas Island' => \Craft::t('site', 'Christmas Island'),
+        'Cocos (Keeling) Islands' => \Craft::t('site', 'Cocos (Keeling) Islands'),
+        'Colombia' => \Craft::t('site', 'Colombia'),
+        'Comoros' => \Craft::t('site', 'Comoros'),
+        'Congo' => \Craft::t('site', 'Congo'),
+        'Congo, the Democratic Republic of the' => \Craft::t('site', 'Congo, the Democratic Republic of the'),
+        'Cook Islands' => \Craft::t('site', 'Cook Islands'),
+        'Costa Rica' => \Craft::t('site', 'Costa Rica'),
+        'Cote d\'Ivoire' => \Craft::t('site', 'Cote d\'Ivoire'),
+        'Croatia (Hrvatska)' => \Craft::t('site', 'Croatia (Hrvatska)'),
+        'Cuba' => \Craft::t('site', 'Cuba'),
+        'Cyprus' => \Craft::t('site', 'Cyprus'),
+        'Czech Republic' => \Craft::t('site', 'Czech Republic'),
+        'Denmark' => \Craft::t('site', 'Denmark'),
+        'Djibouti' => \Craft::t('site', 'Djibouti'),
+        'Dominica' => \Craft::t('site', 'Dominica'),
+        'Dominican Republic' => \Craft::t('site', 'Dominican Republic'),
+        'East Timor' => \Craft::t('site', 'East Timor'),
+        'Ecuador' => \Craft::t('site', 'Ecuador'),
+        'Egypt' => \Craft::t('site', 'Egypt'),
+        'El Salvador' => \Craft::t('site', 'El Salvador'),
+        'Equatorial Guinea' => \Craft::t('site', 'Equatorial Guinea'),
+        'Eritrea' => \Craft::t('site', 'Eritrea'),
+        'Estonia' => \Craft::t('site', 'Estonia'),
+        'Ethiopia' => \Craft::t('site', 'Ethiopia'),
+        'Falkland Islands (Malvinas)' => \Craft::t('site', 'Falkland Islands (Malvinas)'),
+        'Faroe Islands' => \Craft::t('site', 'Faroe Islands'),
+        'Fiji' => \Craft::t('site', 'Fiji'),
+        'Finland' => \Craft::t('site', 'Finland'),
+        'France' => \Craft::t('site', 'France'),
+        'France Metropolitan' => \Craft::t('site', 'France Metropolitan'),
+        'French Guiana' => \Craft::t('site', 'French Guiana'),
+        'French Polynesia' => \Craft::t('site', 'French Polynesia'),
+        'French Southern Territories' => \Craft::t('site', 'French Southern Territories'),
+        'Gabon' => \Craft::t('site', 'Gabon'),
+        'Gambia' => \Craft::t('site', 'Gambia'),
+        'Georgia' => \Craft::t('site', 'Georgia'),
+        'Germany' => \Craft::t('site', 'Germany'),
+        'Ghana' => \Craft::t('site', 'Ghana'),
+        'Gibraltar' => \Craft::t('site', 'Gibraltar'),
+        'Greece' => \Craft::t('site', 'Greece'),
+        'Greenland' => \Craft::t('site', 'Greenland'),
+        'Grenada' => \Craft::t('site', 'Grenada'),
+        'Guadeloupe' => \Craft::t('site', 'Guadeloupe'),
+        'Guam' => \Craft::t('site', 'Guam'),
+        'Guatemala' => \Craft::t('site', 'Guatemala'),
+        'Guinea' => \Craft::t('site', 'Guinea'),
+        'Guinea-Bissau' => \Craft::t('site', 'Guinea-Bissau'),
+        'Guyana' => \Craft::t('site', 'Guyana'),
+        'Haiti' => \Craft::t('site', 'Haiti'),
+        'Heard and Mc Donald Islands' => \Craft::t('site', 'Heard and Mc Donald Islands'),
+        'Holy See (Vatican City State)' => \Craft::t('site', 'Holy See (Vatican City State)'),
+        'Honduras' => \Craft::t('site', 'Honduras'),
+        'Hong Kong' => \Craft::t('site', 'Hong Kong'),
+        'Hungary' => \Craft::t('site', 'Hungary'),
+        'Iceland' => \Craft::t('site', 'Iceland'),
+        'India' => \Craft::t('site', 'India'),
+        'Indonesia' => \Craft::t('site', 'Indonesia'),
+        'Iran (Islamic Republic of)' => \Craft::t('site', 'Iran (Islamic Republic of)'),
+        'Iraq' => \Craft::t('site', 'Iraq'),
+        'Ireland' => \Craft::t('site', 'Ireland'),
+        'Israel' => \Craft::t('site', 'Israel'),
+        'Italy' => \Craft::t('site', 'Italy'),
+        'Jamaica' => \Craft::t('site', 'Jamaica'),
+        'Japan' => \Craft::t('site', 'Japan'),
+        'Jordan' => \Craft::t('site', 'Jordan'),
+        'Kazakhstan' => \Craft::t('site', 'Kazakhstan'),
+        'Kenya' => \Craft::t('site', 'Kenya'),
+        'Kiribati' => \Craft::t('site', 'Kiribati'),
+        'Korea, Democratic People\'s Republic of' => \Craft::t('site', 'Korea, Democratic People\'s Republic of'),
+        'Korea, Republic of' => \Craft::t('site', 'Korea, Republic of'),
+        'Kuwait' => \Craft::t('site', 'Kuwait'),
+        'Kyrgyzstan' => \Craft::t('site', 'Kyrgyzstan'),
+        'Lao, People\'s Democratic Republic' => \Craft::t('site', 'Lao, People\'s Democratic Republic'),
+        'Latvia' => \Craft::t('site', 'Latvia'),
+        'Lebanon' => \Craft::t('site', 'Lebanon'),
+        'Lesotho' => \Craft::t('site', 'Lesotho'),
+        'Liberia' => \Craft::t('site', 'Liberia'),
+        'Libyan Arab Jamahiriya' => \Craft::t('site', 'Libyan Arab Jamahiriya'),
+        'Liechtenstein' => \Craft::t('site', 'Liechtenstein'),
+        'Lithuania' => \Craft::t('site', 'Lithuania'),
+        'Luxembourg' => \Craft::t('site', 'Luxembourg'),
+        'Macau' => \Craft::t('site', 'Macau'),
+        'Macedonia, The Former Yugoslav Republic of' => \Craft::t('site', 'Macedonia, The Former Yugoslav Republic of'),
+        'Madagascar' => \Craft::t('site', 'Madagascar'),
+        'Malawi' => \Craft::t('site', 'Malawi'),
+        'Malaysia' => \Craft::t('site', 'Malaysia'),
+        'Maldives' => \Craft::t('site', 'Maldives'),
+        'Mali' => \Craft::t('site', 'Mali'),
+        'Malta' => \Craft::t('site', 'Malta'),
+        'Marshall Islands' => \Craft::t('site', 'Marshall Islands'),
+        'Martinique' => \Craft::t('site', 'Martinique'),
+        'Mauritania' => \Craft::t('site', 'Mauritania'),
+        'Mauritius' => \Craft::t('site', 'Mauritius'),
+        'Mayotte' => \Craft::t('site', 'Mayotte'),
+        'Mexico' => \Craft::t('site', 'Mexico'),
+        'Micronesia, Federated States of' => \Craft::t('site', 'Micronesia, Federated States of'),
+        'Moldova, Republic of' => \Craft::t('site', 'Moldova, Republic of'),
+        'Monaco' => \Craft::t('site', 'Monaco'),
+        'Mongolia' => \Craft::t('site', 'Mongolia'),
+        'Montserrat' => \Craft::t('site', 'Montserrat'),
+        'Morocco' => \Craft::t('site', 'Morocco'),
+        'Mozambique' => \Craft::t('site', 'Mozambique'),
+        'Myanmar' => \Craft::t('site', 'Myanmar'),
+        'Namibia' => \Craft::t('site', 'Namibia'),
+        'Nauru' => \Craft::t('site', 'Nauru'),
+        'Nepal' => \Craft::t('site', 'Nepal'),
+        'Netherlands' => \Craft::t('site', 'Netherlands'),
+        'Netherlands Antilles' => \Craft::t('site', 'Netherlands Antilles'),
+        'New Caledonia' => \Craft::t('site', 'New Caledonia'),
+        'New Zealand' => \Craft::t('site', 'New Zealand'),
+        'Nicaragua' => \Craft::t('site', 'Nicaragua'),
+        'Niger' => \Craft::t('site', 'Niger'),
+        'Nigeria' => \Craft::t('site', 'Nigeria'),
+        'Niue' => \Craft::t('site', 'Niue'),
+        'Norfolk Island' => \Craft::t('site', 'Norfolk Island'),
+        'Northern Mariana Islands' => \Craft::t('site', 'Northern Mariana Islands'),
+        'Norway' => \Craft::t('site', 'Norway'),
+        'Oman' => \Craft::t('site', 'Oman'),
+        'Pakistan' => \Craft::t('site', 'Pakistan'),
+        'Palau' => \Craft::t('site', 'Palau'),
+        'Panama' => \Craft::t('site', 'Panama'),
+        'Papua New Guinea' => \Craft::t('site', 'Papua New Guinea'),
+        'Paraguay' => \Craft::t('site', 'Paraguay'),
+        'Peru' => \Craft::t('site', 'Peru'),
+        'Philippines' => \Craft::t('site', 'Philippines'),
+        'Pitcairn' => \Craft::t('site', 'Pitcairn'),
+        'Poland' => \Craft::t('site', 'Poland'),
+        'Portugal' => \Craft::t('site', 'Portugal'),
+        'Puerto Rico' => \Craft::t('site', 'Puerto Rico'),
+        'Qatar' => \Craft::t('site', 'Qatar'),
+        'Reunion' => \Craft::t('site', 'Reunion'),
+        'Romania' => \Craft::t('site', 'Romania'),
+        'Russian Federation' => \Craft::t('site', 'Russian Federation'),
+        'Rwanda' => \Craft::t('site', 'Rwanda'),
+        'Saint Kitts and Nevis' => \Craft::t('site', 'Saint Kitts and Nevis'),
+        'Saint Lucia' => \Craft::t('site', 'Saint Lucia'),
+        'Saint Vincent and the Grenadines' => \Craft::t('site', 'Saint Vincent and the Grenadines'),
+        'Samoa' => \Craft::t('site', 'Samoa'),
+        'San Marino' => \Craft::t('site', 'San Marino'),
+        'Sao Tome and Principe' => \Craft::t('site', 'Sao Tome and Principe'),
+        'Saudi Arabia' => \Craft::t('site', 'Saudi Arabia'),
+        'Senegal' => \Craft::t('site', 'Senegal'),
+        'Seychelles' => \Craft::t('site', 'Seychelles'),
+        'Sierra Leone' => \Craft::t('site', 'Sierra Leone'),
+        'Singapore' => \Craft::t('site', 'Singapore'),
+        'Slovakia (Slovak Republic)' => \Craft::t('site', 'Slovakia (Slovak Republic)'),
+        'Slovenia' => \Craft::t('site', 'Slovenia'),
+        'Solomon Islands' => \Craft::t('site', 'Solomon Islands'),
+        'Somalia' => \Craft::t('site', 'Somalia'),
+        'South Africa' => \Craft::t('site', 'South Africa'),
+        'South Georgia and the South Sandwich Islands' => \Craft::t('site', 'South Georgia and the South Sandwich Islands'),
+        'Spain' => \Craft::t('site', 'Spain'),
+        'Sri Lanka' => \Craft::t('site', 'Sri Lanka'),
+        'St. Helena' => \Craft::t('site', 'St. Helena'),
+        'St. Pierre and Miquelon' => \Craft::t('site', 'St. Pierre and Miquelon'),
+        'Sudan' => \Craft::t('site', 'Sudan'),
+        'Suriname' => \Craft::t('site', 'Suriname'),
+        'Svalbard and Jan Mayen Islands' => \Craft::t('site', 'Svalbard and Jan Mayen Islands'),
+        'Swaziland' => \Craft::t('site', 'Swaziland'),
+        'Sweden' => \Craft::t('site', 'Sweden'),
+        'Switzerland' => \Craft::t('site', 'Switzerland'),
+        'Syrian Arab Republic' => \Craft::t('site', 'Syrian Arab Republic'),
+        'Taiwan, Province of China' => \Craft::t('site', 'Taiwan, Province of China'),
+        'Tajikistan' => \Craft::t('site', 'Tajikistan'),
+        'Tanzania, United Republic of' => \Craft::t('site', 'Tanzania, United Republic of'),
+        'Thailand' => \Craft::t('site', 'Thailand'),
+        'Togo' => \Craft::t('site', 'Togo'),
+        'Tokelau' => \Craft::t('site', 'Tokelau'),
+        'Tonga' => \Craft::t('site', 'Tonga'),
+        'Trinidad and Tobago' => \Craft::t('site', 'Trinidad and Tobago'),
+        'Tunisia' => \Craft::t('site', 'Tunisia'),
+        'Turkey' => \Craft::t('site', 'Turkey'),
+        'Turkmenistan' => \Craft::t('site', 'Turkmenistan'),
+        'Turks and Caicos Islands' => \Craft::t('site', 'Turks and Caicos Islands'),
+        'Tuvalu' => \Craft::t('site', 'Tuvalu'),
+        'Uganda' => \Craft::t('site', 'Uganda'),
+        'Ukraine' => \Craft::t('site', 'Ukraine'),
+        'United Arab Emirates' => \Craft::t('site', 'United Arab Emirates'),
+        'United Kingdom' => \Craft::t('site', 'United Kingdom'),
+        'United States' => \Craft::t('site', 'United States'),
+        'United States Minor Outlying Islands' => \Craft::t('site', 'United States Minor Outlying Islands'),
+        'Uruguay' => \Craft::t('site', 'Uruguay'),
+        'Uzbekistan' => \Craft::t('site', 'Uzbekistan'),
+        'Vanuatu' => \Craft::t('site', 'Vanuatu'),
+        'Venezuela' => \Craft::t('site', 'Venezuela'),
+        'Vietnam' => \Craft::t('site', 'Vietnam'),
+        'Virgin Islands (British)' => \Craft::t('site', 'Virgin Islands (British)'),
+        'Virgin Islands (U.S.)' => \Craft::t('site', 'Virgin Islands (U.S.)'),
+        'Wallis and Futuna Islands' => \Craft::t('site', 'Wallis and Futuna Islands'),
+        'Western Sahara' => \Craft::t('site', 'Western Sahara'),
+        'Yemen' => \Craft::t('site', 'Yemen'),
+        'Yugoslavia' => \Craft::t('site', 'Yugoslavia'),
+        'Zambia' => \Craft::t('site', 'Zambia'),
+        'Zimbabwe' => \Craft::t('site', 'Zimbabwe'),
     ],
 ];
diff --git a/phpcs.xml b/phpcs.xml
index 7fdf334..8156c1a 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -8,5 +8,5 @@
 	<file>src/</file>
 
 	<exclude-pattern type="relative-root">*.js</exclude-pattern>
-	<exclude-pattern type="relative-root">deprecated.php</exclude-pattern>
+	<exclude-pattern type="relative-root">migrations/</exclude-pattern>
 </ruleset>
diff --git a/src/assetbundles/geoaddressfield/GeoAddressFieldAsset.php b/src/assetbundles/geoaddressfield/GeoAddressFieldAsset.php
index 18ff556..1d518c9 100644
--- a/src/assetbundles/geoaddressfield/GeoAddressFieldAsset.php
+++ b/src/assetbundles/geoaddressfield/GeoAddressFieldAsset.php
@@ -2,7 +2,6 @@
 
 namespace oym\craft\geoaddress\assetbundles\geoaddressfield;
 
-use Craft;
 use craft\web\AssetBundle;
 use craft\web\assets\cp\CpAsset;
 
diff --git a/src/deprecated.php b/src/deprecated.php
deleted file mode 100644
index 02bbf08..0000000
--- a/src/deprecated.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-
-namespace tde\craft\geoaddress {
-    spl_autoload_register(
-        static function (string $className) {
-            $old = 'tde\\craft\\geoaddress\\';
-            $new = 'oym\\craft\\geoaddress\\';
-
-            if (0 !== strpos($className, $old)) {
-                return;
-            }
-
-            $newName = substr_replace($className, $new, 0, strlen($old));
-            class_alias($newName, $className);
-        },
-        true,
-        false,
-    );
-
-    if (!\class_exists(GeoAddress::class)) {
-        /** @deprecated this is an alias for \oym\craft\geoaddress\GeoAddress */
-        class GeoAddress
-        {
-        }
-    }
-}
-
-namespace tde\craft\geoaddress\assetbundles\geoaddressfield {
-    if (!\class_exists(GeoAddressFieldAsset::class)) {
-        /** @deprecated this is an alias for \oym\craft\geoaddress\assetbundles\geoaddressfield\GeoAddressFieldAsset */
-        class GeoAddressFieldAsset
-        {
-        }
-    }
-}
-
-namespace tde\craft\geoaddress\fields {
-    if (!\class_exists(GeoAddressField::class)) {
-        /** @deprecated this is an alias for \oym\craft\geoaddress\fields\GeoAddressField */
-        class GeoAddressField
-        {
-        }
-    }
-}
-
-namespace tde\craft\geoaddress\gql\types {
-    if (!\class_exists(AddressType::class)) {
-        /** @deprecated this is an alias for \oym\craft\geoaddress\gql\types\AddressType */
-        class AddressType
-        {
-        }
-    }
-}
-
-namespace tde\craft\geoaddress\migrations {
-    if (!\class_exists(m220516_144416_update_field_handle::class)) {
-        /** @deprecated this is an alias for \oym\craft\geoaddress\migrations\m220516_144416_update_field_handle */
-        class m220516_144416_update_field_handle
-        {
-        }
-    }
-}
-
-namespace tde\craft\geoaddress\models {
-    if (!\class_exists(GeoAddressModel::class)) {
-        /** @deprecated this is an alias for \oym\craft\geoaddress\models\GeoAddressModel */
-        class GeoAddressModel
-        {
-        }
-    }
-
-    if (!\class_exists(GeoAddressSettingsModel::class)) {
-        /** @deprecated this is an alias for \oym\craft\geoaddress\models\GeoAddressSettingsModel */
-        class GeoAddressSettingsModel
-        {
-        }
-    }
-}
-
-namespace tde\craft\geoaddress\services {
-    if (!\class_exists(GeoAddressService::class)) {
-        /** @deprecated this is an alias for \oym\craft\geoaddress\services\GeoAddressService */
-        class GeoAddressService
-        {
-        }
-    }
-}
-
-namespace tde\craft\geoaddress\twigextensions {
-    if (!\class_exists(GeoAddressTwigExtension::class)) {
-        /** @deprecated this is an alias for \oym\craft\geoaddress\twigextensions\GeoAddressTwigExtension */
-        class GeoAddressTwigExtension
-        {
-        }
-    }
-}
diff --git a/src/fields/GeoAddressField.php b/src/fields/GeoAddressField.php
index 6248cc7..078bcd1 100644
--- a/src/fields/GeoAddressField.php
+++ b/src/fields/GeoAddressField.php
@@ -4,7 +4,6 @@
 
 namespace oym\craft\geoaddress\fields;
 
-use Craft;
 use craft\base\ElementInterface;
 use craft\base\Field;
 use craft\base\PreviewableFieldInterface;
@@ -30,9 +29,9 @@ public function getInputHtml($value, ElementInterface $element = null): string
         }
 
         $id = Html::id($this->handle);
-        $namespacedId = Craft::$app->getView()->namespaceInputId($id);
+        $namespacedId = \Craft::$app->getView()->namespaceInputId($id);
 
-        return Craft::$app->getView()->renderTemplate(
+        return \Craft::$app->getView()->renderTemplate(
             'geoaddress/_components/fields/GeoAddressField_input',
             [
                 'name' => $this->handle,
diff --git a/src/migrations/m220516_144416_update_field_handle.php b/src/migrations/m220516_144416_update_field_handle.php
index f9de666..0af9238 100644
--- a/src/migrations/m220516_144416_update_field_handle.php
+++ b/src/migrations/m220516_144416_update_field_handle.php
@@ -2,7 +2,6 @@
 
 namespace oym\craft\geoaddress\migrations;
 
-use Craft;
 use craft\db\Migration;
 use craft\db\Table;
 use oym\craft\geoaddress\fields\GeoAddressField;
diff --git a/src/services/GeoAddressService.php b/src/services/GeoAddressService.php
index acc1cd4..d643597 100644
--- a/src/services/GeoAddressService.php
+++ b/src/services/GeoAddressService.php
@@ -4,7 +4,6 @@
 
 namespace oym\craft\geoaddress\services;
 
-use Craft;
 use craft\base\Component;
 use oym\craft\geoaddress\GeoAddress;
 use oym\craft\geoaddress\models\GeoAddressModel;
@@ -41,8 +40,8 @@ public function getCoordsByAddress(string $addressQuery, string $country): array
 
         // no results
         if (!$result || $result['status'] !== 'OK' || empty($result['results'])) {
-            Craft::warning(
-                Craft::t(
+            \Craft::warning(
+                \Craft::t(
                     'geoaddress',
                     'GeoAddress coding failed: ' . $result['status']
                 ),