diff --git a/api/config/config-test.php b/api/config/config-test.php
index ae91b69..78a3649 100644
--- a/api/config/config-test.php
+++ b/api/config/config-test.php
@@ -25,8 +25,8 @@ return [
                     }
                 };
             },
-            common\components\SkinSystem\Api::class => function() {
-                return new class extends common\components\SkinSystem\Api {
+            common\components\SkinsSystemApi::class => function() {
+                return new class extends common\components\SkinsSystemApi {
                     public function textures(string $username): ?array {
                         return [
                             'SKIN' => [
diff --git a/common/components/Sentry/Component.php b/common/components/Sentry.php
similarity index 71%
rename from common/components/Sentry/Component.php
rename to common/components/Sentry.php
index 6c44a46..2b6fc7e 100644
--- a/common/components/Sentry/Component.php
+++ b/common/components/Sentry.php
@@ -1,11 +1,12 @@
 <?php
-namespace common\components\Sentry;
+declare(strict_types=1);
 
+namespace common\components;
+
+use mito\sentry\Component;
 use Yii;
 
-class Component extends \mito\sentry\Component {
-
-    public $jsNotifier = false;
+class Sentry extends Component {
 
     public function init() {
         if (!$this->enabled) {
diff --git a/common/components/SkinSystem/Api.php b/common/components/SkinsSystemApi.php
similarity index 95%
rename from common/components/SkinSystem/Api.php
rename to common/components/SkinsSystemApi.php
index 345a155..e624109 100644
--- a/common/components/SkinSystem/Api.php
+++ b/common/components/SkinsSystemApi.php
@@ -1,13 +1,13 @@
 <?php
 declare(strict_types=1);
 
-namespace common\components\SkinSystem;
+namespace common\components;
 
 use GuzzleHttp\ClientInterface;
 use Yii;
 
 // TODO: convert to complete Chrly client library
-class Api {
+class SkinsSystemApi {
 
     private const BASE_DOMAIN = 'http://skinsystem.ely.by';
 
diff --git a/common/config/config.php b/common/config/config.php
index 7f282c9..8b7e707 100644
--- a/common/config/config.php
+++ b/common/config/config.php
@@ -19,7 +19,7 @@ return [
         'definitions' => [
             GuzzleHttp\ClientInterface::class => GuzzleHttp\Client::class,
             Ely\Mojang\Api::class => Ely\Mojang\Api::class,
-            common\components\SkinSystem\Api::class => common\components\SkinSystem\Api::class,
+            common\components\SkinsSystemApi::class => common\components\SkinsSystemApi::class,
         ],
     ],
     'components' => [
@@ -68,7 +68,7 @@ return [
             ],
         ],
         'sentry' => [
-            'class' => common\components\Sentry\Component::class,
+            'class' => common\components\Sentry::class,
             'enabled' => !empty(getenv('SENTRY_DSN')),
             'dsn' => getenv('SENTRY_DSN'),
             'environment' => YII_ENV_DEV ? 'development' : 'production',
diff --git a/common/models/Textures.php b/common/models/Textures.php
index 9051a6c..e4a83b1 100644
--- a/common/models/Textures.php
+++ b/common/models/Textures.php
@@ -3,7 +3,7 @@ declare(strict_types=1);
 
 namespace common\models;
 
-use common\components\SkinSystem\Api as SkinSystemApi;
+use common\components\SkinsSystemApi as SkinSystemApi;
 use DateInterval;
 use DateTime;
 use GuzzleHttp\Exception\GuzzleException;