diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index cf6b97d..28a5446 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -15,12 +15,6 @@ declare(strict_types=1);
 namespace Modules\SupplierManagement\Controller;
 
 use Modules\Admin\Models\Account;
-use Modules\Admin\Models\Address;
-use Modules\Attribute\Models\Attribute;
-use Modules\Attribute\Models\AttributeType;
-use Modules\Attribute\Models\AttributeValue;
-use Modules\Attribute\Models\NullAttributeType;
-use Modules\Attribute\Models\NullAttributeValue;
 use Modules\Media\Models\MediaMapper;
 use Modules\Media\Models\PathSettings;
 use Modules\SupplierManagement\Models\Supplier;
@@ -34,11 +28,11 @@ use Modules\SupplierManagement\Models\SupplierL11nTypeMapper;
 use Modules\SupplierManagement\Models\SupplierMapper;
 use phpOMS\Localization\BaseStringL11n;
 use phpOMS\Localization\BaseStringL11nType;
-use phpOMS\Localization\ISO639x1Enum;
 use phpOMS\Localization\NullBaseStringL11nType;
 use phpOMS\Message\Http\RequestStatusCode;
 use phpOMS\Message\RequestAbstract;
 use phpOMS\Message\ResponseAbstract;
+use phpOMS\Stdlib\Base\Address;
 
 /**
  * SupplierManagement class.
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index 5f45f8b..a452b5c 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -225,7 +225,7 @@ final class BackendController extends Controller
 
         // Get item profile image
         // It might not be part of the 5 newest item files from above
-        // @todo: It would be nice to have something like this as a default method in the model e.g.
+        // @todo It would be nice to have something like this as a default method in the model e.g.
         // ItemManagement::getRelations()->with('types')->where(...);
         // This should return the relations and NOT the model itself
         $query   = new Builder($this->app->dbPool->get());
diff --git a/ICAL.txt b/ICAL.txt
index 019045f..f1b55ed 100755
--- a/ICAL.txt
+++ b/ICAL.txt
@@ -1,6 +1,6 @@
 # Individual Contributor License Agreement ("CLA") 1.0
 
-Thank you for your interest in Karaka-Management (the "Company"). In order to clarify the intellectual property license granted with Contributions from any person or entity, the Company must provide a Contributor License Agreement ("CLA") on file that has been made available to each Contributor. This license is for your protection as a Contributor as well as the protection of the Company and its users; it does not change your rights to use your own Contributions for any other purpose.
+Thank you for your interest in Jingga e. K. (the "Company"). In order to clarify the intellectual property license granted with Contributions from any person or entity, the Company must provide a Contributor License Agreement ("CLA") on file that has been made available to each Contributor. This license is for your protection as a Contributor as well as the protection of the Company and its users; it does not change your rights to use your own Contributions for any other purpose.
 
 By contributing to the Company You accept and agree to the following terms and conditions for Your present and future Contributions submitted to the Company. In return, the Company shall not use Your Contributions in a way that is contrary to the public benefit or inconsistent with its bylaws in effect at the time of the Contribution. Except for the license granted herein to the Company and recipients of software distributed by the Company, You reserve all right, title, and interest in and to Your Contributions.
 
diff --git a/Models/Supplier.php b/Models/Supplier.php
index f65eb9c..185d8c5 100755
--- a/Models/Supplier.php
+++ b/Models/Supplier.php
@@ -15,12 +15,12 @@ declare(strict_types=1);
 namespace Modules\SupplierManagement\Models;
 
 use Modules\Admin\Models\Account;
-use Modules\Admin\Models\Address;
-use Modules\Admin\Models\NullAddress;
 use Modules\Editor\Models\EditorDoc;
 use Modules\Payment\Models\Payment;
 use Modules\Profile\Models\ContactElement;
 use Modules\Profile\Models\NullContactElement;
+use phpOMS\Stdlib\Base\Address;
+use phpOMS\Stdlib\Base\NullAddress;
 
 /**
  * Supplier class.
diff --git a/Theme/Backend/supplier-profile.tpl.php b/Theme/Backend/supplier-profile.tpl.php
index bb56341..2086541 100755
--- a/Theme/Backend/supplier-profile.tpl.php
+++ b/Theme/Backend/supplier-profile.tpl.php
@@ -133,24 +133,24 @@ echo $this->data['nav']->render();
                         </div>
                         <div class="portlet-body">
                             <table class="layout wf-100">
-                                <?php if (!empty($supplier->mainAddress->addition)) : ?>
-                                    <tr><td><label for="iName1"><?= $this->getHtml('Addition'); ?></label>
-                                <tr><td><input type="text" id="iName1" name="name1" value="<?= $this->printHtml($supplier->mainAddress->addition); ?>">
+                                <?php if (!empty($supplier->mainAddress->fao)) : ?>
+                                    <tr><td><label for="iFAO"><?= $this->getHtml('FAO'); ?></label>
+                                <tr><td><input type="text" id="iFAO" name="fao" value="<?= $this->printHtml($supplier->mainAddress->fao); ?>">
                                 <?php endif; ?>
-                                <tr><td><label for="iName1"><?= $this->getHtml('Address'); ?></label>
-                                <tr><td><input type="text" id="iName1" name="name1" value="<?= $this->printHtml($supplier->mainAddress->address); ?>" required>
-                                <tr><td><label for="iName1"><?= $this->getHtml('Postal'); ?></label>
-                                <tr><td><input type="text" id="iName1" name="name1" value="<?= $this->printHtml($supplier->mainAddress->postal); ?>" required>
-                                <tr><td><label for="iName1"><?= $this->getHtml('City'); ?></label>
-                                <tr><td><input type="text" id="iName1" name="name1" value="<?= $this->printHtml($supplier->mainAddress->city); ?>" required>
-                                <tr><td><label for="iName1"><?= $this->getHtml('Country'); ?></label>
-                                <tr><td><select name="country">
+                                <tr><td><label for="iAddress"><?= $this->getHtml('Address'); ?></label>
+                                <tr><td><input type="text" id="iAddress" name="address" value="<?= $this->printHtml($supplier->mainAddress->address); ?>" required>
+                                <tr><td><label for="iZip"><?= $this->getHtml('Postal'); ?></label>
+                                <tr><td><input type="text" id="iZip" name="zip" value="<?= $this->printHtml($supplier->mainAddress->postal); ?>" required>
+                                <tr><td><label for="iCity"><?= $this->getHtml('City'); ?></label>
+                                <tr><td><input type="text" id="iCity" name="city" value="<?= $this->printHtml($supplier->mainAddress->city); ?>" required>
+                                <tr><td><label for="iCountry"><?= $this->getHtml('Country'); ?></label>
+                                <tr><td><select id="iCountry" name="country">
                                     <?php foreach ($countryCodes as $code3 => $code2) : ?>
                                         <option value="<?= $this->printHtml($code2); ?>"<?= $this->printHtml($code2 === $supplier->mainAddress->getCountry() ? ' selected' : ''); ?>><?= $this->printHtml($countries[$code3]); ?>
-                                        <?php endforeach; ?>
+                                    <?php endforeach; ?>
                                     </select>
-                                <tr><td><label for="iName1"><?= $this->getHtml('Map'); ?></label>
-                                <tr><td><div id="supplierMap" class="map" data-lat="<?= $supplier->mainAddress->lat; ?>" data-lon="<?= $supplier->mainAddress->lon; ?>"></div>
+                                <tr><td><label for="iSupplierMap"><?= $this->getHtml('Map'); ?></label>
+                                <tr><td><div id="iSupplierMap" class="map" data-lat="<?= $supplier->mainAddress->lat; ?>" data-lon="<?= $supplier->mainAddress->lon; ?>"></div>
                             </table>
                         </div>
                     </section>