diff --git a/.gitignore b/.gitignore
index 2f8f535..3561c12 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-# .gitignore for M2-Postcode.nl module by Flekto
 .DS_Store
 vendor
 composer.lock
diff --git a/Api/Data/Autocomplete.php b/Api/Data/Autocomplete.php
index 41f4049..1bf1b18 100644
--- a/Api/Data/Autocomplete.php
+++ b/Api/Data/Autocomplete.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Flekto\Postcode\Api\Data;
+namespace PostcodeEu\AddressValidation\Api\Data;
 
 class Autocomplete implements AutocompleteInterface
 {
diff --git a/Api/Data/Autocomplete/AutocompleteMatch.php b/Api/Data/Autocomplete/AutocompleteMatch.php
index dabaf51..e9702df 100644
--- a/Api/Data/Autocomplete/AutocompleteMatch.php
+++ b/Api/Data/Autocomplete/AutocompleteMatch.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Flekto\Postcode\Api\Data\Autocomplete;
+namespace PostcodeEu\AddressValidation\Api\Data\Autocomplete;
 
 class AutocompleteMatch implements MatchInterface
 {
diff --git a/Api/Data/Autocomplete/AutocompleteMatch/HighlightInterface.php b/Api/Data/Autocomplete/AutocompleteMatch/HighlightInterface.php
index d586f5b..24f921f 100644
--- a/Api/Data/Autocomplete/AutocompleteMatch/HighlightInterface.php
+++ b/Api/Data/Autocomplete/AutocompleteMatch/HighlightInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Flekto\Postcode\Api\Data\Autocomplete\AutocompleteMatch;
+namespace PostcodeEu\AddressValidation\Api\Data\Autocomplete\AutocompleteMatch;
 
 interface HighlightInterface
 {
diff --git a/Api/Data/Autocomplete/MatchInterface.php b/Api/Data/Autocomplete/MatchInterface.php
index 59d4314..92e9393 100644
--- a/Api/Data/Autocomplete/MatchInterface.php
+++ b/Api/Data/Autocomplete/MatchInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Flekto\Postcode\Api\Data\Autocomplete;
+namespace PostcodeEu\AddressValidation\Api\Data\Autocomplete;
 
 interface MatchInterface
 {
@@ -30,7 +30,7 @@ public function getPrecision(): string;
     public function getContext(): string;
 
     /**
-     * @return Flekto\Postcode\Api\Data\Autocomplete\AutocompleteMatch\HighlightInterface[]
+     * @return PostcodeEu\AddressValidation\Api\Data\Autocomplete\AutocompleteMatch\HighlightInterface[]
      */
     public function getHighlights(): array;
 }
diff --git a/Api/Data/AutocompleteInterface.php b/Api/Data/AutocompleteInterface.php
index 3729cdd..e86e365 100644
--- a/Api/Data/AutocompleteInterface.php
+++ b/Api/Data/AutocompleteInterface.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Flekto\Postcode\Api\Data;
+namespace PostcodeEu\AddressValidation\Api\Data;
 
 interface AutocompleteInterface
 {
     /**
-     * @return Flekto\Postcode\Api\Data\Autocomplete\MatchInterface[]
+     * @return PostcodeEu\AddressValidation\Api\Data\Autocomplete\MatchInterface[]
      */
     public function getMatches(): array;
 
@@ -25,7 +25,7 @@ public function getMessage(): ?string;
     public function getException(): ?string;
 
     /**
-     * @return Flekto\Postcode\Api\Data\MagentoDebugInfoInterface|null
+     * @return PostcodeEu\AddressValidation\Api\Data\MagentoDebugInfoInterface|null
      */
     public function getMagentoDebugInfo(): ?MagentoDebugInfoInterface;
 }
diff --git a/Api/Data/MagentoDebugInfo.php b/Api/Data/MagentoDebugInfo.php
index 354a4f9..2c4ccf8 100644
--- a/Api/Data/MagentoDebugInfo.php
+++ b/Api/Data/MagentoDebugInfo.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Flekto\Postcode\Api\Data;
+namespace PostcodeEu\AddressValidation\Api\Data;
 
 class MagentoDebugInfo implements MagentoDebugInfoInterface
 {
diff --git a/Api/Data/MagentoDebugInfo/Configuration.php b/Api/Data/MagentoDebugInfo/Configuration.php
index 99039ae..39114b6 100644
--- a/Api/Data/MagentoDebugInfo/Configuration.php
+++ b/Api/Data/MagentoDebugInfo/Configuration.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Flekto\Postcode\Api\Data\MagentoDebugInfo;
+namespace PostcodeEu\AddressValidation\Api\Data\MagentoDebugInfo;
 
 class Configuration implements ConfigurationInterface
 {
diff --git a/Api/Data/MagentoDebugInfo/ConfigurationInterface.php b/Api/Data/MagentoDebugInfo/ConfigurationInterface.php
index c920824..8f5b8e9 100644
--- a/Api/Data/MagentoDebugInfo/ConfigurationInterface.php
+++ b/Api/Data/MagentoDebugInfo/ConfigurationInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Flekto\Postcode\Api\Data\MagentoDebugInfo;
+namespace PostcodeEu\AddressValidation\Api\Data\MagentoDebugInfo;
 
 interface ConfigurationInterface
 {
diff --git a/Api/Data/MagentoDebugInfo/MagentoModule.php b/Api/Data/MagentoDebugInfo/MagentoModule.php
index 2757e3c..3c0fb0d 100644
--- a/Api/Data/MagentoDebugInfo/MagentoModule.php
+++ b/Api/Data/MagentoDebugInfo/MagentoModule.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Flekto\Postcode\Api\Data\MagentoDebugInfo;
+namespace PostcodeEu\AddressValidation\Api\Data\MagentoDebugInfo;
 
 class MagentoModule implements MagentoModuleInterface
 {
diff --git a/Api/Data/MagentoDebugInfo/MagentoModuleInterface.php b/Api/Data/MagentoDebugInfo/MagentoModuleInterface.php
index 5c1cd2a..ed87841 100644
--- a/Api/Data/MagentoDebugInfo/MagentoModuleInterface.php
+++ b/Api/Data/MagentoDebugInfo/MagentoModuleInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Flekto\Postcode\Api\Data\MagentoDebugInfo;
+namespace PostcodeEu\AddressValidation\Api\Data\MagentoDebugInfo;
 
 interface MagentoModuleInterface
 {
diff --git a/Api/Data/MagentoDebugInfoInterface.php b/Api/Data/MagentoDebugInfoInterface.php
index 477549e..c9d4d1c 100644
--- a/Api/Data/MagentoDebugInfoInterface.php
+++ b/Api/Data/MagentoDebugInfoInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Flekto\Postcode\Api\Data;
+namespace PostcodeEu\AddressValidation\Api\Data;
 
 interface MagentoDebugInfoInterface
 {
@@ -25,12 +25,12 @@ public function getClient(): string;
     public function getSession(): string;
 
     /**
-     * @return Flekto\Postcode\Api\Data\MagentoDebugInfo\ConfigurationInterface
+     * @return PostcodeEu\AddressValidation\Api\Data\MagentoDebugInfo\ConfigurationInterface
      */
     public function getConfiguration(): MagentoDebugInfo\ConfigurationInterface;
 
     /**
-     * @return Flekto\Postcode\Api\Data\MagentoDebugInfo\MagentoModuleInterface[]
+     * @return PostcodeEu\AddressValidation\Api\Data\MagentoDebugInfo\MagentoModuleInterface[]
      */
     public function getModules(): array;
 }
diff --git a/Api/Data/UpdateNotificationInterface.php b/Api/Data/UpdateNotificationInterface.php
index 02e1f6c..6c71ba3 100644
--- a/Api/Data/UpdateNotificationInterface.php
+++ b/Api/Data/UpdateNotificationInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Flekto\Postcode\Api\Data;
+namespace PostcodeEu\AddressValidation\Api\Data;
 
 /**
  * @api
diff --git a/Api/PostcodeModelInterface.php b/Api/PostcodeModelInterface.php
index f6957ca..a2b10da 100644
--- a/Api/PostcodeModelInterface.php
+++ b/Api/PostcodeModelInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Flekto\Postcode\Api;
+namespace PostcodeEu\AddressValidation\Api;
 
 interface PostcodeModelInterface
 {
@@ -9,9 +9,9 @@ interface PostcodeModelInterface
      * @access public
      * @param string $context
      * @param string $term
-     * @return \Flekto\Postcode\Api\Data\AutocompleteInterface
+     * @return \PostcodeEu\AddressValidation\Api\Data\AutocompleteInterface
      */
-    public function getAddressAutocomplete(string $context, string $term): \Flekto\Postcode\Api\Data\AutocompleteInterface;
+    public function getAddressAutocomplete(string $context, string $term): \PostcodeEu\AddressValidation\Api\Data\AutocompleteInterface;
 
     /**
      * @access public
diff --git a/Api/UpdateNotificationRepositoryInterface.php b/Api/UpdateNotificationRepositoryInterface.php
index 8a1c37c..05a8770 100644
--- a/Api/UpdateNotificationRepositoryInterface.php
+++ b/Api/UpdateNotificationRepositoryInterface.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Flekto\Postcode\Api;
+namespace PostcodeEu\AddressValidation\Api;
 
-use Flekto\Postcode\Api\Data\UpdateNotificationInterface;
+use PostcodeEu\AddressValidation\Api\Data\UpdateNotificationInterface;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
 
diff --git a/Block/Checkout/AttributeMerger.php b/Block/Checkout/AttributeMerger.php
index ae7c997..512f3fc 100644
--- a/Block/Checkout/AttributeMerger.php
+++ b/Block/Checkout/AttributeMerger.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Flekto\Postcode\Block\Checkout;
+namespace PostcodeEu\AddressValidation\Block\Checkout;
 
 use Magento\Checkout\Block\Checkout\AttributeMerger as BaseAttributeMerger;
 
@@ -24,8 +24,8 @@ protected function getMultilineFieldConfig($attributeCode, array $attributeConfi
 
         if ($attributeCode === 'street') {
             // NB. collection component must end in '/group' or Magento's shipping rates validator will break.
-            $config['component'] = 'Flekto_Postcode/js/form/components/street/group';
-            $config['config']['template'] = 'Flekto_Postcode/group/street';
+            $config['component'] = 'PostcodeEu_AddressValidation/js/form/components/street/group';
+            $config['config']['template'] = 'PostcodeEu_AddressValidation/group/street';
         }
 
         return $config;
diff --git a/Block/Customer/Address/Autofill.php b/Block/Customer/Address/Autofill.php
index 21dce6d..5e91698 100644
--- a/Block/Customer/Address/Autofill.php
+++ b/Block/Customer/Address/Autofill.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Flekto\Postcode\Block\Customer\Address;
+namespace PostcodeEu\AddressValidation\Block\Customer\Address;
 
 class Autofill extends \Magento\Framework\View\Element\Template
 {
diff --git a/Block/Onepage/LayoutProcessor.php b/Block/Onepage/LayoutProcessor.php
index a3b72fb..69c5d58 100644
--- a/Block/Onepage/LayoutProcessor.php
+++ b/Block/Onepage/LayoutProcessor.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Flekto\Postcode\Block\Onepage;
+namespace PostcodeEu\AddressValidation\Block\Onepage;
 
 use Magento\Framework\View\Element\AbstractBlock;
 use Magento\Checkout\Block\Checkout\LayoutProcessorInterface;
 use Magento\Framework\View\Element\Template\Context;
 use Magento\Framework\Exception\LocalizedException;
-use Flekto\Postcode\Helper\StoreConfigHelper;
+use PostcodeEu\AddressValidation\Helper\StoreConfigHelper;
 
 class LayoutProcessor extends AbstractBlock implements LayoutProcessorInterface
 {
diff --git a/Block/System/Config/Status.php b/Block/System/Config/Status.php
index 3195523..aa2f2b9 100644
--- a/Block/System/Config/Status.php
+++ b/Block/System/Config/Status.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Flekto\Postcode\Block\System\Config;
+namespace PostcodeEu\AddressValidation\Block\System\Config;
 
-use Flekto\Postcode\Helper\StoreConfigHelper;
-use Flekto\Postcode\Helper\ApiClientHelper;
-use Flekto\Postcode\Helper\Data as DataHelper;
-use Flekto\Postcode\Model\UpdateNotification\UpdateNotifier;
+use PostcodeEu\AddressValidation\Helper\StoreConfigHelper;
+use PostcodeEu\AddressValidation\Helper\ApiClientHelper;
+use PostcodeEu\AddressValidation\Helper\Data as DataHelper;
+use PostcodeEu\AddressValidation\Model\UpdateNotification\UpdateNotifier;
 use Magento\Backend\Block\Template;
 use Magento\Framework\Data\Form\Element\AbstractElement;
 use Magento\Framework\Data\Form\Element\Renderer\RendererInterface;
@@ -19,7 +19,7 @@ class Status extends Template implements RendererInterface
     public const CACHE_ID = 'postcode-eu-status';
     public const CACHE_LIFETIME_SECONDS = 3600;
 
-    protected $_template = 'Flekto_Postcode::system/config/status.phtml';
+    protected $_template = 'PostcodeEu_AddressValidation::system/config/status.phtml';
     protected $_scopeConfig;
     protected $_storeConfigHelper;
     protected $_apiClientHelper;
diff --git a/Block/System/Config/Status/Exception.php b/Block/System/Config/Status/Exception.php
index 035e730..5a4f86c 100644
--- a/Block/System/Config/Status/Exception.php
+++ b/Block/System/Config/Status/Exception.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Flekto\Postcode\Block\System\Config\Status;
+namespace PostcodeEu\AddressValidation\Block\System\Config\Status;
 
 class Exception extends \Magento\Framework\Exception\LocalizedException
 {
diff --git a/Cron/NotifyModuleUpdate.php b/Cron/NotifyModuleUpdate.php
index e48e4ef..4381827 100644
--- a/Cron/NotifyModuleUpdate.php
+++ b/Cron/NotifyModuleUpdate.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Flekto\Postcode\Cron;
+namespace PostcodeEu\AddressValidation\Cron;
 
 use Psr\Log\LoggerInterface;
-use Flekto\Postcode\Helper\Data as DataHelper;
-use Flekto\Postcode\Model\UpdateNotification\UpdateNotifier;
+use PostcodeEu\AddressValidation\Helper\Data as DataHelper;
+use PostcodeEu\AddressValidation\Model\UpdateNotification\UpdateNotifier;
 
 class NotifyModuleUpdate
 {
@@ -43,7 +43,7 @@ public function execute(): void
         if (($moduleInfo['has_update'] ?? false)
             && $this->_updateNotifier->notifyVersion($moduleInfo['latest_version'])
         ) {
-            $this->_logger->info(__('Added notification for Postcode.eu Address API %1 update.', $moduleInfo['latest_version']));
+            $this->_logger->info(__('Added notification for Postcode.eu Address Validation %1 update.', $moduleInfo['latest_version']));
         }
     }
 }
diff --git a/Cron/UpdateApiData.php b/Cron/UpdateApiData.php
index 1e4f436..5d3adba 100644
--- a/Cron/UpdateApiData.php
+++ b/Cron/UpdateApiData.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Flekto\Postcode\Cron;
+namespace PostcodeEu\AddressValidation\Cron;
 
-use Flekto\Postcode\Helper\ApiClientHelper;
-use Flekto\Postcode\Helper\StoreConfigHelper;
+use PostcodeEu\AddressValidation\Helper\ApiClientHelper;
+use PostcodeEu\AddressValidation\Helper\StoreConfigHelper;
 use Magento\Framework\App\Config\Storage\WriterInterface;
 use Psr\Log\LoggerInterface;
 
diff --git a/Data/Form/Element/AddressAutofill.php b/Data/Form/Element/AddressAutofill.php
index 0e7f83e..c9b53b6 100644
--- a/Data/Form/Element/AddressAutofill.php
+++ b/Data/Form/Element/AddressAutofill.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Flekto\Postcode\Data\Form\Element;
+namespace PostcodeEu\AddressValidation\Data\Form\Element;
 
 use Magento\Framework\Data\Form\Element\AbstractElement;
 use Magento\Framework\Data\Form\Element\CollectionFactory;
@@ -47,7 +47,7 @@ public function getElementHtml(): string
             $this->getId(),
             [
                 'data' => [
-                    'template' => 'Flekto_Postcode::form/element/address-autofill.phtml',
+                    'template' => 'PostcodeEu_AddressValidation::form/element/address-autofill.phtml',
                     'jsLayout' => $this->getJsLayout(),
                 ],
             ],
@@ -66,7 +66,7 @@ public function getJsLayout(): array
         return [
             'components' => [
                 $this->getId() => [
-                    'component' => 'Flekto_Postcode/js/view/address/autofill',
+                    'component' => 'PostcodeEu_AddressValidation/js/view/address/autofill',
                     'config' => [
                         'settings' => $this->getData('settings'),
                         'htmlIdPrefix' => $this->getData('htmlIdPrefix'),
@@ -76,7 +76,7 @@ public function getJsLayout(): array
                     ],
                     'children' => [
                         'address_autofill_nl' => [
-                            'component' => 'Flekto_Postcode/js/view/form/sales/order_create/address-autofill-nl',
+                            'component' => 'PostcodeEu_AddressValidation/js/view/form/sales/order_create/address-autofill-nl',
                             'config' => [
                                 'componentDisabled' => $this->getData('isNlComponentDisabled'),
                             ],
@@ -86,7 +86,7 @@ public function getJsLayout(): array
                                     'label' => __('Zip/Postal Code'),
                                     'config' => [
                                         'template' => 'ui/form/field',
-                                        'elementTmpl' => 'Flekto_Postcode/form/element/address-autofill-field',
+                                        'elementTmpl' => 'PostcodeEu_AddressValidation/form/element/address-autofill-field',
                                         'placeholder' => '1234 AB',
                                         'imports' => [
                                             'visible' => '${ $.parentName }:visible',
@@ -101,7 +101,7 @@ public function getJsLayout(): array
                                     ],
                                     'config' => [
                                         'template' => 'ui/form/field',
-                                        'elementTmpl' => 'Flekto_Postcode/form/element/address-autofill-field',
+                                        'elementTmpl' => 'PostcodeEu_AddressValidation/form/element/address-autofill-field',
                                         'imports' => [
                                             'visible' => '${ $.parentName }:visible',
                                         ],
@@ -119,7 +119,7 @@ public function getJsLayout(): array
                             ],
                         ],
                         'address_autofill_intl' => [
-                            'component' => 'Flekto_Postcode/js/view/form/sales/order_create/address-autofill-intl',
+                            'component' => 'PostcodeEu_AddressValidation/js/view/form/sales/order_create/address-autofill-intl',
                             'label' => __('Find an address'),
                             'placeholder' => __('City, street or postcode')
                         ],
diff --git a/GraphQl/Exception/GraphQlHeaderException.php b/GraphQl/Exception/GraphQlHeaderException.php
index 19ce080..6344e12 100644
--- a/GraphQl/Exception/GraphQlHeaderException.php
+++ b/GraphQl/Exception/GraphQlHeaderException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Flekto\Postcode\GraphQl\Exception;
+namespace PostcodeEu\AddressValidation\GraphQl\Exception;
 
 use GraphQL\Error\ClientAware;
 use Magento\Framework\Exception\LocalizedException;
diff --git a/HTTP/Client/Curl.php b/HTTP/Client/Curl.php
index 761d72e..d65cb3c 100644
--- a/HTTP/Client/Curl.php
+++ b/HTTP/Client/Curl.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Flekto\Postcode\HTTP\Client;
+namespace PostcodeEu\AddressValidation\HTTP\Client;
 
 /**
  * Extend Curl class to isolate configured curl options from the rest of the application.
diff --git a/Helper/ApiClientHelper.php b/Helper/ApiClientHelper.php
index cbbf39f..eac8b10 100644
--- a/Helper/ApiClientHelper.php
+++ b/Helper/ApiClientHelper.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Flekto\Postcode\Helper;
+namespace PostcodeEu\AddressValidation\Helper;
 
 use Exception;
-use Flekto\Postcode\Helper\StoreConfigHelper;
-use Flekto\Postcode\Service\Exception\NotFoundException;
-use Flekto\Postcode\Service\PostcodeApiClient;
+use PostcodeEu\AddressValidation\Helper\StoreConfigHelper;
+use PostcodeEu\AddressValidation\Service\Exception\NotFoundException;
+use PostcodeEu\AddressValidation\Service\PostcodeApiClient;
 use Magento\Customer\Helper\Address as AddressHelper;
 use Magento\Developer\Helper\Data;
 use Magento\Directory\Model\RegionFactory;
@@ -353,7 +353,7 @@ public function getNlAddress(string $zipCode, string $houseNumber): array
      */
     private function _handleClientException(\Exception $exception): array
     {
-        if (!$exception instanceof \Flekto\Postcode\Service\Exception\NotFoundException) {
+        if (!$exception instanceof \PostcodeEu\AddressValidation\Service\Exception\NotFoundException) {
             $this->_logger->error($exception->getMessage(), ['exception' => $exception]);
         }
 
@@ -422,7 +422,7 @@ public function getSupportedCountries(): array
      * Validate a full address, correcting and completing all parts of the address.
      *
      * @access public
-     * @see \Flekto\Postcode\Service\PostcodeApiClient::validateAddress()
+     * @see \PostcodeEu\AddressValidation\Service\PostcodeApiClient::validateAddress()
      * @return array
      */
     public function validateAddress(): array
diff --git a/Helper/Data.php b/Helper/Data.php
index 3d68942..a3f9503 100644
--- a/Helper/Data.php
+++ b/Helper/Data.php
@@ -1,17 +1,17 @@
 <?php
 
-namespace Flekto\Postcode\Helper;
+namespace PostcodeEu\AddressValidation\Helper;
 
-use Flekto\Postcode\Helper\StoreConfigHelper;
-use Flekto\Postcode\Model\Config\Source\NlInputBehavior;
-use Flekto\Postcode\Model\Config\Source\ShowHideAddressFields;
+use PostcodeEu\AddressValidation\Helper\StoreConfigHelper;
+use PostcodeEu\AddressValidation\Model\Config\Source\NlInputBehavior;
+use PostcodeEu\AddressValidation\Model\Config\Source\ShowHideAddressFields;
 use Magento\Framework\App\Helper\AbstractHelper;
 use Magento\Framework\App\Helper\Context;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\Filesystem\DirectoryList;
+use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Filesystem\DriverInterface;
-use Flekto\Postcode\HTTP\Client\Curl;
-use Flekto\Postcode\Service\Exception\CurlException;
+use PostcodeEu\AddressValidation\HTTP\Client\Curl;
+use PostcodeEu\AddressValidation\Service\Exception\CurlException;
 
 class Data extends AbstractHelper
 {
@@ -153,7 +153,7 @@ public function getModuleInfo(): array
      */
     private function _getPackageData(): array
     {
-        $path = $this->_dir->getPath('var') . '/Flekto_Postcode';
+        $path = $this->_dir->getPath(DirectoryList::VAR_DIR) . '/PostcodeEu_AddressValidation';
         if (!$this->_fs->isDirectory($path)) {
             $this->_fs->createDirectory($path, 0755);
         }
diff --git a/Helper/StoreConfigHelper.php b/Helper/StoreConfigHelper.php
index 1de1066..34c9d3e 100644
--- a/Helper/StoreConfigHelper.php
+++ b/Helper/StoreConfigHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Flekto\Postcode\Helper;
+namespace PostcodeEu\AddressValidation\Helper;
 
 use Magento\Framework\App\Helper\AbstractHelper;
 use Magento\Framework\App\Helper\Context;
@@ -10,8 +10,8 @@
 use Magento\Framework\Encryption\EncryptorInterface;
 use Magento\Directory\Model\ResourceModel\Country\CollectionFactory as CountryCollectionFactory;
 use Magento\Framework\Locale\ResolverInterface;
-use Flekto\Postcode\Model\Config\Source\NlInputBehavior;
-use Flekto\Postcode\Model\Config\Source\ShowHideAddressFields;
+use PostcodeEu\AddressValidation\Model\Config\Source\NlInputBehavior;
+use PostcodeEu\AddressValidation\Model\Config\Source\ShowHideAddressFields;
 
 class StoreConfigHelper extends AbstractHelper
 {
diff --git a/Model/Config/Source/AdminAddressAutocompleteBehavior.php b/Model/Config/Source/AdminAddressAutocompleteBehavior.php
index cd3bca8..7dd81b6 100644
--- a/Model/Config/Source/AdminAddressAutocompleteBehavior.php
+++ b/Model/Config/Source/AdminAddressAutocompleteBehavior.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Flekto\Postcode\Model\Config\Source;
+namespace PostcodeEu\AddressValidation\Model\Config\Source;
 
 class AdminAddressAutocompleteBehavior implements \Magento\Framework\Data\OptionSourceInterface
 {
diff --git a/Model/Config/Source/DisabledCountries.php b/Model/Config/Source/DisabledCountries.php
index 811eddc..0f1e8c8 100644
--- a/Model/Config/Source/DisabledCountries.php
+++ b/Model/Config/Source/DisabledCountries.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Flekto\Postcode\Model\Config\Source;
+namespace PostcodeEu\AddressValidation\Model\Config\Source;
 
-use Flekto\Postcode\Helper\StoreConfigHelper;
+use PostcodeEu\AddressValidation\Helper\StoreConfigHelper;
 
 class DisabledCountries implements \Magento\Framework\Data\OptionSourceInterface
 {
diff --git a/Model/Config/Source/NlInputBehavior.php b/Model/Config/Source/NlInputBehavior.php
index 8c16b3d..bd8fdce 100644
--- a/Model/Config/Source/NlInputBehavior.php
+++ b/Model/Config/Source/NlInputBehavior.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Flekto\Postcode\Model\Config\Source;
+namespace PostcodeEu\AddressValidation\Model\Config\Source;
 
 class NlInputBehavior implements \Magento\Framework\Data\OptionSourceInterface
 {
diff --git a/Model/Config/Source/ShowHideAddressFields.php b/Model/Config/Source/ShowHideAddressFields.php
index dba13eb..1635506 100644
--- a/Model/Config/Source/ShowHideAddressFields.php
+++ b/Model/Config/Source/ShowHideAddressFields.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Flekto\Postcode\Model\Config\Source;
+namespace PostcodeEu\AddressValidation\Model\Config\Source;
 
 class ShowHideAddressFields implements \Magento\Framework\Data\OptionSourceInterface
 {
diff --git a/Model/PostcodeModel.php b/Model/PostcodeModel.php
index 7f24497..137e63c 100644
--- a/Model/PostcodeModel.php
+++ b/Model/PostcodeModel.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Flekto\Postcode\Model;
+namespace PostcodeEu\AddressValidation\Model;
 
-use Flekto\Postcode\Helper\ApiClientHelper;
-use Flekto\Postcode\Api\PostcodeModelInterface;
-use Flekto\Postcode\Api\Data\Autocomplete as AutocompleteData;
-use Flekto\Postcode\Api\Data\AutocompleteInterface as AutocompleteDataInterface;
+use PostcodeEu\AddressValidation\Helper\ApiClientHelper;
+use PostcodeEu\AddressValidation\Api\PostcodeModelInterface;
+use PostcodeEu\AddressValidation\Api\Data\Autocomplete as AutocompleteData;
+use PostcodeEu\AddressValidation\Api\Data\AutocompleteInterface as AutocompleteDataInterface;
 
 class PostcodeModel implements PostcodeModelInterface
 {
diff --git a/Model/Resolver/AddressApiSettings.php b/Model/Resolver/AddressApiSettings.php
index 5a20da8..6c3dbdb 100644
--- a/Model/Resolver/AddressApiSettings.php
+++ b/Model/Resolver/AddressApiSettings.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Flekto\Postcode\Model\Resolver;
+namespace PostcodeEu\AddressValidation\Model\Resolver;
 
-use Flekto\Postcode\Helper\StoreConfigHelper;
+use PostcodeEu\AddressValidation\Helper\StoreConfigHelper;
 
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
diff --git a/Model/Resolver/DutchAddress.php b/Model/Resolver/DutchAddress.php
index 0408e54..f354793 100644
--- a/Model/Resolver/DutchAddress.php
+++ b/Model/Resolver/DutchAddress.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Flekto\Postcode\Model\Resolver;
+namespace PostcodeEu\AddressValidation\Model\Resolver;
 
-use Flekto\Postcode\Helper\ApiClientHelper;
+use PostcodeEu\AddressValidation\Helper\ApiClientHelper;
 
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
diff --git a/Model/Resolver/IntlAddress.php b/Model/Resolver/IntlAddress.php
index b3992ca..a2b44c3 100644
--- a/Model/Resolver/IntlAddress.php
+++ b/Model/Resolver/IntlAddress.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Flekto\Postcode\Model\Resolver;
+namespace PostcodeEu\AddressValidation\Model\Resolver;
 
-use Flekto\Postcode\Helper\ApiClientHelper;
-use Flekto\Postcode\GraphQl\Exception\GraphQlHeaderException;
+use PostcodeEu\AddressValidation\Helper\ApiClientHelper;
+use PostcodeEu\AddressValidation\GraphQl\Exception\GraphQlHeaderException;
 
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\Webapi\Rest\Request as HttpRequest;
@@ -37,7 +37,7 @@ public function __construct(
      */
     protected function requireSessionHeader(): void
     {
-        $headerName = \Flekto\Postcode\Service\PostcodeApiClient::SESSION_HEADER_KEY;
+        $headerName = \PostcodeEu\AddressValidation\Service\PostcodeApiClient::SESSION_HEADER_KEY;
         $headerValue = $this->_httpRequest->getHeader($headerName);
         if (empty($headerValue)) {
             throw new GraphQlHeaderException(__('%1 header not found.', $headerName));
diff --git a/Model/Resolver/IntlAddress/Details.php b/Model/Resolver/IntlAddress/Details.php
index d45f124..b9724eb 100644
--- a/Model/Resolver/IntlAddress/Details.php
+++ b/Model/Resolver/IntlAddress/Details.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Flekto\Postcode\Model\Resolver\IntlAddress;
+namespace PostcodeEu\AddressValidation\Model\Resolver\IntlAddress;
 
-use Flekto\Postcode\Model\Resolver\IntlAddress;
+use PostcodeEu\AddressValidation\Model\Resolver\IntlAddress;
 
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
diff --git a/Model/Resolver/IntlAddress/Matches.php b/Model/Resolver/IntlAddress/Matches.php
index 21c3ca3..f24c6df 100644
--- a/Model/Resolver/IntlAddress/Matches.php
+++ b/Model/Resolver/IntlAddress/Matches.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Flekto\Postcode\Model\Resolver\IntlAddress;
+namespace PostcodeEu\AddressValidation\Model\Resolver\IntlAddress;
 
-use Flekto\Postcode\Model\Resolver\IntlAddress;
+use PostcodeEu\AddressValidation\Model\Resolver\IntlAddress;
 
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
diff --git a/Model/Resolver/ValidatedAddress.php b/Model/Resolver/ValidatedAddress.php
index 2cf5609..0486121 100644
--- a/Model/Resolver/ValidatedAddress.php
+++ b/Model/Resolver/ValidatedAddress.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Flekto\Postcode\Model\Resolver;
+namespace PostcodeEu\AddressValidation\Model\Resolver;
 
-use Flekto\Postcode\Helper\ApiClientHelper;
+use PostcodeEu\AddressValidation\Helper\ApiClientHelper;
 
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
diff --git a/Model/ResourceModel/UpdateNotification.php b/Model/ResourceModel/UpdateNotification.php
index 542e35c..3f7ee0d 100644
--- a/Model/ResourceModel/UpdateNotification.php
+++ b/Model/ResourceModel/UpdateNotification.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Flekto\Postcode\Model\ResourceModel;
+namespace PostcodeEu\AddressValidation\Model\ResourceModel;
 
 use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
 
diff --git a/Model/ResourceModel/UpdateNotification/Collection.php b/Model/ResourceModel/UpdateNotification/Collection.php
index 39a136a..3a04a55 100644
--- a/Model/ResourceModel/UpdateNotification/Collection.php
+++ b/Model/ResourceModel/UpdateNotification/Collection.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Flekto\Postcode\Model\ResourceModel\UpdateNotification;
+namespace PostcodeEu\AddressValidation\Model\ResourceModel\UpdateNotification;
 
-use Flekto\Postcode\Model\UpdateNotification;
-use Flekto\Postcode\Model\ResourceModel\UpdateNotification as UpdateNotificationResourceModel;
+use PostcodeEu\AddressValidation\Model\UpdateNotification;
+use PostcodeEu\AddressValidation\Model\ResourceModel\UpdateNotification as UpdateNotificationResourceModel;
 use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
 
 class Collection extends AbstractCollection
diff --git a/Model/System/Message/LicenceCheck.php b/Model/System/Message/LicenceCheck.php
index 33f1e5e..7857b8f 100644
--- a/Model/System/Message/LicenceCheck.php
+++ b/Model/System/Message/LicenceCheck.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace Flekto\Postcode\Model\System\Message;
+namespace PostcodeEu\AddressValidation\Model\System\Message;
 
-use Flekto\Postcode\Helper\StoreConfigHelper;
+use PostcodeEu\AddressValidation\Helper\StoreConfigHelper;
 use Magento\Framework\Notification\MessageInterface;
 use Magento\Framework\UrlInterface;
 
 class LicenceCheck implements MessageInterface
 {
-    public const MESSAGE_IDENTITY = 'flekto_system_message';
+    public const MESSAGE_IDENTITY = 'postcode_eu_licence_check';
 
     /**
      * @var StoreConfigHelper
@@ -53,7 +53,7 @@ public function getIdentity(): string
      */
     public function isDisplayed(): bool
     {
-        return $this->_storeConfigHelper->getValue('account_status') != \Flekto\Postcode\Helper\ApiClientHelper::API_ACCOUNT_STATUS_ACTIVE;
+        return $this->_storeConfigHelper->getValue('account_status') != \PostcodeEu\AddressValidation\Helper\ApiClientHelper::API_ACCOUNT_STATUS_ACTIVE;
     }
 
     /**
diff --git a/Model/System/Message/RebrandNotice.php b/Model/System/Message/RebrandNotice.php
new file mode 100644
index 0000000..daba2a5
--- /dev/null
+++ b/Model/System/Message/RebrandNotice.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace PostcodeEu\AddressValidation\Model\System\Message;
+
+use Magento\Framework\Notification\MessageInterface;
+use Magento\Framework\Module\ModuleListInterface;
+
+class RebrandNotice implements MessageInterface
+{
+    public const MESSAGE_IDENTITY = 'postcode_eu_rebrand_notice';
+
+    /** @var ModuleListInterface */
+    protected $moduleList;
+
+    public function __construct(ModuleListInterface $moduleList)
+    {
+        $this->moduleList = $moduleList;
+    }
+
+    /**
+     * @return string
+     */
+    public function getIdentity(): string
+    {
+        return self::MESSAGE_IDENTITY;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isDisplayed(): bool
+    {
+        foreach ($this->moduleList->getAll() as $module)
+        {
+            if (isset($module['sequence']) && in_array('Flekto_Postcode', $module['sequence']))
+            {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * @return string
+     */
+    public function getText(): string
+    {
+        return (string)__(
+            'Compatibility notice: The Postcode.eu Address Validation module has been rebranded. ' .
+            'The PHP namespace has changed from <code>Flekto\Postcode</code> to <code>PostcodeEu\AddressValidation</code>. ' .
+            'Since your installation contains custom code or integrations relying on the old namespace, ' .
+            'please update your references to ensure continued compatibility. '
+        );
+    }
+
+    /**
+     * @return int
+     */
+    public function getSeverity(): int
+    {
+        return self::SEVERITY_MINOR;
+    }
+}
diff --git a/Model/UpdateNotification.php b/Model/UpdateNotification.php
index b2d8ce4..4d1c5ff 100644
--- a/Model/UpdateNotification.php
+++ b/Model/UpdateNotification.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Flekto\Postcode\Model;
+namespace PostcodeEu\AddressValidation\Model;
 
-use Flekto\Postcode\Api\Data\UpdateNotificationInterface;
+use PostcodeEu\AddressValidation\Api\Data\UpdateNotificationInterface;
 use Magento\Framework\Model\AbstractModel;
 
 class UpdateNotification extends AbstractModel implements UpdateNotificationInterface
diff --git a/Model/UpdateNotification/UpdateNotifier.php b/Model/UpdateNotification/UpdateNotifier.php
index d769e7a..e84b40e 100644
--- a/Model/UpdateNotification/UpdateNotifier.php
+++ b/Model/UpdateNotification/UpdateNotifier.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Flekto\Postcode\Model\UpdateNotification;
+namespace PostcodeEu\AddressValidation\Model\UpdateNotification;
 
-use Flekto\Postcode\Api\UpdateNotificationRepositoryInterface;
+use PostcodeEu\AddressValidation\Api\UpdateNotificationRepositoryInterface;
 use Magento\Framework\Notification\NotifierInterface;
 
 class UpdateNotifier
@@ -44,10 +44,10 @@ public function notifyVersion(string $version): bool
         }
 
         $this->_notifier->addNotice(
-            __('Postcode.eu Address API update available'),
+            __('Postcode.eu Address Validation update available'),
             __('Stay ahead with our latest update.
                 Get the newest features and improvements for our Postcode.eu address validation module.'),
-            \Flekto\Postcode\Helper\Data::MODULE_RELEASE_URL
+            \PostcodeEu\AddressValidation\Helper\Data::MODULE_RELEASE_URL
         );
         $this->_updateNotification->setVersionNotified($version);
         return $this->_updateNotification->isVersionNotified($version);
diff --git a/Model/UpdateNotificationRepository.php b/Model/UpdateNotificationRepository.php
index e7b5174..8ad3f2f 100644
--- a/Model/UpdateNotificationRepository.php
+++ b/Model/UpdateNotificationRepository.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Flekto\Postcode\Model;
+namespace PostcodeEu\AddressValidation\Model;
 
-use Flekto\Postcode\Api\UpdateNotificationRepositoryInterface;
-use Flekto\Postcode\Api\Data\UpdateNotificationInterface;
-use Flekto\Postcode\Model\ResourceModel\UpdateNotification as UpdateNotificationResource;
-use Flekto\Postcode\Model\UpdateNotificationFactory;
+use PostcodeEu\AddressValidation\Api\UpdateNotificationRepositoryInterface;
+use PostcodeEu\AddressValidation\Api\Data\UpdateNotificationInterface;
+use PostcodeEu\AddressValidation\Model\ResourceModel\UpdateNotification as UpdateNotificationResource;
+use PostcodeEu\AddressValidation\Model\UpdateNotificationFactory;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\Exception\LocalizedException;
diff --git a/Model/Validator/City.php b/Model/Validator/City.php
index f34335b..d09e6b9 100644
--- a/Model/Validator/City.php
+++ b/Model/Validator/City.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Flekto\Postcode\Model\Validator;
+namespace PostcodeEu\AddressValidation\Model\Validator;
 
 use Magento\Customer\Model\Customer;
 use Magento\Framework\Validator\AbstractValidator;
diff --git a/Observer/System/Config.php b/Observer/System/Config.php
index a412c1b..fc704a1 100644
--- a/Observer/System/Config.php
+++ b/Observer/System/Config.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Flekto\Postcode\Observer\System;
+namespace PostcodeEu\AddressValidation\Observer\System;
 
-use Flekto\Postcode\Helper\ApiClientHelper;
-use Flekto\Postcode\Helper\StoreConfigHelper;
+use PostcodeEu\AddressValidation\Helper\ApiClientHelper;
+use PostcodeEu\AddressValidation\Helper\StoreConfigHelper;
 use Magento\Framework\App\Cache\TypeListInterface;
 use Magento\Framework\App\Cache\Frontend\Pool as CacheFrontendPool;
 use Magento\Framework\App\Config\Storage\WriterInterface;
@@ -89,12 +89,12 @@ public function execute(Observer $observer): void
                 $this->_configWriter->save(StoreConfigHelper::PATH['account_status'], ApiClientHelper::API_ACCOUNT_STATUS_INACTIVE);
             }
 
-        } catch (\Flekto\Postcode\Service\Exception\AuthenticationException $e) {
+        } catch (\PostcodeEu\AddressValidation\Service\Exception\AuthenticationException $e) {
 
             $this->_configWriter->save(StoreConfigHelper::PATH['account_status'], ApiClientHelper::API_ACCOUNT_STATUS_INVALID_CREDENTIALS);
             $this->_configWriter->delete(StoreConfigHelper::PATH['account_name']);
 
-        } catch (\Flekto\Postcode\Service\Exception\ClientException $e) {
+        } catch (\PostcodeEu\AddressValidation\Service\Exception\ClientException $e) {
 
             $this->_configWriter->delete(StoreConfigHelper::PATH['account_name']);
             $this->_configWriter->delete(StoreConfigHelper::PATH['account_status']);
@@ -140,6 +140,6 @@ private function _purgeCachedData(): void
     {
         $this->_cleanConfigCache();
         $cache = $this->_cacheFrontendPool->get(\Magento\Framework\App\Cache\Type\Config::TYPE_IDENTIFIER);
-        $cache->remove(\Flekto\Postcode\Block\System\Config\Status::CACHE_ID);
+        $cache->remove(\PostcodeEu\AddressValidation\Block\System\Config\Status::CACHE_ID);
     }
 }
diff --git a/Plugin/AddAddressAutofillToOrderCreateForm.php b/Plugin/AddAddressAutofillToOrderCreateForm.php
index b2b8e25..1b8bebc 100644
--- a/Plugin/AddAddressAutofillToOrderCreateForm.php
+++ b/Plugin/AddAddressAutofillToOrderCreateForm.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Flekto\Postcode\Plugin;
+namespace PostcodeEu\AddressValidation\Plugin;
 
-use Flekto\Postcode\Helper\Data as DataHelper;
-use Flekto\Postcode\Helper\StoreConfigHelper;
-use Flekto\Postcode\Model\Config\Source\AdminAddressAutocompleteBehavior;
+use PostcodeEu\AddressValidation\Helper\Data as DataHelper;
+use PostcodeEu\AddressValidation\Helper\StoreConfigHelper;
+use PostcodeEu\AddressValidation\Model\Config\Source\AdminAddressAutocompleteBehavior;
 use Magento\Directory\Helper\Data as DirectoryHelper;
 use Magento\Framework\Data\Form;
 use Magento\Sales\Block\Adminhtml\Order\Create\Form\Address as AddressBlock;
@@ -65,7 +65,7 @@ public function afterGetForm(AddressBlock $subject, Form $form)
 
         $fieldset->addType(
             'postcode-eu-address-autofill',
-            \Flekto\Postcode\Data\Form\Element\AddressAutofill::class,
+            \PostcodeEu\AddressValidation\Data\Form\Element\AddressAutofill::class,
         );
         $addressType = $subject->getIsShipping() ? 'shipping' : 'billing';
         $fieldId = $addressType . '_address_autofill';
diff --git a/Plugin/SortSalesOrderAddressFields.php b/Plugin/SortSalesOrderAddressFields.php
index 50b6dc5..65f7f04 100644
--- a/Plugin/SortSalesOrderAddressFields.php
+++ b/Plugin/SortSalesOrderAddressFields.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Flekto\Postcode\Plugin;
+namespace PostcodeEu\AddressValidation\Plugin;
 
 use Magento\Customer\Model\Metadata\Form;
 use Magento\Framework\App\RequestInterface;
-use Flekto\Postcode\Helper\StoreConfigHelper;
+use PostcodeEu\AddressValidation\Helper\StoreConfigHelper;
 
 class SortSalesOrderAddressFields
 {
diff --git a/Plugin/ValidatorPlugin.php b/Plugin/ValidatorPlugin.php
index 069acf6..be5bb91 100644
--- a/Plugin/ValidatorPlugin.php
+++ b/Plugin/ValidatorPlugin.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Flekto\Postcode\Plugin;
+namespace PostcodeEu\AddressValidation\Plugin;
 
 use Magento\Framework\Validator;
 use Magento\Framework\Validator\ValidatorInterface;
@@ -40,7 +40,7 @@ public function beforeAddValidator(
             && method_exists($validator, 'getAlias')
             && $validator->getAlias() === 'city_validator'
         ) {
-            return [new \Flekto\Postcode\Model\Validator\City(), $breakChainOnFailure];
+            return [new \PostcodeEu\AddressValidation\Model\Validator\City(), $breakChainOnFailure];
         }
 
         // Return null if not changing arguments, see
diff --git a/README.md b/README.md
index 4cb5730..9988059 100644
--- a/README.md
+++ b/README.md
@@ -2,13 +2,13 @@
 
 ## International Address API module for Magento 2
 
-Adds autocompletion for addresses to the checkout page. [Multiple countries](https://www.postcode.nl/services/adresdata/internationaal) are supported using official postal data via the [Postcode.eu](https://postcode.eu) API.
+Adds autocompletion for addresses to the checkout page. [Multiple countries](https://www.postcode.eu/products/address-api/international) are supported using official postal data via the [Postcode.eu](https://postcode.eu) API.
 
-This module is maintained by [Postcode.nl](https://postcode.nl) since version 3.0.0. Earlier versions were developed by [Flekto](https://www.flekto.nl).
+This module is maintained by [Postcode.eu](https://postcode.eu).
 
 ## Postcode.eu account
 
-A [Postcode.eu account](https://www.postcode.nl/en/services/adresdata/producten-overzicht) is required.
+A [Postcode.eu account](https://account.postcode.eu) is required.
 Testing is free. After testing you can choose to purchase a subscription.
 
 ## Installation instructions
@@ -61,7 +61,7 @@ Our module now supports GraphQL, allowing you to query address data via Magento'
 
 ## Compatibility
 
-Although we can't guarantee compatibility with other checkout modules, our module works well with most one-step-checkout modules. If you are having issues and think this may be caused by our module, please [contact Postcode.nl](mailto:tech@postcode.nl) and tell us which other module(s) and version(s) are used.
+Although we can't guarantee compatibility with other checkout modules, our module works well with most one-step-checkout modules. If you are having issues and think this may be caused by our module, please [contact Postcode.eu](mailto:tech@postcode.nl) and tell us which other module(s) and version(s) are used.
 
 If you found the solution already and have some code to contribute, feel free to open a pull request in this repository.
 
@@ -76,7 +76,7 @@ Instructions for additional configuration and customization can be found on the
 ## FAQ and Knowledge Base
 
 * View Frequently Asked Questions at https://www.postcode.eu/#faq.
-* For more questions and answers, see https://kb.postcode.nl/help
+* For more questions and answers, see https://kb.postcode.eu
 * If the above didn't answer your question, [contact us](https://www.postcode.eu/contact).
 
 ## License
diff --git a/Service/Exception/AuthenticationException.php b/Service/Exception/AuthenticationException.php
index a1b52f2..1a6375a 100644
--- a/Service/Exception/AuthenticationException.php
+++ b/Service/Exception/AuthenticationException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Flekto\Postcode\Service\Exception;
+namespace PostcodeEu\AddressValidation\Service\Exception;
 
 class AuthenticationException extends ClientException
 {
diff --git a/Service/Exception/BadRequestException.php b/Service/Exception/BadRequestException.php
index f477149..5776d83 100644
--- a/Service/Exception/BadRequestException.php
+++ b/Service/Exception/BadRequestException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Flekto\Postcode\Service\Exception;
+namespace PostcodeEu\AddressValidation\Service\Exception;
 
 class BadRequestException extends ClientException
 {
diff --git a/Service/Exception/ClientException.php b/Service/Exception/ClientException.php
index ba12450..af26dbf 100644
--- a/Service/Exception/ClientException.php
+++ b/Service/Exception/ClientException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Flekto\Postcode\Service\Exception;
+namespace PostcodeEu\AddressValidation\Service\Exception;
 
 class ClientException extends \Exception
 {
diff --git a/Service/Exception/CurlException.php b/Service/Exception/CurlException.php
index 5df4cc7..1ebe0a9 100644
--- a/Service/Exception/CurlException.php
+++ b/Service/Exception/CurlException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Flekto\Postcode\Service\Exception;
+namespace PostcodeEu\AddressValidation\Service\Exception;
 
 class CurlException extends ClientException
 {
diff --git a/Service/Exception/ForbiddenException.php b/Service/Exception/ForbiddenException.php
index 964341d..34aea94 100644
--- a/Service/Exception/ForbiddenException.php
+++ b/Service/Exception/ForbiddenException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Flekto\Postcode\Service\Exception;
+namespace PostcodeEu\AddressValidation\Service\Exception;
 
 class ForbiddenException extends ClientException
 {
diff --git a/Service/Exception/InvalidJsonResponseException.php b/Service/Exception/InvalidJsonResponseException.php
index 788c187..ed0db17 100644
--- a/Service/Exception/InvalidJsonResponseException.php
+++ b/Service/Exception/InvalidJsonResponseException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Flekto\Postcode\Service\Exception;
+namespace PostcodeEu\AddressValidation\Service\Exception;
 
 class InvalidJsonResponseException extends ClientException
 {
diff --git a/Service/Exception/InvalidPostcodeException.php b/Service/Exception/InvalidPostcodeException.php
index 072acc8..cd44c8e 100644
--- a/Service/Exception/InvalidPostcodeException.php
+++ b/Service/Exception/InvalidPostcodeException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Flekto\Postcode\Service\Exception;
+namespace PostcodeEu\AddressValidation\Service\Exception;
 
 class InvalidPostcodeException extends ClientException
 {
diff --git a/Service/Exception/NotFoundException.php b/Service/Exception/NotFoundException.php
index 25ba90e..bd2d0bd 100644
--- a/Service/Exception/NotFoundException.php
+++ b/Service/Exception/NotFoundException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Flekto\Postcode\Service\Exception;
+namespace PostcodeEu\AddressValidation\Service\Exception;
 
 class NotFoundException extends ClientException
 {
diff --git a/Service/Exception/ServerUnavailableException.php b/Service/Exception/ServerUnavailableException.php
index b2b309e..41bf891 100644
--- a/Service/Exception/ServerUnavailableException.php
+++ b/Service/Exception/ServerUnavailableException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Flekto\Postcode\Service\Exception;
+namespace PostcodeEu\AddressValidation\Service\Exception;
 
 class ServerUnavailableException extends ClientException
 {
diff --git a/Service/Exception/TooManyRequestsException.php b/Service/Exception/TooManyRequestsException.php
index 37d174b..b7703ce 100644
--- a/Service/Exception/TooManyRequestsException.php
+++ b/Service/Exception/TooManyRequestsException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Flekto\Postcode\Service\Exception;
+namespace PostcodeEu\AddressValidation\Service\Exception;
 
 class TooManyRequestsException extends ClientException
 {
diff --git a/Service/Exception/UnexpectedException.php b/Service/Exception/UnexpectedException.php
index cb6ac79..94291b6 100644
--- a/Service/Exception/UnexpectedException.php
+++ b/Service/Exception/UnexpectedException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Flekto\Postcode\Service\Exception;
+namespace PostcodeEu\AddressValidation\Service\Exception;
 
 class UnexpectedException extends ClientException
 {
diff --git a/Service/PostcodeApiClient.php b/Service/PostcodeApiClient.php
index 333277f..ab706b3 100644
--- a/Service/PostcodeApiClient.php
+++ b/Service/PostcodeApiClient.php
@@ -1,23 +1,23 @@
 <?php
 
-namespace Flekto\Postcode\Service;
+namespace PostcodeEu\AddressValidation\Service;
 
-use Flekto\Postcode\Helper\StoreConfigHelper;
+use PostcodeEu\AddressValidation\Helper\StoreConfigHelper;
 
 use Magento\Framework\App\ProductMetadataInterface;
 use Magento\Framework\App\Request\Http as HttpRequest;
 
-use Flekto\Postcode\HTTP\Client\Curl;
-use Flekto\Postcode\Service\Exception\AuthenticationException;
-use Flekto\Postcode\Service\Exception\BadRequestException;
-use Flekto\Postcode\Service\Exception\CurlException;
-use Flekto\Postcode\Service\Exception\ForbiddenException;
-use Flekto\Postcode\Service\Exception\InvalidJsonResponseException;
-use Flekto\Postcode\Service\Exception\InvalidPostcodeException;
-use Flekto\Postcode\Service\Exception\NotFoundException;
-use Flekto\Postcode\Service\Exception\ServerUnavailableException;
-use Flekto\Postcode\Service\Exception\TooManyRequestsException;
-use Flekto\Postcode\Service\Exception\UnexpectedException;
+use PostcodeEu\AddressValidation\HTTP\Client\Curl;
+use PostcodeEu\AddressValidation\Service\Exception\AuthenticationException;
+use PostcodeEu\AddressValidation\Service\Exception\BadRequestException;
+use PostcodeEu\AddressValidation\Service\Exception\CurlException;
+use PostcodeEu\AddressValidation\Service\Exception\ForbiddenException;
+use PostcodeEu\AddressValidation\Service\Exception\InvalidJsonResponseException;
+use PostcodeEu\AddressValidation\Service\Exception\InvalidPostcodeException;
+use PostcodeEu\AddressValidation\Service\Exception\NotFoundException;
+use PostcodeEu\AddressValidation\Service\Exception\ServerUnavailableException;
+use PostcodeEu\AddressValidation\Service\Exception\TooManyRequestsException;
+use PostcodeEu\AddressValidation\Service\Exception\UnexpectedException;
 
 class PostcodeApiClient
 {
@@ -75,7 +75,7 @@ public function getUserAgent(): string
         if ($this->_userAgent === null) {
             $this->_userAgent = sprintf(
                 '%s/%s %s/%s/%s PHP/%s',
-                \Flekto\Postcode\Helper\Data::VENDOR_PACKAGE,
+                \PostcodeEu\AddressValidation\Helper\Data::VENDOR_PACKAGE,
                 $this->_storeConfigHelper->getModuleVersion(),
                 $this->_productMetadata->getName(),
                 $this->_productMetadata->getEdition(),
diff --git a/Setup/Patch/Data/EncryptApiSecrets.php b/Setup/Patch/Data/EncryptApiSecrets.php
index 2dc7f1a..6441eef 100644
--- a/Setup/Patch/Data/EncryptApiSecrets.php
+++ b/Setup/Patch/Data/EncryptApiSecrets.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Flekto\Postcode\Setup\Patch\Data;
+namespace PostcodeEu\AddressValidation\Setup\Patch\Data;
 
 use Magento\Framework\App\Config\ConfigResource\ConfigInterface;
 use Magento\Framework\Encryption\EncryptorInterface;
@@ -38,7 +38,7 @@ public function apply(): void
         $this->_resourceConfig->getConnection()->startSetup();
 
         $connection = $this->_resourceConfig->getConnection();
-        $path = \Flekto\Postcode\Helper\StoreConfigHelper::PATH['api_secret'];
+        $path = \PostcodeEu\AddressValidation\Helper\StoreConfigHelper::PATH['api_secret'];
         $select = $connection->select()
             ->from($this->_resourceConfig->getTable('core_config_data'))
             ->where('path = ?', $path);
@@ -48,6 +48,11 @@ public function apply(): void
                 continue;
             }
 
+            // Skip if already encrypted (Magento encrypted values start with '0:')
+            if (str_starts_with($row['value'], '0:')) {
+                continue;
+            }
+
             $encryptedSecret = $this->_encryptor->encrypt($row['value']);
             $this->_resourceConfig->saveConfig($path, $encryptedSecret, $row['scope'], $row['scope_id']);
         }
@@ -62,7 +67,7 @@ public function apply(): void
      */
     public function getAliases(): array
     {
-        return [];
+        return ['Flekto\Postcode\Setup\Patch\Data\EncryptApiSecrets'];
     }
 
     /**
diff --git a/Setup/Patch/Data/UpdateApiStatusConfig.php b/Setup/Patch/Data/UpdateApiStatusConfig.php
index 1d6b17b..c098e36 100644
--- a/Setup/Patch/Data/UpdateApiStatusConfig.php
+++ b/Setup/Patch/Data/UpdateApiStatusConfig.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Flekto\Postcode\Setup\Patch\Data;
+namespace PostcodeEu\AddressValidation\Setup\Patch\Data;
 
-use Flekto\Postcode\Helper\ApiClientHelper;
-use Flekto\Postcode\Helper\StoreConfigHelper;
+use PostcodeEu\AddressValidation\Helper\ApiClientHelper;
+use PostcodeEu\AddressValidation\Helper\StoreConfigHelper;
 use Magento\Framework\App\Config\ConfigResource\ConfigInterface;
 use Magento\Framework\App\Config\Storage\WriterInterface;
 use Magento\Framework\Setup\Patch\DataPatchInterface;
@@ -44,7 +44,7 @@ public function __construct(
      */
     public function getAliases(): array
     {
-        return [];
+        return ['Flekto\Postcode\Setup\Patch\Data\UpdateApiStatusConfig'];
     }
 
     /**
@@ -80,11 +80,23 @@ public function apply(): void
 
         foreach ($scopeValues as $scope => $scopeIdValues) {
             foreach ($scopeIdValues as $scopeId => $credentials) {
-
                 if (empty($credentials[StoreConfigHelper::PATH['api_key']]) || empty($credentials[StoreConfigHelper::PATH['api_secret']])) {
                     continue;
                 }
 
+                // Skip if already migrated
+                $existingStatus = $connection->fetchOne(
+                    $connection->select()
+                        ->from($this->_resourceConfig->getTable('core_config_data'), ['value'])
+                        ->where('path = ?', StoreConfigHelper::PATH['account_status'])
+                        ->where('scope = ?', $scope)
+                        ->where('scope_id = ?', $scopeId)
+                );
+
+                if ($existingStatus !== false) {
+                    continue;
+                }
+
                 try {
 
                     $client = $this->_apiClientHelper->getApiClient();
@@ -104,7 +116,7 @@ public function apply(): void
                         $this->_resourceConfig->saveConfig(StoreConfigHelper::PATH['account_status'], ApiClientHelper::API_ACCOUNT_STATUS_INACTIVE, $scope, $scopeId);
                     }
 
-                } catch (\Flekto\Postcode\Service\Exception\AuthenticationException $e) {
+                } catch (\PostcodeEu\AddressValidation\Service\Exception\AuthenticationException $e) {
 
                     $this->_resourceConfig->saveConfig(StoreConfigHelper::PATH['account_status'], ApiClientHelper::API_ACCOUNT_STATUS_INVALID_CREDENTIALS, $scope, $scopeId);
                 }
diff --git a/composer.json b/composer.json
index b9c0af6..02494f4 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "postcode-nl/api-magento2-module",
-    "version": "3.7.1",
-    "description": "Postcode.eu International Address API module for Magento 2. Adds autocompletion for addresses in multiple countries using official postal data.",
+    "version": "4.0.0",
+    "description": "Postcode.eu Address Validation module for Magento 2. Adds autocompletion for addresses in multiple countries using official postal data.",
     "require": {
       "php": "^7.4 || ^8.0 || ^8.1 || ^8.2 || ^8.3 || ^8.4 || ^8.5",
       "magento/module-checkout": "~100.4"
@@ -12,8 +12,7 @@
     "autoload": {
         "files": [ "registration.php" ],
         "psr-4": {
-            "Flekto\\Postcode\\": "",
-            "PostcodeNl\\InternationalAutocomplete\\": "app/code/Flekto/Postcode/lib/InternationalAutocomplete/"
+            "PostcodeEu\\AddressValidation\\": ""
         }
     }
 }
diff --git a/etc/acl.xml b/etc/acl.xml
index e92215c..28b6696 100644
--- a/etc/acl.xml
+++ b/etc/acl.xml
@@ -6,7 +6,7 @@
                 <resource id="Magento_Backend::stores">
                     <resource id="Magento_Backend::stores_settings">
                         <resource id="Magento_Config::config">
-                            <resource id="Flekto_Postcode::config_flekto_postcode" title="Postcode.eu API Autocomplete" sortOrder="10"/>
+                            <resource id="PostcodeEu_AddressValidation::config_postcode_eu" title="Postcode.eu API Autocomplete" sortOrder="10"/>
                         </resource>
                     </resource>
                 </resource>
diff --git a/etc/adminhtml/di.xml b/etc/adminhtml/di.xml
index 8921a90..b11fe65 100644
--- a/etc/adminhtml/di.xml
+++ b/etc/adminhtml/di.xml
@@ -3,16 +3,17 @@
     <type name="Magento\Framework\Notification\MessageList">
         <arguments>
             <argument name="messages" xsi:type="array">
-                <item name="licenceCheck" xsi:type="string">Flekto\Postcode\Model\System\Message\LicenceCheck</item>
+                <item name="licenceCheck" xsi:type="string">PostcodeEu\AddressValidation\Model\System\Message\LicenceCheck</item>
+                <item name="rebrandNotice" xsi:type="string">PostcodeEu\AddressValidation\Model\System\Message\RebrandNotice</item>
             </argument>
         </arguments>
     </type>
 
     <type name="Magento\Customer\Model\Metadata\Form">
-        <plugin name="flekto_postcode_sort_sales_order_address_fields" type="Flekto\Postcode\Plugin\SortSalesOrderAddressFields" sortOrder="10"/>
+        <plugin name="postcode_eu_sort_sales_order_address_fields" type="PostcodeEu\AddressValidation\Plugin\SortSalesOrderAddressFields" sortOrder="10"/>
     </type>
 
     <type name="Magento\Sales\Block\Adminhtml\Order\Create\Form\Address">
-        <plugin name="flekto_postcode_add_address_autofill_to_sales_order_form" type="Flekto\Postcode\Plugin\AddAddressAutofillToOrderCreateForm" sortOrder="10"/>
+        <plugin name="postcode_eu_add_address_autofill_to_sales_order_form" type="PostcodeEu\AddressValidation\Plugin\AddAddressAutofillToOrderCreateForm" sortOrder="10"/>
     </type>
 </config>
diff --git a/etc/adminhtml/events.xml b/etc/adminhtml/events.xml
index 82f029b..53e8691 100644
--- a/etc/adminhtml/events.xml
+++ b/etc/adminhtml/events.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
     <event name="admin_system_config_changed_section_postcodenl_api">
-        <observer name="flekto_postcode_observer_system_config" instance="Flekto\Postcode\Observer\System\Config"/>
+        <observer name="postcode_eu_observer_system_config" instance="PostcodeEu\AddressValidation\Observer\System\Config"/>
     </event>
 </config>
 
diff --git a/etc/adminhtml/routes.xml b/etc/adminhtml/routes.xml
index 269e3cb..f9059bb 100644
--- a/etc/adminhtml/routes.xml
+++ b/etc/adminhtml/routes.xml
@@ -1,7 +1,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:App/etc/routes.xsd">
     <router id="admin">
-        <route id="flekto_postcode" frontName="flekto_postcode">
-            <module name="Flekto_Postcode" before="Magento_Backend" />
+        <route id="postcode_eu" frontName="postcode_eu">
+            <module name="PostcodeEu_AddressValidation" before="Magento_Backend" />
         </route>
     </router>
 </config>
\ No newline at end of file
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
index de518b9..79236c1 100644
--- a/etc/adminhtml/system.xml
+++ b/etc/adminhtml/system.xml
@@ -2,13 +2,13 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
     <system>
         <section id="postcodenl_api" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="999" translate="label">
-            <label>Postcode.eu Address API</label>
+            <label>Postcode.eu Address Validation</label>
             <tab>sales</tab>
             <class>postcode-eu-api-section</class>
-            <resource>Flekto_Postcode::config_flekto_postcode</resource>
+            <resource>PostcodeEu_AddressValidation::config_postcode_eu</resource>
 
             <group id="status" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="10" translate="label">
-                <frontend_model>Flekto\Postcode\Block\System\Config\Status</frontend_model>
+                <frontend_model>PostcodeEu\AddressValidation\Block\System\Config\Status</frontend_model>
             </group>
 
             <group id="general" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="20" translate="label">
@@ -32,12 +32,12 @@
                 <field id="nl_input_behavior" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="40" translate="label" type="select">
                     <label>Dutch address fields behavior</label>
                     <comment/>
-                    <source_model>Flekto\Postcode\Model\Config\Source\NlInputBehavior</source_model>
+                    <source_model>PostcodeEu\AddressValidation\Model\Config\Source\NlInputBehavior</source_model>
                 </field>
                 <field id="show_hide_address_fields" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="50" translate="label" type="select">
                     <label>Address fields behavior in autocomplete</label>
                     <comment/>
-                    <source_model>Flekto\Postcode\Model\Config\Source\ShowHideAddressFields</source_model>
+                    <source_model>PostcodeEu\AddressValidation\Model\Config\Source\ShowHideAddressFields</source_model>
                 </field>
                 <field id="allow_autofill_bypass" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="60" translate="label" type="select" canRestore="1">
                     <label>Add manual entry link</label>
@@ -60,7 +60,7 @@
                 <field id="disabled_countries" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="90" translate="label" type="multiselect" canRestore="1">
                     <label>Countries to exclude</label>
                     <comment>Selected countries will have Address API disabled.</comment>
-                    <source_model>Flekto\Postcode\Model\Config\Source\DisabledCountries</source_model>
+                    <source_model>PostcodeEu\AddressValidation\Model\Config\Source\DisabledCountries</source_model>
                 </field>
                 <field id="allow_pobox_shipping" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="100" translate="label" type="select" canRestore="1">
                     <label>PO box shipping</label>
@@ -70,7 +70,7 @@
                 <field id="admin_address_autocomplete_behavior" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="110" translate="label" type="select" canRestore="1">
                     <label>Address autocomplete in admin</label>
                     <comment>Control address autocomplete behavior for the admin order form.</comment>
-                    <source_model>Flekto\Postcode\Model\Config\Source\AdminAddressAutocompleteBehavior</source_model>
+                    <source_model>PostcodeEu\AddressValidation\Model\Config\Source\AdminAddressAutocompleteBehavior</source_model>
                 </field>
                 <field id="split_street_values" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="120" translate="label" type="select" canRestore="1">
                     <label>Split street address values</label>
diff --git a/etc/config.xml b/etc/config.xml
index 10721ec..8cb62c5 100644
--- a/etc/config.xml
+++ b/etc/config.xml
@@ -3,7 +3,7 @@
     <default>
         <postcodenl_api>
             <status>
-                <module_version>3.7.1</module_version>
+                <module_version>4.0.0</module_version>
                 <account_status>new</account_status>
             </status>
             <general>
diff --git a/etc/crontab.xml b/etc/crontab.xml
index 9144a4a..a72a577 100644
--- a/etc/crontab.xml
+++ b/etc/crontab.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Cron:etc/crontab.xsd">
     <group id="default">
-        <job name="flekto_postcode_update_api_data" instance="Flekto\Postcode\Cron\UpdateApiData" method="execute">
+        <job name="postcode_eu_update_api_data" instance="PostcodeEu\AddressValidation\Cron\UpdateApiData" method="execute">
             <schedule>3 3 * * *</schedule>
         </job>
-        <job name="flekto_postcode_notify_module_update" instance="Flekto\Postcode\Cron\NotifyModuleUpdate" method="execute">
+        <job name="postcode_eu_notify_module_update" instance="PostcodeEu\AddressValidation\Cron\NotifyModuleUpdate" method="execute">
             <schedule>3 3 * * *</schedule>
         </job>
     </group>
diff --git a/etc/di.xml b/etc/di.xml
index ce9546e..04f3316 100644
--- a/etc/di.xml
+++ b/etc/di.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-    <preference for="Flekto\Postcode\Api\PostcodeModelInterface" type="Flekto\Postcode\Model\PostcodeModel" />
-    <preference for="Flekto\Postcode\Api\Data\UpdateNotificationInterface" type="Flekto\Postcode\Model\UpdateNotification" />
-    <preference for="Flekto\Postcode\Api\UpdateNotificationRepositoryInterface" type="Flekto\Postcode\Model\UpdateNotificationRepository" />
+    <preference for="PostcodeEu\AddressValidation\Api\PostcodeModelInterface" type="PostcodeEu\AddressValidation\Model\PostcodeModel" />
+    <preference for="PostcodeEu\AddressValidation\Api\Data\UpdateNotificationInterface" type="PostcodeEu\AddressValidation\Model\UpdateNotification" />
+    <preference for="PostcodeEu\AddressValidation\Api\UpdateNotificationRepositoryInterface" type="PostcodeEu\AddressValidation\Model\UpdateNotificationRepository" />
     <preference for="Magento\Framework\Filesystem\DriverInterface" type="Magento\Framework\Filesystem\Driver\File" />
-    <preference for="Magento\Checkout\Block\Checkout\AttributeMerger" type="Flekto\Postcode\Block\Checkout\AttributeMerger" />
+    <preference for="Magento\Checkout\Block\Checkout\AttributeMerger" type="PostcodeEu\AddressValidation\Block\Checkout\AttributeMerger" />
 
     <type name="Magento\Framework\Validator">
-        <plugin name="flekto_postcode_city_validation" type="Flekto\Postcode\Plugin\ValidatorPlugin"/>
+        <plugin name="postcode_eu_city_validation" type="PostcodeEu\AddressValidation\Plugin\ValidatorPlugin"/>
     </type>
 
     <type name="Magento\Framework\App\AreaList">
diff --git a/etc/frontend/di.xml b/etc/frontend/di.xml
index d506e1d..96caa2e 100644
--- a/etc/frontend/di.xml
+++ b/etc/frontend/di.xml
@@ -3,7 +3,7 @@
     <type name="Magento\Checkout\Block\Onepage">
         <arguments>
             <argument name="layoutProcessors" xsi:type="array">
-                <item name="flekto_postcode_layoutprocessor" xsi:type="object" sortOrder="1">Flekto\Postcode\Block\Onepage\LayoutProcessor</item>
+                <item name="postcode_eu_layoutprocessor" xsi:type="object" sortOrder="1">PostcodeEu\AddressValidation\Block\Onepage\LayoutProcessor</item>
             </argument>
         </arguments>
     </type>
diff --git a/etc/module.xml b/etc/module.xml
index 6450aef..62825ab 100644
--- a/etc/module.xml
+++ b/etc/module.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Flekto_Postcode">
+    <module name="PostcodeEu_AddressValidation">
         <sequence>
             <module name="Magento_Checkout"/>
             <module name="Magento_Customer"/>
diff --git a/etc/schema.graphqls b/etc/schema.graphqls
index 76752dc..8a349da 100644
--- a/etc/schema.graphqls
+++ b/etc/schema.graphqls
@@ -2,15 +2,15 @@ type Query {
     dutchAddress(
         postcode: String! @doc(description: "Dutch postcode in the \"1234AB\" format.")
         houseNumber: String! @doc(description: "House number. May include an addition.")
-    ): DutchAddressResult! @resolver(class: "Flekto\\Postcode\\Model\\Resolver\\DutchAddress") @doc(description: "Get an address based on its unique combination of postcode, house number and house number addition.")
+    ): DutchAddressResult! @resolver(class: "PostcodeEu\\AddressValidation\\Model\\Resolver\\DutchAddress") @doc(description: "Get an address based on its unique combination of postcode, house number and house number addition.")
     intlAddressMatches(
         context: String! = "NL" @doc(description: "Initial autocomplete context. E.g. a country code to start searching in that country. The country code is not case sensitive and can be two or three characters. In subsequent requests, the context should be set to the context of the selected match.")
         term: String! @doc(description: "The address search term. May be a complete or partial address. When a user selects a match, use the exact and unmodified \"value\" field of the selected match for the term parameter. In subsequent requests, the term should be set to the value of the selected match.")
-    ): IntlAddressMatches! @resolver(class: "Flekto\\Postcode\\Model\\Resolver\\IntlAddress\\Matches") @doc(description: "Get a list of autocomplete matches based on a single (partial) address term. Depending on the input different types of matches may be returned, such as streets, postal codes or a specific address. Required session header: Both the autocomplete and getDetails methods require a custom HTTP header named X-Autocomplete-Session to be specified. Its value should identify a single address completion session (for example, a user filling out one checkout address) and remain the same for calls to both methods. The session header should be at least 8 characters and at most 64 characters long. The value must only contain alphanumeric characters (case insensitive), \"-\", \"_\" and/or \".\". Reusing the same session identifier for completing more than one address is not recommended as it may lead to increased costs for your account.")
+    ): IntlAddressMatches! @resolver(class: "PostcodeEu\\AddressValidation\\Model\\Resolver\\IntlAddress\\Matches") @doc(description: "Get a list of autocomplete matches based on a single (partial) address term. Depending on the input different types of matches may be returned, such as streets, postal codes or a specific address. Required session header: Both the autocomplete and getDetails methods require a custom HTTP header named X-Autocomplete-Session to be specified. Its value should identify a single address completion session (for example, a user filling out one checkout address) and remain the same for calls to both methods. The session header should be at least 8 characters and at most 64 characters long. The value must only contain alphanumeric characters (case insensitive), \"-\", \"_\" and/or \".\". Reusing the same session identifier for completing more than one address is not recommended as it may lead to increased costs for your account.")
     intlAddressDetails(
         context: String! @doc(description: "Context with precision address to get detailed address information.")
-    ): IntlAddressDetails! @resolver(class: "Flekto\\Postcode\\Model\\Resolver\\IntlAddress\\Details") @doc(description: "Get address information based on the provided autocomplete context. The context must have the precision `address`. A HTTP status 400 response is given when the provided context does not resolve to a single address. This method is intended to provide address information using the result context from the autocomplete method. The result of this method can be used to complete an address in an order form for example. A session header is required, see IntlAddressMatches for details.")
-    addressApiSettings: AddressApiSettings! @doc(description: "Settings for the Postcode.eu Address API.") @resolver(class: "Flekto\\Postcode\\Model\\Resolver\\AddressApiSettings")
+    ): IntlAddressDetails! @resolver(class: "PostcodeEu\\AddressValidation\\Model\\Resolver\\IntlAddress\\Details") @doc(description: "Get address information based on the provided autocomplete context. The context must have the precision `address`. A HTTP status 400 response is given when the provided context does not resolve to a single address. This method is intended to provide address information using the result context from the autocomplete method. The result of this method can be used to complete an address in an order form for example. A session header is required, see IntlAddressMatches for details.")
+    addressApiSettings: AddressApiSettings! @doc(description: "Settings for the Postcode.eu Address API.") @resolver(class: "PostcodeEu\\AddressValidation\\Model\\Resolver\\AddressApiSettings")
     validateAddress(
         country: String! @doc(description: "ISO country code.")
         postcode: String @doc(description: "The postcode.")
@@ -19,7 +19,7 @@ type Query {
         building: String @doc(description: "The full building number, including any additions.")
         region: String @doc(description: "The region name. Depending on the country this can be a province, a state or another type of administrative region. This is not typically needed to find matches, but can sometimes be useful to distinguish between otherwise similar matches.")
         streetAndBuilding: String @doc(description: "The street name and building number. Use this parameter if you do not have separate street and building data. This parameter is not allowed in combination with the street or building parameter.")
-    ): ValidatedAddressResult @resolver(class: "Flekto\\Postcode\\Model\\Resolver\\ValidatedAddress")
+    ): ValidatedAddressResult @resolver(class: "PostcodeEu\\AddressValidation\\Model\\Resolver\\ValidatedAddress")
 }
 
 type DutchAddressResult {
diff --git a/etc/webapi.xml b/etc/webapi.xml
index 4a9ec68..b649abc 100644
--- a/etc/webapi.xml
+++ b/etc/webapi.xml
@@ -1,35 +1,35 @@
 <?xml version="1.0"?>
 <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Webapi:etc/webapi.xsd">
     <route url="/V1/international/autocomplete/:context/:term" method="GET">
-        <service class="Flekto\Postcode\Api\PostcodeModelInterface" method="getAddressAutocomplete"/>
+        <service class="PostcodeEu\AddressValidation\Api\PostcodeModelInterface" method="getAddressAutocomplete"/>
         <resources>
            <resource ref="anonymous" />
         </resources>
     </route>
 
     <route url="/V1/international/address/:context" method="GET">
-        <service class="Flekto\Postcode\Api\PostcodeModelInterface" method="getAddressDetails"/>
+        <service class="PostcodeEu\AddressValidation\Api\PostcodeModelInterface" method="getAddressDetails"/>
         <resources>
            <resource ref="anonymous" />
         </resources>
     </route>
 
     <route url="/V1/international/address/:context/:dispatchCountry" method="GET">
-        <service class="Flekto\Postcode\Api\PostcodeModelInterface" method="getAddressDetailsCountry"/>
+        <service class="PostcodeEu\AddressValidation\Api\PostcodeModelInterface" method="getAddressDetailsCountry"/>
         <resources>
            <resource ref="anonymous" />
         </resources>
     </route>
 
     <route url="/V1/nl/address/:zipCode/:houseNumber" method="GET">
-        <service class="Flekto\Postcode\Api\PostcodeModelInterface" method="getNlAddress"/>
+        <service class="PostcodeEu\AddressValidation\Api\PostcodeModelInterface" method="getNlAddress"/>
         <resources>
            <resource ref="anonymous" />
         </resources>
     </route>
 
     <route url="/V1/international/validate/:country" method="GET">
-        <service class="Flekto\Postcode\Api\PostcodeModelInterface" method="validateAddress"/>
+        <service class="PostcodeEu\AddressValidation\Api\PostcodeModelInterface" method="validateAddress"/>
         <resources>
             <resource ref="anonymous"/>
         </resources>
diff --git a/i18n/en_US.csv b/i18n/en_US.csv
index 5325443..20a4cd6 100644
--- a/i18n/en_US.csv
+++ b/i18n/en_US.csv
@@ -10,9 +10,9 @@
 "Key or secret are invalid","Key or secret are invalid"
 "Your account is active with name: ","Your account is active with name: "
 "Key is valid but has no access","Key is valid but has no access"
-"Flekto Postcode.eu update countries start","Flekto Postcode.eu update countries start"
-"Flekto Postcode.eu update countries FAILED: ","Flekto Postcode.eu update countries FAILED: "
-"Flekto Postcode.eu update countries executed: ","Flekto Postcode.eu update countries executed: "
+"Postcode.eu update countries start","Postcode.eu update countries start"
+"Postcode.eu update countries FAILED: ","Postcode.eu update countries FAILED: "
+"Postcode.eu update countries executed: ","Postcode.eu update countries executed: "
 "Postcode.eu API Autocomplete","Postcode.eu API Autocomplete"
 "Configuration","Configuration"
 "Enabled","Enabled"
@@ -75,6 +75,7 @@
 "Supported countries","Supported countries"
 "euro","euro"
 "Address API","Address API"
+"Address Validation","Adres Validation"
 "Usage at %1%","Usage at %1%"
 "new","new"
 "active","active"
diff --git a/i18n/nl_BE.csv b/i18n/nl_BE.csv
index 04577cd..7ac8956 100644
--- a/i18n/nl_BE.csv
+++ b/i18n/nl_BE.csv
@@ -10,9 +10,9 @@
 "Key or secret are invalid","Key of secret zijn ongeldig"
 "Your account is active with name: ","Uw account is actief met de naam: "
 "Key is valid but has no access","Key is geldig maar heeft geen toegang"
-"Flekto Postcode.eu update countries start","Flekto Postcode.eu update landen starten"
-"Flekto Postcode.eu update countries FAILED: ","Flekto Postcode.eu update landen MISLUKT: "
-"Flekto Postcode.eu update countries executed: ","Flekto Postcode.eu update landen uitgevoerd: "
+"Postcode.eu update countries start","Postcode.eu update landen starten"
+"Postcode.eu update countries FAILED: ","Postcode.eu update landen MISLUKT: "
+"Postcode.eu update countries executed: ","Postcode.eu update landen uitgevoerd: "
 "Postcode.eu API Autocomplete","Postcode.eu API Autocomplete"
 "Configuration","Configuratie"
 "Enabled","Ingeschakeld"
@@ -75,6 +75,7 @@
 "Supported countries","Ondersteunde landen"
 "euro","euro"
 "Address API","Adres API"
+"Address Validation","Adres Validatie"
 "Usage at %1%","Verbruik op %1%"
 "new","nieuw"
 "active","actief"
diff --git a/i18n/nl_NL.csv b/i18n/nl_NL.csv
index 04577cd..7ac8956 100644
--- a/i18n/nl_NL.csv
+++ b/i18n/nl_NL.csv
@@ -10,9 +10,9 @@
 "Key or secret are invalid","Key of secret zijn ongeldig"
 "Your account is active with name: ","Uw account is actief met de naam: "
 "Key is valid but has no access","Key is geldig maar heeft geen toegang"
-"Flekto Postcode.eu update countries start","Flekto Postcode.eu update landen starten"
-"Flekto Postcode.eu update countries FAILED: ","Flekto Postcode.eu update landen MISLUKT: "
-"Flekto Postcode.eu update countries executed: ","Flekto Postcode.eu update landen uitgevoerd: "
+"Postcode.eu update countries start","Postcode.eu update landen starten"
+"Postcode.eu update countries FAILED: ","Postcode.eu update landen MISLUKT: "
+"Postcode.eu update countries executed: ","Postcode.eu update landen uitgevoerd: "
 "Postcode.eu API Autocomplete","Postcode.eu API Autocomplete"
 "Configuration","Configuratie"
 "Enabled","Ingeschakeld"
@@ -75,6 +75,7 @@
 "Supported countries","Ondersteunde landen"
 "euro","euro"
 "Address API","Adres API"
+"Address Validation","Adres Validatie"
 "Usage at %1%","Verbruik op %1%"
 "new","nieuw"
 "active","actief"
diff --git a/registration.php b/registration.php
index a559de1..ea7e4e2 100644
--- a/registration.php
+++ b/registration.php
@@ -2,6 +2,6 @@
 
 \Magento\Framework\Component\ComponentRegistrar::register(
     \Magento\Framework\Component\ComponentRegistrar::MODULE,
-    'Flekto_Postcode',
+    'PostcodeEu_AddressValidation',
     __DIR__
 );
diff --git a/view/adminhtml/layout/adminhtml_system_config_edit.xml b/view/adminhtml/layout/adminhtml_system_config_edit.xml
index 6beff92..6246d43 100644
--- a/view/adminhtml/layout/adminhtml_system_config_edit.xml
+++ b/view/adminhtml/layout/adminhtml_system_config_edit.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <head>
-        <css src="Flekto_Postcode::css/postcode-eu.css" />
+        <css src="PostcodeEu_AddressValidation::css/postcode-eu.css" />
     </head>
 </page>
diff --git a/view/adminhtml/layout/sales_order_create_index.xml b/view/adminhtml/layout/sales_order_create_index.xml
index 348438f..7b88a4f 100644
--- a/view/adminhtml/layout/sales_order_create_index.xml
+++ b/view/adminhtml/layout/sales_order_create_index.xml
@@ -2,6 +2,6 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <head>
-        <css src="Flekto_Postcode::css/lib/postcode-eu-autocomplete-address.css"/>
+        <css src="PostcodeEu_AddressValidation::css/lib/postcode-eu-autocomplete-address.css"/>
     </head>
 </page>
diff --git a/view/adminhtml/templates/system/config/status.phtml b/view/adminhtml/templates/system/config/status.phtml
index 12889da..c40d29a 100644
--- a/view/adminhtml/templates/system/config/status.phtml
+++ b/view/adminhtml/templates/system/config/status.phtml
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @var \Flekto\Postcode\Block\System\Config\Status $block
+ * @var \PostcodeEu\AddressValidation\Block\System\Config\Status $block
  * @var \Magento\Framework\Escaper $escaper
  */
 $config = $block->getConfig();
@@ -10,7 +10,7 @@ $moduleInfo = $block->getModuleInfo();
 
 ?><div class="postcode-eu-status-container">
     <div class="postcode-eu-status-header">
-        <h2><?= $escaper->escapeHtml(__('Address API')) ?></h2>
+        <h2><?= $escaper->escapeHtml(__('Address Validation')) ?></h2>
     </div>
 
     <div class="postcode-eu-status-content">
diff --git a/view/adminhtml/web/js/view/form/sales/order_create/address-autofill-intl.js b/view/adminhtml/web/js/view/form/sales/order_create/address-autofill-intl.js
index 46c68e2..647cfe2 100644
--- a/view/adminhtml/web/js/view/form/sales/order_create/address-autofill-intl.js
+++ b/view/adminhtml/web/js/view/form/sales/order_create/address-autofill-intl.js
@@ -1,5 +1,5 @@
 define([
-    'Flekto_Postcode/js/form/element/address-autofill-intl',
+    'PostcodeEu_AddressValidation/js/form/element/address-autofill-intl',
     'mage/translate',
 ], function (AddressAutofillIntl, $t) {
     'use strict';
diff --git a/view/adminhtml/web/js/view/form/sales/order_create/address-autofill-nl.js b/view/adminhtml/web/js/view/form/sales/order_create/address-autofill-nl.js
index 4259ea7..f57e02f 100644
--- a/view/adminhtml/web/js/view/form/sales/order_create/address-autofill-nl.js
+++ b/view/adminhtml/web/js/view/form/sales/order_create/address-autofill-nl.js
@@ -1,6 +1,6 @@
 define([
-    'Flekto_Postcode/js/form/components/address-autofill-nl',
-    'Flekto_Postcode/js/model/address-nl',
+    'PostcodeEu_AddressValidation/js/form/components/address-autofill-nl',
+    'PostcodeEu_AddressValidation/js/model/address-nl',
     'mage/translate',
 ], function (Collection, AddressNlModel, $t) {
     'use strict';
diff --git a/view/base/web/js/form/components/address-autofill-nl.js b/view/base/web/js/form/components/address-autofill-nl.js
index 3790d41..a80f1aa 100644
--- a/view/base/web/js/form/components/address-autofill-nl.js
+++ b/view/base/web/js/form/components/address-autofill-nl.js
@@ -1,7 +1,7 @@
 define([
     'uiCollection',
     'jquery',
-    'Flekto_Postcode/js/model/address-nl',
+    'PostcodeEu_AddressValidation/js/model/address-nl',
 ], function (Collection, $, AddressNlModel) {
     'use strict';
 
diff --git a/view/base/web/js/form/element/address-autofill-intl.js b/view/base/web/js/form/element/address-autofill-intl.js
index d3b3421..dd0002d 100644
--- a/view/base/web/js/form/element/address-autofill-intl.js
+++ b/view/base/web/js/form/element/address-autofill-intl.js
@@ -2,7 +2,7 @@ define([
     'Magento_Ui/js/form/element/abstract',
     'mage/translate',
     'uiRegistry',
-    'Flekto_Postcode/js/ko/bindings/init-intl-autocomplete',
+    'PostcodeEu_AddressValidation/js/ko/bindings/init-intl-autocomplete',
 ], function (Abstract, $t, Registry) {
     'use strict';
 
@@ -13,7 +13,7 @@ define([
             intlAutocompleteInstance: null,
             settings: {},
             template: 'ui/form/field',
-            elementTmpl: 'Flekto_Postcode/form/element/address-autofill-intl',
+            elementTmpl: 'PostcodeEu_AddressValidation/form/element/address-autofill-intl',
             visible: false,
             additionalClasses: {
                 'address-autofill-intl-input': true,
diff --git a/view/base/web/js/ko/bindings/init-intl-autocomplete.js b/view/base/web/js/ko/bindings/init-intl-autocomplete.js
index c4a5477..987e132 100644
--- a/view/base/web/js/ko/bindings/init-intl-autocomplete.js
+++ b/view/base/web/js/ko/bindings/init-intl-autocomplete.js
@@ -1,7 +1,7 @@
 define([
     'ko',
     'Magento_Ui/js/lib/knockout/template/renderer',
-    'Flekto_Postcode/js/lib/postcode-eu-autocomplete-address',
+    'PostcodeEu_AddressValidation/js/lib/postcode-eu-autocomplete-address',
     'mage/translate',
 ], function (ko, renderer, AutocompleteAddress, $t) {
     'use strict';
diff --git a/view/frontend/layout/checkout_index_index.xml b/view/frontend/layout/checkout_index_index.xml
index 8d58445..1d7ddd7 100644
--- a/view/frontend/layout/checkout_index_index.xml
+++ b/view/frontend/layout/checkout_index_index.xml
@@ -2,7 +2,7 @@
 
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="checkout" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <head>
-        <css src="Flekto_Postcode::css/lib/postcode-eu-autocomplete-address.css"/>
+        <css src="PostcodeEu_AddressValidation::css/lib/postcode-eu-autocomplete-address.css"/>
     </head>
     <body>
         <referenceBlock name="checkout.root">
@@ -20,19 +20,19 @@
                                                         <item name="shipping-address-fieldset" xsi:type="array">
                                                             <item name="children" xsi:type="array">
                                                                 <item name="address_autofill_nl" xsi:type="array">
-                                                                    <item name="component" xsi:type="string">Flekto_Postcode/js/form/components/checkout/address-autofill-nl</item>
+                                                                    <item name="component" xsi:type="string">PostcodeEu_AddressValidation/js/form/components/checkout/address-autofill-nl</item>
                                                                     <item name="provider" xsi:type="string">checkoutProvider</item>
                                                                     <item name="dataScope" xsi:type="string">shippingAddress.address_autofill_nl</item>
                                                                     <item name="deps" xsi:type="array">
                                                                         <item name="0" xsi:type="string">checkoutProvider</item>
                                                                     </item>
                                                                     <item name="config" xsi:type="array">
-                                                                        <item name="componentDisabled" xsi:type="helper" helper="Flekto\Postcode\Helper\Data::isNlComponentDisabled"/>
+                                                                        <item name="componentDisabled" xsi:type="helper" helper="PostcodeEu\AddressValidation\Helper\Data::isNlComponentDisabled"/>
                                                                     </item>
                                                                     <item name="sortOrder" xsi:type="number">65</item>
                                                                     <item name="children" xsi:type="array">
                                                                         <item name="postcode" xsi:type="array">
-                                                                            <item name="component" xsi:type="string">Flekto_Postcode/js/form/element/postcode</item>
+                                                                            <item name="component" xsi:type="string">PostcodeEu_AddressValidation/js/form/element/postcode</item>
                                                                             <item name="label" translate="true" xsi:type="string">Zip/Postal Code</item>
                                                                             <item name="config" xsi:type="array">
                                                                                 <item name="customScope" xsi:type="string">shippingAddress</item>
@@ -41,7 +41,7 @@
                                                                             <item name="dataScope" xsi:type="string">postcode</item>
                                                                         </item>
                                                                         <item name="house_number" xsi:type="array">
-                                                                            <item name="component" xsi:type="string">Flekto_Postcode/js/form/element/house-number</item>
+                                                                            <item name="component" xsi:type="string">PostcodeEu_AddressValidation/js/form/element/house-number</item>
                                                                             <item name="label" translate="true" xsi:type="string">House number and addition</item>
                                                                             <item name="config" xsi:type="array">
                                                                                 <item name="customScope" xsi:type="string">shippingAddress</item>
@@ -50,7 +50,7 @@
                                                                             <item name="dataScope" xsi:type="string">house_number</item>
                                                                         </item>
                                                                         <item name="house_number_select" xsi:type="array">
-                                                                            <item name="component" xsi:type="string">Flekto_Postcode/js/form/element/house-number-select</item>
+                                                                            <item name="component" xsi:type="string">PostcodeEu_AddressValidation/js/form/element/house-number-select</item>
                                                                             <item name="label" translate="true" xsi:type="string">Which house number do you mean?</item>
                                                                             <item name="config" xsi:type="array">
                                                                                 <item name="caption" xsi:type="string" translate="true">- Select house number -</item>
@@ -62,9 +62,9 @@
                                                                     </item>
                                                                 </item>
                                                                 <item name="address_autofill_intl" xsi:type="array">
-                                                                    <item name="component" xsi:type="string">Flekto_Postcode/js/form/element/checkout/address-autofill-intl</item>
+                                                                    <item name="component" xsi:type="string">PostcodeEu_AddressValidation/js/form/element/checkout/address-autofill-intl</item>
                                                                     <item name="config" xsi:type="array">
-                                                                        <item name="componentDisabled" xsi:type="helper" helper="Flekto\Postcode\Helper\Data::isDisabled"/>
+                                                                        <item name="componentDisabled" xsi:type="helper" helper="PostcodeEu\AddressValidation\Helper\Data::isDisabled"/>
                                                                         <item name="customScope" xsi:type="string">shippingAddress</item>
                                                                     </item>
                                                                     <item name="provider" xsi:type="string">checkoutProvider</item>
@@ -76,17 +76,17 @@
                                                                     <item name="dataScope" xsi:type="string">shippingAddress.address_autofill_intl</item>
                                                                 </item>
                                                                 <item name="address_autofill_formatted_output" xsi:type="array">
-                                                                    <item name="component" xsi:type="string">Flekto_Postcode/js/form/components/checkout/address-autofill-formatted-output</item>
+                                                                    <item name="component" xsi:type="string">PostcodeEu_AddressValidation/js/form/components/checkout/address-autofill-formatted-output</item>
                                                                     <item name="config" xsi:type="array">
-                                                                        <item name="componentDisabled" xsi:type="helper" helper="Flekto\Postcode\Helper\Data::isFormattedOutputDisabled"/>
+                                                                        <item name="componentDisabled" xsi:type="helper" helper="PostcodeEu\AddressValidation\Helper\Data::isFormattedOutputDisabled"/>
                                                                     </item>
                                                                     <item name="sortOrder" xsi:type="string">67</item>
                                                                     <item name="dataScope" xsi:type="string">shippingAddress.address_autofill_formatted_output</item>
                                                                 </item>
                                                                 <item name="address_autofill_bypass" xsi:type="array">
-                                                                    <item name="component" xsi:type="string">Flekto_Postcode/js/form/components/checkout/address-autofill-bypass</item>
+                                                                    <item name="component" xsi:type="string">PostcodeEu_AddressValidation/js/form/components/checkout/address-autofill-bypass</item>
                                                                     <item name="config" xsi:type="array">
-                                                                        <item name="componentDisabled" xsi:type="helper" helper="Flekto\Postcode\Helper\Data::isAutofillBypassDisabled"/>
+                                                                        <item name="componentDisabled" xsi:type="helper" helper="PostcodeEu\AddressValidation\Helper\Data::isAutofillBypassDisabled"/>
                                                                     </item>
                                                                     <item name="sortOrder" xsi:type="string">68</item>
                                                                     <item name="dataScope" xsi:type="string">shippingAddress.address_autofill_bypass</item>
diff --git a/view/frontend/layout/customer_address_autofill.xml b/view/frontend/layout/customer_address_autofill.xml
index 8eccf61..38dcb14 100644
--- a/view/frontend/layout/customer_address_autofill.xml
+++ b/view/frontend/layout/customer_address_autofill.xml
@@ -2,40 +2,40 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <head>
-        <css src="Flekto_Postcode::css/lib/postcode-eu-autocomplete-address.css"/>
+        <css src="PostcodeEu_AddressValidation::css/lib/postcode-eu-autocomplete-address.css"/>
     </head>
     <body>
         <referenceContainer name="content">
             <block name="customer.address.autofill"
                     ifconfig="postcodenl_api/general/enabled"
-                    class="Flekto\Postcode\Block\Customer\Address\Autofill"
-                    template="Flekto_Postcode::customer/address/autofill.phtml">
+                    class="PostcodeEu\AddressValidation\Block\Customer\Address\Autofill"
+                    template="PostcodeEu_AddressValidation::customer/address/autofill.phtml">
                 <arguments>
                     <argument name="jsLayout" xsi:type="array">
                         <item name="components" xsi:type="array">
                             <item name="address_autofill" xsi:type="array">
-                                <item name="component" xsi:type="string">Flekto_Postcode/js/view/customer/address/autofill</item>
+                                <item name="component" xsi:type="string">PostcodeEu_AddressValidation/js/view/customer/address/autofill</item>
                                 <item name="config" xsi:type="array">
-                                    <item name="settings" xsi:type="helper" helper="Flekto\Postcode\Helper\StoreConfigHelper::getJsinit"/>
+                                    <item name="settings" xsi:type="helper" helper="PostcodeEu\AddressValidation\Helper\StoreConfigHelper::getJsinit"/>
                                 </item>
                                 <item name="children" xsi:type="array">
                                     <item name="address_autofill_nl" xsi:type="array">
-                                        <item name="component" xsi:type="string">Flekto_Postcode/js/form/components/customer/address/address-autofill-nl</item>
+                                        <item name="component" xsi:type="string">PostcodeEu_AddressValidation/js/form/components/customer/address/address-autofill-nl</item>
                                         <item name="config" xsi:type="array">
-                                            <item name="componentDisabled" xsi:type="helper" helper="Flekto\Postcode\Helper\Data::isNlComponentDisabled"/>
+                                            <item name="componentDisabled" xsi:type="helper" helper="PostcodeEu\AddressValidation\Helper\Data::isNlComponentDisabled"/>
                                         </item>
                                         <item name="sortOrder" xsi:type="number">65</item>
                                         <item name="children" xsi:type="array">
                                             <item name="postcode" xsi:type="array">
-                                                <item name="component" xsi:type="string">Flekto_Postcode/js/form/element/postcode</item>
+                                                <item name="component" xsi:type="string">PostcodeEu_AddressValidation/js/form/element/postcode</item>
                                                 <item name="label" translate="true" xsi:type="string">Zip/Postal Code</item>
                                             </item>
                                             <item name="house_number" xsi:type="array">
-                                                <item name="component" xsi:type="string">Flekto_Postcode/js/form/element/house-number</item>
+                                                <item name="component" xsi:type="string">PostcodeEu_AddressValidation/js/form/element/house-number</item>
                                                 <item name="label" translate="true" xsi:type="string">House number and addition</item>
                                             </item>
                                             <item name="house_number_select" xsi:type="array">
-                                                <item name="component" xsi:type="string">Flekto_Postcode/js/form/element/house-number-select</item>
+                                                <item name="component" xsi:type="string">PostcodeEu_AddressValidation/js/form/element/house-number-select</item>
                                                 <item name="label" translate="true" xsi:type="string">Which house number do you mean?</item>
                                                 <item name="config" xsi:type="array">
                                                     <item name="caption" xsi:type="string" translate="true">- Select house number -</item>
@@ -45,24 +45,24 @@
                                     </item>
 
                                     <item name="address_autofill_intl" xsi:type="array">
-                                        <item name="component" xsi:type="string">Flekto_Postcode/js/form/element/customer/address/address-autofill-intl</item>
+                                        <item name="component" xsi:type="string">PostcodeEu_AddressValidation/js/form/element/customer/address/address-autofill-intl</item>
                                         <item name="config" xsi:type="array">
-                                            <item name="componentDisabled" xsi:type="helper" helper="Flekto\Postcode\Helper\Data::isDisabled"/>
+                                            <item name="componentDisabled" xsi:type="helper" helper="PostcodeEu\AddressValidation\Helper\Data::isDisabled"/>
                                         </item>
                                         <item name="label" xsi:type="string" translate="true">Start typing your address or zip/postal code</item>
                                     </item>
 
                                     <item name="address_autofill_formatted_output" xsi:type="array">
-                                        <item name="component" xsi:type="string">Flekto_Postcode/js/form/components/customer/address/address-autofill-formatted-output</item>
+                                        <item name="component" xsi:type="string">PostcodeEu_AddressValidation/js/form/components/customer/address/address-autofill-formatted-output</item>
                                         <item name="config" xsi:type="array">
-                                            <item name="componentDisabled" xsi:type="helper" helper="Flekto\Postcode\Helper\Data::isFormattedOutputDisabled"/>
+                                            <item name="componentDisabled" xsi:type="helper" helper="PostcodeEu\AddressValidation\Helper\Data::isFormattedOutputDisabled"/>
                                         </item>
                                     </item>
 
                                     <item name="address_autofill_bypass" xsi:type="array">
-                                        <item name="component" xsi:type="string">Flekto_Postcode/js/form/components/customer/address/address-autofill-bypass</item>
+                                        <item name="component" xsi:type="string">PostcodeEu_AddressValidation/js/form/components/customer/address/address-autofill-bypass</item>
                                         <item name="config" xsi:type="array">
-                                            <item name="componentDisabled" xsi:type="helper" helper="Flekto\Postcode\Helper\Data::isAutofillBypassDisabled"/>
+                                            <item name="componentDisabled" xsi:type="helper" helper="PostcodeEu\AddressValidation\Helper\Data::isAutofillBypassDisabled"/>
                                         </item>
                                     </item>
                                 </item>
diff --git a/view/frontend/requirejs-config.js b/view/frontend/requirejs-config.js
index 17d53bc..2f8ae05 100644
--- a/view/frontend/requirejs-config.js
+++ b/view/frontend/requirejs-config.js
@@ -2,7 +2,7 @@ var config = {
     config: {
         mixins: {
             'Magento_Ui/js/lib/validation/validator': {
-                'Flekto_Postcode/js/validation/validator-mixin': true,
+                'PostcodeEu_AddressValidation/js/validation/validator-mixin': true,
             },
         },
     },
diff --git a/view/frontend/templates/customer/address/autofill.phtml b/view/frontend/templates/customer/address/autofill.phtml
index 68b0412..8a07ba7 100644
--- a/view/frontend/templates/customer/address/autofill.phtml
+++ b/view/frontend/templates/customer/address/autofill.phtml
@@ -1,6 +1,6 @@
 <?php
 /**
- * @var $block \Flekto\Postcode\Block\Customer\Address\Autofill
+ * @var $block \PostcodeEu\AddressValidation\Block\Customer\Address\Autofill
  * @var \Magento\Framework\Escaper $escaper
  */
 ?>
@@ -29,7 +29,7 @@
 <script type="text/x-magento-init">
     {
         "#block-loader-customer-address": {
-            "Flekto_Postcode/js/block-loader": {}
+            "PostcodeEu_AddressValidation/js/block-loader": {}
         },
         ".address-autofill-fieldset": {
             "Magento_Ui/js/core/app": <?= /* @noEscape */ $block->getJsLayout();?>
diff --git a/view/frontend/web/js/form/components/address-autofill-bypass.js b/view/frontend/web/js/form/components/address-autofill-bypass.js
index 05c67cc..a511f44 100644
--- a/view/frontend/web/js/form/components/address-autofill-bypass.js
+++ b/view/frontend/web/js/form/components/address-autofill-bypass.js
@@ -12,7 +12,7 @@ define([
                 '${ $.parentName }.address_autofill_intl:error': 'visible',
             },
             visible: false,
-            template: 'Flekto_Postcode/content/address-autofill-bypass',
+            template: 'PostcodeEu_AddressValidation/content/address-autofill-bypass',
             tooltipTpl: 'ui/form/element/helper/tooltip',
             additionalClasses: {
                 'address-autofill-bypass': true,
diff --git a/view/frontend/web/js/form/components/address-autofill-formatted-output.js b/view/frontend/web/js/form/components/address-autofill-formatted-output.js
index 91b62a9..fdf9a7f 100644
--- a/view/frontend/web/js/form/components/address-autofill-formatted-output.js
+++ b/view/frontend/web/js/form/components/address-autofill-formatted-output.js
@@ -1,6 +1,6 @@
 define([
     'Magento_Ui/js/form/components/html',
-    'Flekto_Postcode/js/model/address-nl',
+    'PostcodeEu_AddressValidation/js/model/address-nl',
 ], function (Html, AddressNlModel) {
     'use strict';
 
@@ -14,7 +14,7 @@ define([
                 addressAutofillIntl: '${$.parentName}.address_autofill_intl',
                 addressAutofillNl: '${$.parentName}.address_autofill_nl',
             },
-            template: 'Flekto_Postcode/content/address-autofill-formatted-output',
+            template: 'PostcodeEu_AddressValidation/content/address-autofill-formatted-output',
             visible: false,
             additionalClasses: {
                 'address-autofill-formatted-output': true,
diff --git a/view/frontend/web/js/form/components/checkout/address-autofill-bypass.js b/view/frontend/web/js/form/components/checkout/address-autofill-bypass.js
index 0ca730f..6263a20 100644
--- a/view/frontend/web/js/form/components/checkout/address-autofill-bypass.js
+++ b/view/frontend/web/js/form/components/checkout/address-autofill-bypass.js
@@ -1,5 +1,5 @@
 define([
-    'Flekto_Postcode/js/form/components/address-autofill-bypass',
+    'PostcodeEu_AddressValidation/js/form/components/address-autofill-bypass',
 ], function (Html) {
     'use strict';
 
diff --git a/view/frontend/web/js/form/components/checkout/address-autofill-formatted-output.js b/view/frontend/web/js/form/components/checkout/address-autofill-formatted-output.js
index 3d1360d..0b1e10e 100644
--- a/view/frontend/web/js/form/components/checkout/address-autofill-formatted-output.js
+++ b/view/frontend/web/js/form/components/checkout/address-autofill-formatted-output.js
@@ -1,5 +1,5 @@
 define([
-    'Flekto_Postcode/js/form/components/address-autofill-formatted-output',
+    'PostcodeEu_AddressValidation/js/form/components/address-autofill-formatted-output',
 ], function (Html) {
     'use strict';
 
diff --git a/view/frontend/web/js/form/components/checkout/address-autofill-nl.js b/view/frontend/web/js/form/components/checkout/address-autofill-nl.js
index c36a595..b9fa57e 100644
--- a/view/frontend/web/js/form/components/checkout/address-autofill-nl.js
+++ b/view/frontend/web/js/form/components/checkout/address-autofill-nl.js
@@ -1,7 +1,7 @@
 define([
-    'Flekto_Postcode/js/form/components/address-autofill-nl',
+    'PostcodeEu_AddressValidation/js/form/components/address-autofill-nl',
     'uiRegistry',
-    'Flekto_Postcode/js/model/address-nl',
+    'PostcodeEu_AddressValidation/js/model/address-nl',
 ], function (AddressAutofillNl, Registry, AddressNlModel) {
     'use strict';
 
diff --git a/view/frontend/web/js/form/components/customer/address/address-autofill-bypass.js b/view/frontend/web/js/form/components/customer/address/address-autofill-bypass.js
index 5654194..972b10a 100644
--- a/view/frontend/web/js/form/components/customer/address/address-autofill-bypass.js
+++ b/view/frontend/web/js/form/components/customer/address/address-autofill-bypass.js
@@ -1,5 +1,5 @@
 define([
-    'Flekto_Postcode/js/form/components/address-autofill-bypass',
+    'PostcodeEu_AddressValidation/js/form/components/address-autofill-bypass',
 ], function (Html) {
     'use strict';
 
diff --git a/view/frontend/web/js/form/components/customer/address/address-autofill-formatted-output.js b/view/frontend/web/js/form/components/customer/address/address-autofill-formatted-output.js
index 2a9fa48..345b683 100644
--- a/view/frontend/web/js/form/components/customer/address/address-autofill-formatted-output.js
+++ b/view/frontend/web/js/form/components/customer/address/address-autofill-formatted-output.js
@@ -1,5 +1,5 @@
 define([
-    'Flekto_Postcode/js/form/components/address-autofill-formatted-output',
+    'PostcodeEu_AddressValidation/js/form/components/address-autofill-formatted-output',
 ], function (Html) {
     'use strict';
 
diff --git a/view/frontend/web/js/form/components/customer/address/address-autofill-nl.js b/view/frontend/web/js/form/components/customer/address/address-autofill-nl.js
index 42aaf76..ab2d0f5 100644
--- a/view/frontend/web/js/form/components/customer/address/address-autofill-nl.js
+++ b/view/frontend/web/js/form/components/customer/address/address-autofill-nl.js
@@ -1,7 +1,7 @@
 define([
-    'Flekto_Postcode/js/form/components/address-autofill-nl',
-    'Flekto_Postcode/js/action/customer/address/get-validated-address',
-    'Flekto_Postcode/js/model/address-nl',
+    'PostcodeEu_AddressValidation/js/form/components/address-autofill-nl',
+    'PostcodeEu_AddressValidation/js/action/customer/address/get-validated-address',
+    'PostcodeEu_AddressValidation/js/model/address-nl',
     'mage/translate',
 ], function (Collection, getValidatedAddress, AddressNlModel, $t) {
     'use strict';
diff --git a/view/frontend/web/js/form/element/address-autofill-field.js b/view/frontend/web/js/form/element/address-autofill-field.js
index 94adc19..138ef19 100644
--- a/view/frontend/web/js/form/element/address-autofill-field.js
+++ b/view/frontend/web/js/form/element/address-autofill-field.js
@@ -11,7 +11,7 @@ define([
                 visible: '${ $.parentName }:visible',
             },
             template: 'ui/form/field',
-            elementTmpl: 'Flekto_Postcode/form/element/address-autofill-field',
+            elementTmpl: 'PostcodeEu_AddressValidation/form/element/address-autofill-field',
             visible: false,
         },
 
diff --git a/view/frontend/web/js/form/element/checkout/address-autofill-intl.js b/view/frontend/web/js/form/element/checkout/address-autofill-intl.js
index 4a9c245..33d57bc 100644
--- a/view/frontend/web/js/form/element/checkout/address-autofill-intl.js
+++ b/view/frontend/web/js/form/element/checkout/address-autofill-intl.js
@@ -1,5 +1,5 @@
 define([
-    'Flekto_Postcode/js/form/element/address-autofill-intl',
+    'PostcodeEu_AddressValidation/js/form/element/address-autofill-intl',
     'uiRegistry',
     'mage/translate',
     'mageUtils',
diff --git a/view/frontend/web/js/form/element/customer/address/address-autofill-intl.js b/view/frontend/web/js/form/element/customer/address/address-autofill-intl.js
index 4e1540e..bc5b7c2 100644
--- a/view/frontend/web/js/form/element/customer/address/address-autofill-intl.js
+++ b/view/frontend/web/js/form/element/customer/address/address-autofill-intl.js
@@ -1,6 +1,6 @@
 define([
-    'Flekto_Postcode/js/form/element/address-autofill-intl',
-    'Flekto_Postcode/js/action/customer/address/get-validated-address',
+    'PostcodeEu_AddressValidation/js/form/element/address-autofill-intl',
+    'PostcodeEu_AddressValidation/js/action/customer/address/get-validated-address',
     'uiRegistry',
     'mageUtils',
 ], function (AddressAutofillIntl, getValidatedAddress, Registry, Utils) {
diff --git a/view/frontend/web/js/form/element/house-number.js b/view/frontend/web/js/form/element/house-number.js
index e3cf3aa..6c999a6 100644
--- a/view/frontend/web/js/form/element/house-number.js
+++ b/view/frontend/web/js/form/element/house-number.js
@@ -1,6 +1,6 @@
 define([
-    'Flekto_Postcode/js/form/element/address-autofill-field',
-    'Flekto_Postcode/js/model/address-nl',
+    'PostcodeEu_AddressValidation/js/form/element/address-autofill-field',
+    'PostcodeEu_AddressValidation/js/model/address-nl',
     'mage/translate',
 ], function (autofillField, AddressNlModel, $t) {
     'use strict';
diff --git a/view/frontend/web/js/form/element/postcode.js b/view/frontend/web/js/form/element/postcode.js
index 84e5ed1..a93e1db 100644
--- a/view/frontend/web/js/form/element/postcode.js
+++ b/view/frontend/web/js/form/element/postcode.js
@@ -1,5 +1,5 @@
 define([
-    'Flekto_Postcode/js/form/element/address-autofill-field',
+    'PostcodeEu_AddressValidation/js/form/element/address-autofill-field',
 ], function (autofillField) {
     'use strict';
 
diff --git a/view/frontend/web/js/validation/validator-mixin.js b/view/frontend/web/js/validation/validator-mixin.js
index 392496f..acfe33d 100644
--- a/view/frontend/web/js/validation/validator-mixin.js
+++ b/view/frontend/web/js/validation/validator-mixin.js
@@ -4,7 +4,7 @@
 
 define([
     'mage/translate',
-    'Flekto_Postcode/js/model/address-nl',
+    'PostcodeEu_AddressValidation/js/model/address-nl',
 ], function ($t, addressNlModel) {
     'use strict';