Collapse namespace in CMS

collapse namespaces

135 files changed, 271 insertions, 562 deletions

diff --git a/ydb/core/cms/audit_log.cpp b/ydb/core/cms/audit_log.cpp
index d1827c117d1..7b5ccef49f9 100644
--- a/ydb/core/cms/audit_log.cpp
+++ b/ydb/core/cms/audit_log.cpp
@@ -4,8 +4,7 @@
 
 #include <util/string/builder.h>
 
-namespace NKikimr {
-namespace NCms {
+namespace NKikimr::NCms {
 
 void AuditLog(const TString& component, const TString& message, const TActorContext& ctx) {
     LOG_NOTICE_S(ctx, NKikimrServices::CMS, "[AuditLog] [" << component << "] " << message);
@@ -36,5 +35,4 @@ void AuditLog(const TString& component, NMon::TEvHttpInfo::TPtr& request, const
     AuditLog(component, message, ctx);
 }
 
-} // NCms
-} // NKikimr
+} // namespace NKikimr::NCms
diff --git a/ydb/core/cms/audit_log.h b/ydb/core/cms/audit_log.h
index 472e12f8be6..93428b00e68 100644
--- a/ydb/core/cms/audit_log.h
+++ b/ydb/core/cms/audit_log.h
@@ -4,8 +4,7 @@
 
 #include <library/cpp/actors/core/mon.h>
 
-namespace NKikimr {
-namespace NCms {
+namespace NKikimr::NCms {
 
 void AuditLog(const TString& component, const TString& message, const TActorContext& ctx);
 void AuditLog(const TString& component, const IEventBase* request, const IEventBase* response, const TActorContext& ctx);
@@ -13,5 +12,4 @@ void AuditLog(const TString& component, const IEventBase* request, const IEventB
 // for http request/response
 void AuditLog(const TString& component, NMon::TEvHttpInfo::TPtr& request, const TString& response, const TActorContext& ctx);
 
-} // NCms
-} // NKikimr
+} // namespace NKikimr::NCms
diff --git a/ydb/core/cms/base_handler.h b/ydb/core/cms/base_handler.h
index b5aa12761b3..d2d8545ebd8 100644
--- a/ydb/core/cms/base_handler.h
+++ b/ydb/core/cms/base_handler.h
@@ -4,8 +4,7 @@
 
 #include <library/cpp/actors/core/mon.h>
 
-namespace NKikimr {
-namespace NCms {
+namespace NKikimr::NCms {
 
 class TApiMethodHandlerBase {
 public:
@@ -14,5 +13,4 @@ public:
     virtual IActor *CreateHandlerActor(NMon::TEvHttpInfo::TPtr &event) = 0;
 };
 
-} // NCms
-} // NKikimr
+} // namespace NKikimr::NCms
diff --git a/ydb/core/cms/cluster_info.cpp b/ydb/core/cms/cluster_info.cpp
index 733f3fc7024..b744e846855 100644
--- a/ydb/core/cms/cluster_info.cpp
+++ b/ydb/core/cms/cluster_info.cpp
@@ -12,8 +12,7 @@
 #define BLOG_D(stream) LOG_DEBUG_S(*TlsActivationContext, NKikimrServices::CMS, stream)
 #define BLOG_ERROR(stream) LOG_ERROR_S(*TlsActivationContext, NKikimrServices::CMS, stream)
 
-namespace NKikimr {
-namespace NCms {
+namespace NKikimr::NCms {
 
 using namespace NNodeWhiteboard;
 using namespace NKikimrCms;
@@ -916,5 +915,4 @@ void TClusterInfo::DebugDump(const TActorContext &ctx) const
     }
 }
 
-} // NCms
-} // NKikimr
+} // namespace NKikimr::NCms
diff --git a/ydb/core/cms/cluster_info.h b/ydb/core/cms/cluster_info.h
index 38c8aef06fe..3eacdb8934d 100644
--- a/ydb/core/cms/cluster_info.h
+++ b/ydb/core/cms/cluster_info.h
@@ -20,8 +20,7 @@
 #include <util/generic/set.h>
 #include "util/generic/ptr.h"
 
-namespace NKikimr {
-namespace NCms {
+namespace NKikimr::NCms {
 
 // Forward declarations.
 class TClusterInfo;
@@ -951,5 +950,4 @@ inline bool ActionRequiresHost(const NKikimrCms::TAction &action)
 }
 
 
-} // NCms
-} // NKikimr
+} // namespace NKikimr::NCms
diff --git a/ydb/core/cms/cms.cpp b/ydb/core/cms/cms.cpp
index 2f2318cfc9b..29a46d9dbc9 100644
--- a/ydb/core/cms/cms.cpp
+++ b/ydb/core/cms/cms.cpp
@@ -22,8 +22,7 @@
 #include <util/string/join.h>
 #include <util/system/hostname.h>
 
-namespace NKikimr {
-namespace NCms {
+namespace NKikimr::NCms {
 
 using namespace NNodeWhiteboard;
 using namespace NKikimrCms;
@@ -2068,5 +2067,4 @@ IActor *CreateCms(const TActorId &tablet, TTabletStorageInfo *info)
     return new TCms(tablet, info);
 }
 
-} // NCms
-} // NKikimr
+} // namespace NKikimr::NCms
diff --git a/ydb/core/cms/cms.h b/ydb/core/cms/cms.h
index c8826cba52b..55775843d57 100644
--- a/ydb/core/cms/cms.h
+++ b/ydb/core/cms/cms.h
@@ -29,8 +29,7 @@
  *     https://wiki.yandex-team.ru/users/ienkovich/docs/ydb/cms/
  */
 
-namespace NKikimr {
-namespace NCms {
+namespace NKikimr::NCms {
 
 struct TEvCms {
     enum EEv {
@@ -335,5 +334,4 @@ struct TEvCms {
 
 IActor *CreateCms(const TActorId &tablet, TTabletStorageInfo *info);
 
-} // NCms
-} // NKikimr
+} // namespace NKikimr::NCms
diff --git a/ydb/core/cms/cms_impl.h b/ydb/core/cms/cms_impl.h
index ccf626dcf40..ff14ba60fe7 100644
--- a/ydb/core/cms/cms_impl.h
+++ b/ydb/core/cms/cms_impl.h
@@ -21,8 +21,7 @@
 #include <util/generic/stack.h>
 #include <util/generic/queue.h>
 
-namespace NKikimr {
-namespace NCms {
+namespace NKikimr::NCms {
 
 using NConsole::TEvConsole;
 using NTabletFlatExecutor::TTabletExecutedFlat;
@@ -457,5 +456,4 @@ public:
 
 };
 
-} // NCms
-} // NKikimr
+} // namespace NKikimr::NCms
diff --git a/ydb/core/cms/cms_state.h b/ydb/core/cms/cms_state.h
index 5f0b6ff2e21..1c604f34450 100644
--- a/ydb/core/cms/cms_state.h
+++ b/ydb/core/cms/cms_state.h
@@ -8,8 +8,7 @@
 #include <util/string/builder.h>
 #include <util/string/join.h>
 
-namespace NKikimr {
-namespace NCms {
+namespace NKikimr::NCms {
 
 struct TWalleTaskInfo {
     TString TaskId;
@@ -59,5 +58,4 @@ struct TCmsState : public TAtomicRefCount<TCmsState> {
 
 using TCmsStatePtr = TIntrusivePtr<TCmsState>;
 
-} // NCms
-} // NKikimr
+} // namespace NKikimr::NCms
diff --git a/ydb/core/cms/cms_tx_get_log_tail.cpp b/ydb/core/cms/cms_tx_get_log_tail.cpp
index 51951270def..047eb571c0f 100644
--- a/ydb/core/cms/cms_tx_get_log_tail.cpp
+++ b/ydb/core/cms/cms_tx_get_log_tail.cpp
@@ -1,8 +1,7 @@
 #include "cms_impl.h"
 #include "scheme.h"
 
-namespace NKikimr {
-namespace NCms {
+namespace NKikimr::NCms {
 
 using namespace NKikimrCms;
 
@@ -64,5 +63,4 @@ ITransaction *TCms::CreateTxGetLogTail(TEvCms::TEvGetLogTailRequest::TPtr &ev)
     return new TTxGetLogTail(this, ev);
 }
 
-} // NCms
-} // NKikimr
+} // namespace NKikimr::NCms
diff --git a/ydb/core/cms/cms_tx_init_scheme.cpp b/ydb/core/cms/cms_tx_init_scheme.cpp
index 51074f1b1ed..cd73bfb6285 100644
--- a/ydb/core/cms/cms_tx_init_scheme.cpp
+++ b/ydb/core/cms/cms_tx_init_scheme.cpp
@@ -1,8 +1,7 @@
 #include "cms_impl.h"
 #include "scheme.h"
 
-namespace NKikimr {
-namespace NCms {
+namespace NKikimr::NCms {
 
 class TCms::TTxInitScheme : public TTransactionBase<TCms> {
 public:
@@ -35,5 +34,4 @@ ITransaction* TCms::CreateTxInitScheme()
     return new TTxInitScheme(this);
 }
 
-} // NCms
-} // NKikimr
+} // namespace NKikimr::NCms
diff --git a/ydb/core/cms/cms_tx_load_state.cpp b/ydb/core/cms/cms_tx_load_state.cpp
index cee378a860e..bacfbdbaba3 100644
--- a/ydb/core/cms/cms_tx_load_state.cpp
+++ b/ydb/core/cms/cms_tx_load_state.cpp
@@ -7,8 +7,7 @@
 
 #include <util/system/hostname.h>
 
-namespace NKikimr {
-namespace NCms {
+namespace NKikimr::NCms {
 
 class TCms::TTxLoadState : public TTransactionBase<TCms> {
 public:
@@ -205,5 +204,4 @@ ITransaction* TCms::CreateTxLoadState()
     return new TTxLoadState(this);
 }
 
-} // NCms
-} // NKikimr
+} // namespace NKikimr::NCms
diff --git a/ydb/core/cms/cms_tx_log_and_send.cpp b/ydb/core/cms/cms_tx_log_and_send.cpp
index 228dcee5670..c9929df78ce 100644
--- a/ydb/core/cms/cms_tx_log_and_send.cpp
+++ b/ydb/core/cms/cms_tx_log_and_send.cpp
@@ -1,8 +1,7 @@
 #include "cms_impl.h"
 #include "scheme.h"
 
-namespace NKikimr {
-namespace NCms {
+namespace NKikimr::NCms {
 
 class TCms::TTxLogAndSend : public TTransactionBase<TCms> {
 public:
@@ -42,5 +41,4 @@ ITransaction *TCms::CreateTxLogAndSend(TEvPrivate::TEvLogAndSend::TPtr &ev)
     return new TTxLogAndSend(this, ev);
 }
 
-} // NCms
-} // NKikimr
+} // namespace NKikimr::NCms
diff --git a/ydb/core/cms/cms_tx_log_cleanup.cpp b/ydb/core/cms/cms_tx_log_cleanup.cpp
index 0ffcceeb6bd..6a1d966345b 100644
--- a/ydb/core/cms/cms_tx_log_cleanup.cpp
+++ b/ydb/core/cms/cms_tx_log_cleanup.cpp
@@ -1,8 +1,7 @@
 #include "cms_impl.h"
 #include "scheme.h"
 
-namespace NKikimr {
-namespace NCms {
+namespace NKikimr::NCms {
 
 class TCms::TTxLogCleanup : public TTransactionBase<TCms> {
 public:
@@ -35,5 +34,4 @@ ITransaction *TCms::CreateTxLogCleanup()
     return new TTxLogCleanup(this);
 }
 
-} // NCms
-} // NKikimr
+} // namespace NKikimr::NCms
diff --git a/ydb/core/cms/cms_tx_process_notification.cpp b/ydb/core/cms/cms_tx_process_notification.cpp
index e1f4e7e1dbc..902a39dc92b 100644
--- a/ydb/core/cms/cms_tx_process_notification.cpp
+++ b/ydb/core/cms/cms_tx_process_notification.cpp
@@ -3,8 +3,7 @@
 
 #include <google/protobuf/text_format.h>
 
-namespace NKikimr {
-namespace NCms {
+namespace NKikimr::NCms {
 
 class TCms::TTxProcessNotification : public TTransactionBase<TCms> {
 public:
@@ -69,5 +68,4 @@ ITransaction* TCms::CreateTxProcessNotification(TEvCms::TEvNotification::TPtr &e
     return new TTxProcessNotification(this, ev.Release());
 }
 
-} // NCms
-} // NKikimr
+} // namespace NKikimr::NCms
diff --git a/ydb/core/cms/cms_tx_reject_notification.cpp b/ydb/core/cms/cms_tx_reject_notification.cpp
index 5794e06388a..3dc8c6097bc 100644
--- a/ydb/core/cms/cms_tx_reject_notification.cpp
+++ b/ydb/core/cms/cms_tx_reject_notification.cpp
@@ -3,8 +3,7 @@
 
 #include <google/protobuf/text_format.h>
 
-namespace NKikimr {
-namespace NCms {
+namespace NKikimr::NCms {
 
 class TCms::TTxRejectNotification : public TTransactionBase<TCms> {
 public:
@@ -68,5 +67,4 @@ ITransaction *TCms::CreateTxRejectNotification(TEvCms::TEvManageNotificationRequ
     return new TTxRejectNotification(this, ev.Release());
 }
 
-} // NCms
-} // NKikimr
+} // namespace NKikimr::NCms
diff --git a/ydb/core/cms/cms_tx_remove_expired_notifications.cpp b/ydb/core/cms/cms_tx_remove_expired_notifications.cpp
index 1eff9849f5d..574660cd620 100644
--- a/ydb/core/cms/cms_tx_remove_expired_notifications.cpp
+++ b/ydb/core/cms/cms_tx_remove_expired_notifications.cpp
@@ -3,8 +3,7 @@
 
 #include <google/protobuf/text_format.h>
 
-namespace NKikimr {
-namespace NCms {
+namespace NKikimr::NCms {
 
 class TCms::TTxRemoveExpiredNotifications : public TTransactionBase<TCms> {
 public:
@@ -83,5 +82,4 @@ ITransaction *TCms::CreateTxRemoveExpiredNotifications()
     return new TTxRemoveExpiredNotifications(this);
 }
 
-} // NCms
-} // NKikimr
+} // namespace NKikimr::NCms
diff --git a/ydb/core/cms/cms_tx_remove_permissions.cpp b/ydb/core/cms/cms_tx_remove_permissions.cpp
index 4492dee128e..c1cbaebdd8b 100644
--- a/ydb/core/cms/cms_tx_remove_permissions.cpp
+++ b/ydb/core/cms/cms_tx_remove_permissions.cpp
@@ -3,8 +3,7 @@
 
 #include <google/protobuf/text_format.h>
 
-namespace NKikimr {
-namespace NCms {
+namespace NKikimr::NCms {
 
 class TCms::TTxRemovePermissions : public TTransactionBase<TCms> {
 public:
@@ -78,5 +77,4 @@ ITransaction* TCms::CreateTxRemovePermissions(TVector<TString> ids, THolder<IEve
     return new TTxRemovePermissions(this, std::move(ids), std::move(req), std::move(resp), expired);
 }
 
-} // NCms
-} // NKikimr
+} // namespace NKikimr::NCms
diff --git a/ydb/core/cms/cms_tx_remove_request.cpp b/ydb/core/cms/cms_tx_remove_request.cpp
index 65be4207c69..a890f5aa0e4 100644
--- a/ydb/core/cms/cms_tx_remove_request.cpp
+++ b/ydb/core/cms/cms_tx_remove_request.cpp
@@ -3,8 +3,7 @@
 
 #include <google/protobuf/text_format.h>
 
-namespace NKikimr {
-namespace NCms {
+namespace NKikimr::NCms {
 
 class TCms::TTxRemoveRequest : public TTransactionBase<TCms> {
 public:
@@ -56,5 +55,4 @@ ITransaction* TCms::CreateTxRemoveRequest(const TString &id, THolder<IEventBase>
     return new TTxRemoveRequest(this, id, std::move(req), std::move(resp));
 }
 
-} // NCms
-} // NKikimr
+} // NKikimr::NCms
diff --git a/ydb/core/cms/cms_tx_remove_walle_task.cpp b/ydb/core/cms/cms_tx_remove_walle_task.cpp
index dc6a082b283..aaff9dab76a 100644
--- a/ydb/core/cms/cms_tx_remove_walle_task.cpp
+++ b/ydb/core/cms/cms_tx_remove_walle_task.cpp
@@ -3,8 +3,7 @@
 
 #include <google/protobuf/text_format.h>
 
-namespace NKikimr {
-namespace NCms {
+namespace NKikimr::NCms {
 
 class TCms::TTxRemoveWalleTask : public TTransactionBase<TCms> {
 public:
@@ -51,5 +50,4 @@ ITransaction* TCms::CreateTxRemoveWalleTask(const TString &id)
     return new TTxRemoveWalleTask(this, id);
 }
 
-} // NCms
-} // NKikimr
+} // namespace NKikimr::NCms
diff --git a/ydb/core/cms/cms_tx_store_permissions.cpp b/ydb/core/cms/cms_tx_store_permissions.cpp
index 28cb4b18797..fc1a2df8743 100644
--- a/ydb/core/cms/cms_tx_store_permissions.cpp
+++ b/ydb/core/cms/cms_tx_store_permissions.cpp
@@ -3,8 +3,7 @@
 
 #include <google/protobuf/text_format.h>
 
-namespace NKikimr {
-namespace NCms {
+namespace NKikimr::NCms {
 
 class TCms::TTxStorePermissions : public TTransactionBase<TCms> {
 public:
@@ -105,5 +104,4 @@ ITransaction* TCms::CreateTxStorePermissions(THolder<IEventBase> req, TAutoPtr<I
     return new TTxStorePermissions(this, std::move(req), std::move(resp), owner, std::move(scheduled));
 }
 
-} // NCms
-} // NKikimr
+} // namespace NKikimr::NCms
diff --git a/ydb/core/cms/cms_tx_store_walle_task.cpp b/ydb/core/cms/cms_tx_store_walle_task.cpp
index 774d9116624..2b8b1d2cb57 100644
--- a/ydb/core/cms/cms_tx_store_walle_task.cpp
+++ b/ydb/core/cms/cms_tx_store_walle_task.cpp
@@ -3,8 +3,7 @@
 
 #include <google/protobuf/text_format.h>
 
-namespace NKikimr {
-namespace NCms {
+namespace NKikimr::NCms {
 
 class TCms::TTxStoreWalleTask : public TTransactionBase<TCms> {
 public:
@@ -68,5 +67,4 @@ ITransaction *TCms::CreateTxStoreWalleTask(const TWalleTaskInfo &task, THolder<I
     return new TTxStoreWalleTask(this, task, std::move(req), std::move(resp));
 }
 
-} // NCms
-} // NKikimr
+} // namespace NKikimr::NCms
diff --git a/ydb/core/cms/cms_tx_update_config.cpp b/ydb/core/cms/cms_tx_update_config.cpp
index f1f2b56d868..033a9cf28e7 100644
--- a/ydb/core/cms/cms_tx_update_config.cpp
+++ b/ydb/core/cms/cms_tx_update_config.cpp
@@ -2,8 +2,7 @@
 #include "scheme.h"
 #include "sentinel.h"
 
-namespace NKikimr {
-namespace NCms {
+namespace NKikimr::NCms {
 
 class TCms::TTxUpdateConfig : public TTransactionBase<TCms> {
 public:
@@ -99,5 +98,4 @@ ITransaction *TCms::CreateTxUpdateConfig(TEvCms::TEvSetConfigRequest::TPtr &ev)
                                ConfigSubscriptionId);
 }
 
-} // NCms
-} // NKikimr
+} // namespace NKikimr::NCms
diff --git a/ydb/core/cms/cms_tx_update_downtimes.cpp b/ydb/core/cms/cms_tx_update_downtimes.cpp
index 10c4d44819a..c44b1323767 100644
--- a/ydb/core/cms/cms_tx_update_downtimes.cpp
+++ b/ydb/core/cms/cms_tx_update_downtimes.cpp
@@ -1,8 +1,7 @@
 #include "cms_impl.h"
 #include "scheme.h"
 
-namespace NKikimr {
-namespace NCms {
+namespace NKikimr::NCms {
 
 class TCms::TTxUpdateDowntimes : public TTransactionBase<TCms> {
 public:
@@ -37,5 +36,4 @@ ITransaction *TCms::CreateTxUpdateDowntimes()
     return new TTxUpdateDowntimes(this);
 }
 
-} // NCms
-} // NKikimr
+} // namespace NKikimr::NCms
diff --git a/ydb/core/cms/config.h b/ydb/core/cms/config.h
index 301a5d20ec2..86cf3ddbf3d 100644
--- a/ydb/core/cms/config.h
+++ b/ydb/core/cms/config.h
@@ -8,8 +8,7 @@
 #include <util/generic/hash.h>
 #include <util/generic/map.h>
 
-namespace NKikimr {
-namespace NCms {
+namespace NKikimr::NCms {
 
 struct TCmsSentinelConfig {
     bool Enable = false;
@@ -228,5 +227,4 @@ struct TCmsConfig {
     }
 };
 
-} // NCms
-} // NKikimr
+} // namespace NKikimr::NCms
diff --git a/ydb/core/cms/console/config_helpers.cpp b/ydb/core/cms/console/config_helpers.cpp
index 6d5a81beaf0..7b436f65bcf 100644
--- a/ydb/core/cms/console/config_helpers.cpp
+++ b/ydb/core/cms/console/config_helpers.cpp
@@ -12,8 +12,7 @@
 #include <util/string/join.h>
 #include <util/system/hostname.h>
 
-namespace NKikimr {
-namespace NConsole {
+namespace NKikimr::NConsole {
 
 namespace {
 
@@ -447,5 +446,4 @@ IActor *CreateSubscriptionEraser(ui64 subscriptionId,
     return new TConfigHelper(subscriptionId, owner, cookie);
 }
 
-} // namespace NConsole
-} // namespace NKikimr
+} // namespace NKikimr::NConsole
diff --git a/ydb/core/cms/console/config_helpers.h b/ydb/core/cms/console/config_helpers.h
index b45b4ed5df3..0ff594779a7 100644
--- a/ydb/core/cms/console/config_helpers.h
+++ b/ydb/core/cms/console/config_helpers.h
@@ -1,8 +1,7 @@
 #pragma once
 #include "defs.h"
 
-namespace NKikimr {
-namespace NConsole {
+namespace NKikimr::NConsole {
 
 /**
  * Node config courier is used to get full or partial node config from
@@ -80,5 +79,4 @@ IActor *CreateSubscriptionEraser(ui64 subscriptionId,
                                  TActorId owner = TActorId(),
                                  ui64 cookie = 0);
 
-} // namespace NConsole
-} // namespace NKikimr
+} // namespace NKikimr::NConsole
diff --git a/ydb/core/cms/console/config_index.cpp b/ydb/core/cms/console/config_index.cpp
index 56186d478e4..c338689f773 100644
--- a/ydb/core/cms/console/config_index.cpp
+++ b/ydb/core/cms/console/config_index.cpp
@@ -3,8 +3,7 @@
 #include <util/string/builder.h>
 #include <util/string/join.h>
 
-namespace NKikimr {
-namespace NConsole {
+namespace NKikimr::NConsole {
 
 TUsageScope::TUsageScope()
     : Order(0)
@@ -867,5 +866,4 @@ void TSubscriptionModifications::DeepCopyFrom(const TSubscriptionModifications &
     ModifiedCookies = other.ModifiedCookies;
 }
 
-} // namespace NConsole
-} // namespace NKikimr
+} // namespace NKikimr::NConsole
diff --git a/ydb/core/cms/console/config_index.h b/ydb/core/cms/console/config_index.h
index 726c30bd12e..4554ce6c10f 100644
--- a/ydb/core/cms/console/config_index.h
+++ b/ydb/core/cms/console/config_index.h
@@ -11,8 +11,7 @@
 #include <util/generic/set.h>
 #include <util/stream/str.h>
 
-namespace NKikimr {
-namespace NConsole {
+namespace NKikimr::NConsole {
 
 struct TTenantAndNodeType {
     TTenantAndNodeType() = default;
@@ -81,8 +80,7 @@ struct TSubscriberId {
     TActorId ServiceId;
 };
 
-} // namespace NConsole
-} // namespace NKikimr
+} // namespace NKikimr::NConsole
 
 template<>
 struct THash<NKikimr::NConsole::TSubscriberId> {
@@ -107,8 +105,7 @@ struct THash<NKikimr::NConsole::TTenantAndNodeType> {
     }
 };
 
-namespace NKikimr {
-namespace NConsole {
+namespace NKikimr::NConsole {
 
 /**
  * Structre to hold config usage scope. For config items it is used similar
@@ -715,5 +712,4 @@ struct TSubscriptionModifications {
     THashMap<ui64, ui64> ModifiedCookies;
 };
 
-} // namespace NConsole
-} // namespace NKikimr
+} // namespace NKikimr::NConsole
diff --git a/ydb/core/cms/console/configs_config.cpp b/ydb/core/cms/console/configs_config.cpp
index 49447c5cd88..379bac3d37d 100644
--- a/ydb/core/cms/console/configs_config.cpp
+++ b/ydb/core/cms/console/configs_config.cpp
@@ -2,8 +2,7 @@
 
 #include <util/string/printf.h>
 
-namespace NKikimr {
-namespace NConsole {
+namespace NKikimr::NConsole {
 
 TConfigsConfig::TConfigsConfig(const NKikimrConsole::TConfigsConfig &config)
 {
@@ -50,5 +49,4 @@ bool TConfigsConfig::Check(const NKikimrConsole::TConfigsConfig &config,
 }
 
 
-} // namespace NConsole
-} // namespace NKikimr
+} // namespace NKikimr::NConsole
diff --git a/ydb/core/cms/console/configs_config.h b/ydb/core/cms/console/configs_config.h
index f2c139a4a73..05c5228e32e 100644
--- a/ydb/core/cms/console/configs_config.h
+++ b/ydb/core/cms/console/configs_config.h
@@ -4,8 +4,7 @@
 
 #include <util/generic/hash_set.h>
 
-namespace NKikimr {
-namespace NConsole {
+namespace NKikimr::NConsole {
 
 struct TConfigsConfig {
     static constexpr ui64 MAX_CONFIG_CHECKS_LIMIT = 100000;
@@ -29,5 +28,4 @@ struct TConfigsConfig {
     bool TreatWarningAsError;
 };
 
-} // namespace NConsole
-} // namespace NKikimr
+} // namespace NKikimr::NConsole
diff --git a/ydb/core/cms/console/configs_dispatcher.cpp b/ydb/core/cms/console/configs_dispatcher.cpp
index 8e507542392..7f6edf42325 100644
--- a/ydb/core/cms/console/configs_dispatcher.cpp
+++ b/ydb/core/cms/console/configs_dispatcher.cpp
@@ -25,8 +25,7 @@
 #define BLOG_ERROR(stream) LOG_ERROR_S(*TlsActivationContext, NKikimrServices::CONFIGS_DISPATCHER, stream)
 #define BLOG_TRACE(stream) LOG_TRACE_S(*TlsActivationContext, NKikimrServices::CONFIGS_DISPATCHER, stream)
 
-namespace NKikimr {
-namespace NConsole {
+namespace NKikimr::NConsole {
 
 namespace {
 
@@ -942,5 +941,4 @@ IActor *CreateConfigsDispatcher(const NKikimrConfig::TAppConfig &config)
     return new TConfigsDispatcher(config);
 }
 
-} // namespace NConsole
-} // namespace NKikimr
+} // namespace NKikimr::NConsole
diff --git a/ydb/core/cms/console/configs_dispatcher.h b/ydb/core/cms/console/configs_dispatcher.h
index 160d1ebac9c..8d1cf08d64a 100644
--- a/ydb/core/cms/console/configs_dispatcher.h
+++ b/ydb/core/cms/console/configs_dispatcher.h
@@ -5,8 +5,7 @@
 
 #include <util/generic/vector.h>
 
-namespace NKikimr {
-namespace NConsole {
+namespace NKikimr::NConsole {
 
 /**
  * Configs Dispatcher is used as a broker for subscriptions for
@@ -95,5 +94,4 @@ inline TActorId MakeConfigsDispatcherID(ui32 node = 0) {
     return TActorId(node, TStringBuf(x, 12));
 }
 
-} // namespace NConsole
-} // namespace NKikimr
+} // namespace NKikimr::NConsole
diff --git a/ydb/core/cms/console/console.cpp b/ydb/core/cms/console/console.cpp
index fe477202af5..e2ed125b40c 100644
--- a/ydb/core/cms/console/console.cpp
+++ b/ydb/core/cms/console/console.cpp
@@ -10,8 +10,7 @@
 
 #include <library/cpp/monlib/service/pages/templates.h>
 
-namespace NKikimr {
-namespace NConsole {
+namespace NKikimr::NConsole {
 
 void TConsole::OnActivateExecutor(const TActorContext &ctx)
 {
@@ -187,5 +186,4 @@ IActor *CreateConsole(const TActorId &tablet, TTabletStorageInfo *info)
     return new TConsole(tablet, info);
 }
 
-} // namespace NConsole
-} // namespace NKikimr
+} // namespace NKikimr::NConsole
diff --git a/ydb/core/cms/console/console.h b/ydb/core/cms/console/console.h
index 7370d21b20f..12c9e0bf5a3 100644
--- a/ydb/core/cms/console/console.h
+++ b/ydb/core/cms/console/console.h
@@ -7,8 +7,7 @@
 #include <ydb/core/protos/console_tenant.pb.h>
 #include <ydb/public/api/protos/ydb_cms.pb.h>
 
-namespace NKikimr {
-namespace NConsole {
+namespace NKikimr::NConsole {
 
 struct TEvConsole {
     enum EEv {
@@ -283,5 +282,4 @@ struct TEvConsole {
 
 IActor *CreateConsole(const TActorId &tablet, TTabletStorageInfo *info);
 
-} // namespace NConsole
-} // namespace NKikimr
+} // namespace NKikimr::NConsole
diff --git a/ydb/core/cms/console/console__add_config_subscription.cpp b/ydb/core/cms/console/console__add_config_subscription.cpp
index 3bb64227929..9673df00988 100644
--- a/ydb/core/cms/console/console__add_config_subscription.cpp
+++ b/ydb/core/cms/console/console__add_config_subscription.cpp
@@ -2,8 +2,7 @@
 
 #include <util/random/random.h>
 
-namespace NKikimr {
-namespace NConsole {
+namespace NKikimr::NConsole {
 
 class TConfigsManager::TTxAddConfigSubscription : public TTransactionBase<TConfigsManager> {
 public:
@@ -103,5 +102,4 @@ ITransaction *TConfigsManager::CreateTxAddConfigSubscription(TEvConsole::TEvAddC
     return new TTxAddConfigSubscription(ev, this);
 }
 
-} // namespace NConsole
-} // namespace NKikimr
+} // namespace NKikimr::NConsole
diff --git a/ydb/core/cms/console/console__alter_tenant.cpp b/ydb/core/cms/console/console__alter_tenant.cpp
index c0011cb68b7..90fe36df632 100644
--- a/ydb/core/cms/console/console__alter_tenant.cpp
+++ b/ydb/core/cms/console/console__alter_tenant.cpp
@@ -1,8 +1,7 @@
 #include "console_tenants_manager.h"
 #include "console_impl.h"
 
-namespace NKikimr {
-namespace NConsole {
+namespace NKikimr::NConsole {
 
 class TTenantsManager::TTxAlterTenant : public TTransactionBase<TTenantsManager> {
 public:
@@ -400,5 +399,4 @@ ITransaction *TTenantsManager::CreateTxAlterTenant(TEvConsole::TEvAlterTenantReq
     return new TTxAlterTenant(ev, this);
 }
 
-} // namespace NConsole
-} // namespace NKikimr
+} // namespace NKikimr::NConsole
diff --git a/ydb/core/cms/console/console__cleanup_subscriptions.cpp b/ydb/core/cms/console/console__cleanup_subscriptions.cpp
index c07d7a3a9d7..4a44271a9ff 100644
--- a/ydb/core/cms/console/console__cleanup_subscriptions.cpp
+++ b/ydb/core/cms/console/console__cleanup_subscriptions.cpp
@@ -6,8 +6,7 @@
 #include <ydb/core/base/path.h>
 #include <ydb/core/cms/console/validators/registry.h>
 
-namespace NKikimr {
-namespace NConsole {
+namespace NKikimr::NConsole {
 
 class TConfigsManager::TTxCleanupSubscriptions : public TTransactionBase<TConfigsManager> {
 public:
@@ -66,5 +65,4 @@ ITransaction *TConfigsManager::CreateTxCleanupSubscriptions(TEvInterconnect::TEv
     return new TTxCleanupSubscriptions(ev, this);
 }
 
-} // namespace NConsole
-} // namespace NKikimr
+} // namespace NKikimr::NConsole
diff --git a/ydb/core/cms/console/console__configure.cpp b/ydb/core/cms/console/console__configure.cpp
index 5a238d7533b..bf2fc0e491c 100644
--- a/ydb/core/cms/console/console__configure.cpp
+++ b/ydb/core/cms/console/console__configure.cpp
@@ -3,8 +3,7 @@
 
 #include <ydb/library/aclib/aclib.h>
 
-namespace NKikimr {
-namespace NConsole {
+namespace NKikimr::NConsole {
 
 class TConfigsManager::TTxConfigure : public TTransactionBase<TConfigsManager> {
 public:
@@ -620,5 +619,4 @@ ITransaction *TConfigsManager::CreateTxConfigure(TEvConsole::TEvConfigureRequest
     return new TTxConfigure(ev, this);
 }
 
-} // namespace NConsole
-} // namespace NKikimr
+} // namespace NKikimr::NConsole
diff --git a/ydb/core/cms/console/console__create_tenant.cpp b/ydb/core/cms/console/console__create_tenant.cpp
index 469261f25a2..2cb9bd68485 100644
--- a/ydb/core/cms/console/console__create_tenant.cpp
+++ b/ydb/core/cms/console/console__create_tenant.cpp
@@ -1,7 +1,6 @@
 #include "console_tenants_manager.h"
 
-namespace NKikimr {
-namespace NConsole {
+namespace NKikimr::NConsole {
 
 using namespace NOperationId;
 
@@ -320,5 +319,4 @@ ITransaction *TTenantsManager::CreateTxCreateTenant(TEvConsole::TEvCreateTenantR
     return new TTxCreateTenant(ev, this);
 }
 
-} // namespace NConsole
-} // namespace NKikimr
+} // namespace NKikimr::NConsole
diff --git a/ydb/core/cms/console/console__get_log_tail.cpp b/ydb/core/cms/console/console__get_log_tail.cpp
index 7ed8141a3e8..406e0186391 100644
--- a/ydb/core/cms/console/console__get_log_tail.cpp
+++ b/ydb/core/cms/console/console__get_log_tail.cpp
@@ -1,7 +1,6 @@
 #include "console_configs_manager.h"
 
-namespace NKikimr {
-namespace NConsole {
+namespace NKikimr::NConsole {
 
 using namespace NKikimrConsole;
 
@@ -59,5 +58,4 @@ ITransaction *TConfigsManager::CreateTxGetLogTail(TEvConsole::TEvGetLogTailReque
     return new TTxGetLogTail(this, ev);
 }
 
-} // NConsole
-} // NKikimr
+} // namespace NKikimr::NConsole
diff --git a/ydb/core/cms/console/console__init_scheme.cpp b/ydb/core/cms/console/console__init_scheme.cpp
index 2ed31127b11..8957423d2cc 100644
--- a/ydb/core/cms/console/console__init_scheme.cpp
+++ b/ydb/core/cms/console/console__init_scheme.cpp
@@ -1,7 +1,6 @@
 #include "console_impl.h"
 
-namespace NKikimr {
-namespace NConsole {
+namespace NKikimr::NConsole {
 
 class TConsole::TTxInitScheme : public TTransactionBase<TConsole> {
 public:
@@ -33,5 +32,4 @@ ITransaction *TConsole::CreateTxInitScheme()
     return new TTxInitScheme(this);
 }
 
-} // namespace NConsole
-} // namespace NKikimr
+} // namespace NKikimr::NConsole
diff --git a/ydb/core/cms/console/console__load_state.cpp b/ydb/core/cms/console/console__load_state.cpp
index 05c05910067..b70c1dedb12 100644
--- a/ydb/core/cms/console/console__load_state.cpp
+++ b/ydb/core/cms/console/console__load_state.cpp
@@ -2,8 +2,7 @@
 #include "console_impl.h"
 #include "console_tenants_manager.h"
 
-namespace NKikimr {
-namespace NConsole {
+namespace NKikimr::NConsole {
 
 class TConsole::TTxLoadState : public TTransactionBase<TConsole> {
 public:
@@ -83,5 +82,4 @@ ITransaction *TConsole::CreateTxLoadState()
     return new TTxLoadState(this);
 }
 
-} // namespace NConsole
-} // namespace NKikimr
+} // namespace NKikimr::NConsole
diff --git a/ydb/core/cms/console/console__log_cleanup.cpp b/ydb/core/cms/console/console__log_cleanup.cpp
index 821807e554c..a9fdbdbf122 100644
--- a/ydb/core/cms/console/console__log_cleanup.cpp
+++ b/ydb/core/cms/console/console__log_cleanup.cpp
@@ -1,7 +1,6 @@
 #include "console_configs_manager.h"
 
-namespace NKikimr {
-namespace NConsole {
+namespace NKikimr::NConsole {
 
 class TConfigsManager::TTxLogCleanup : public TTransactionBase<TConfigsManager> {
 public:
@@ -36,5 +35,4 @@ ITransaction *TConfigsManager::CreateTxLogCleanup()
     return new TTxLogCleanup(this);
 }
 
-} // NConsole
-} // NKikimr
+} // NKikimr::NConsole
diff --git a/ydb/core/cms/console/console__remove_computational_units.cpp b/ydb/core/cms/console/console__remove_computational_units.cpp
index 699c1b5c2af..42ffffe1b6e 100644
--- a/ydb/core/cms/console/console__remove_computational_units.cpp
+++ b/ydb/core/cms/console/console__remove_computational_units.cpp
@@ -1,7 +1,6 @@
 #include "console_tenants_manager.h"
 
-namespace NKikimr {
-namespace NConsole {
+namespace NKikimr::NConsole {
 
 using namespace NOperationId;
 
@@ -56,5 +55,4 @@ ITransaction *TTenantsManager::CreateTxRemoveComputationalUnits(TTenant::TPtr te
     return new TTxRemoveComputationalUnits(tenant, this);
 }
 
-} // namespace NConsole
-} // namespace NKikimr
+} // namespace NKikimr::NConsole
diff --git a/ydb/core/cms/console/console__remove_config_subscription.cpp b/ydb/core/cms/console/console__remove_config_subscription.cpp
index ae24deb1a87..e654ec4318a 100644
--- a/ydb/core/cms/console/console__remove_config_subscription.cpp
+++ b/ydb/core/cms/console/console__remove_config_subscription.cpp
@@ -1,7 +1,6 @@
 #include "console_configs_manager.h"
 
-namespace NKikimr {
-namespace NConsole {
+namespace NKikimr::NConsole {
 
 class TConfigsManager::TTxRemoveConfigSubscription : public TTransactionBase<TConfigsManager> {
 public:
@@ -83,5 +82,4 @@ ITransaction *TConfigsManager::CreateTxRemoveConfigSubscription(TEvConsole::TEvR
     return new TTxRemoveConfigSubscription(ev, this);
 }
 
-} // namespace NConsole
-} // namespace NKikimr
+} // namespace NKikimr::NConsole
diff --git a/ydb/core/cms/console/console__remove_config_subscriptions.cpp b/ydb/core/cms/console/console__remove_config_subscriptions.cpp
index 584b427cdc1..e7ec81f811f 100644
--- a/ydb/core/cms/console/console__remove_config_subscriptions.cpp
+++ b/ydb/core/cms/console/console__remove_config_subscriptions.cpp
@@ -1,7 +1,6 @@
 #include "console_configs_manager.h"
 
-namespace NKikimr {
-namespace NConsole {
+namespace NKikimr::NConsole {
 
 class TConfigsManager::TTxRemoveConfigSubscriptions : public TTransactionBase<TConfigsManager> {
 public:
@@ -69,5 +68,4 @@ ITransaction *TConfigsManager::CreateTxRemoveConfigSubscriptions(TEvConsole::TEv
     return new TTxRemoveConfigSubscriptions(ev, this);
 }
 
-} // namespace NConsole
-} // namespace NKikimr
+} // namespace NKikimr::NConsole
diff --git a/ydb/core/cms/console/console__remove_tenant.cpp b/ydb/core/cms/console/console__remove_tenant.cpp
index 14bf4e19f36..59dc4db4306 100644
--- a/ydb/core/cms/console/console__remove_tenant.cpp
+++ b/ydb/core/cms/console/console__remove_tenant.cpp
@@ -1,7 +1,6 @@
 #include "console_tenants_manager.h"
 
-namespace NKikimr {
-namespace NConsole {
+namespace NKikimr::NConsole {
 
 using namespace NOperationId;
 
@@ -124,5 +123,4 @@ ITransaction *TTenantsManager::CreateTxRemoveTenant(TEvConsole::TEvRemoveTenantR
     return new TTxRemoveTenant(ev, this);
 }
 
-} // namespace NConsole
-} // namespace NKikimr
+} // namespace NKikimr::NConsole
diff --git a/ydb/core/cms/console/console__remove_tenant_done.cpp b/ydb/core/cms/console/console__remove_tenant_done.cpp
index 406b3d473ae..522558aa2aa 100644
--- a/ydb/core/cms/console/console__remove_tenant_done.cpp
+++ b/ydb/core/cms/console/console__remove_tenant_done.cpp
@@ -1,7 +1,6 @@
 #include "console_tenants_manager.h"
 
-namespace NKikimr {
-namespace NConsole {
+namespace NKikimr::NConsole {
 
 using namespace NOperationId;
 
@@ -51,5 +50,4 @@ ITransaction *TTenantsManager::CreateTxRemoveTenantDone(TTenant::TPtr tenant)
     return new TTxRemoveTenantDone(tenant, this);
 }
 
-} // namespace NConsole
-} // namespace NKikimr
+} // namespace NKikimr::NConsole
diff --git a/ydb/core/cms/console/console__remove_tenant_failed.cpp b/ydb/core/cms/console/console__remove_tenant_failed.cpp
index 541bb5d5936..723766d6d4f 100644
--- a/ydb/core/cms/console/console__remove_tenant_failed.cpp
+++ b/ydb/core/cms/console/console__remove_tenant_failed.cpp
@@ -1,7 +1,6 @@
 #include "console_tenants_manager.h"
 
-namespace NKikimr {
-namespace NConsole {
+namespace NKikimr::NConsole {
 
 using namespace NOperationId;
 
@@ -60,5 +59,4 @@ ITransaction *TTenantsManager::CreateTxRemoveTenantFailed(TTenant::TPtr tenant,
     return new TTxRemoveTenantFailed(tenant, code, this);
 }
 
-} // namespace NConsole
-} // namespace NKikimr
+} // namespace NKikimr::NConsole
diff --git a/ydb/core/cms/console/console__replace_config_subscriptions.cpp b/ydb/core/cms/console/console__replace_config_subscriptions.cpp
index eabed14288d..4b75c3a1b52 100644
--- a/ydb/core/cms/console/console__replace_config_subscriptions.cpp
+++ b/ydb/core/cms/console/console__replace_config_subscriptions.cpp
@@ -2,8 +2,7 @@
 
 #include <util/random/random.h>
 
-namespace NKikimr {
-namespace NConsole {
+namespace NKikimr::NConsole {
 
 class TConfigsManager::TTxReplaceConfigSubscriptions : public TTransactionBase<TConfigsManager> {
 public:
@@ -108,5 +107,4 @@ ITransaction *TConfigsManager::CreateTxReplaceConfigSubscriptions(TEvConsole::TE
     return new TTxReplaceConfigSubscriptions(ev, this);
 }
 
-} // namespace NConsole
-} // namespace NKikimr
+} // namespace NKikimr::NConsole
diff --git a/ydb/core/cms/console/console__revert_pool_state.cpp b/ydb/core/cms/console/console__revert_pool_state.cpp
index f4eb716e6a0..6e43230db35 100644
--- a/ydb/core/cms/console/console__revert_pool_state.cpp
+++ b/ydb/core/cms/console/console__revert_pool_state.cpp
@@ -1,7 +1,6 @@
 #include "console_tenants_manager.h"
 
-namespace NKikimr {
-namespace NConsole {
+namespace NKikimr::NConsole {
 
 class TTenantsManager::TTxRevertPoolState : public TTransactionBase<TTenantsManager> {
 public:
@@ -80,5 +79,4 @@ ITransaction *TTenantsManager::CreateTxRevertPoolState(TTenant::TPtr tenant,
     return new TTxRevertPoolState(this, tenant, pool, worker);
 }
 
-} // namespace NConsole
-} // namespace NKikimr
+} // namespace NKikimr::NConsole
diff --git a/ydb/core/cms/console/console__scheme.h b/ydb/core/cms/console/console__scheme.h
index ea9d275d84a..dfdb2befa67 100644
--- a/ydb/core/cms/console/console__scheme.h
+++ b/ydb/core/cms/console/console__scheme.h
@@ -5,8 +5,7 @@
 #include <ydb/core/scheme/scheme_types_defs.h>
 #include <ydb/core/tablet_flat/flat_cxx_database.h>
 
-namespace NKikimr {
-namespace NConsole {
+namespace NKikimr::NConsole {
 
 struct Schema : NIceDb::Schema {
     struct Config : Table<1> {
@@ -158,5 +157,4 @@ struct Schema : NIceDb::Schema {
                                      ExecutorLogFlushPeriod<TDuration::MicroSeconds(512).GetValue()>>;
 };
 
-} // namespace NConsole
-} // namespace NKikimr
+} // namespace NKikimr::NConsole
diff --git a/ydb/core/cms/console/console__set_config.cpp b/ydb/core/cms/console/console__set_config.cpp
index 8cea3abba2e..cd062e1cff2 100644
--- a/ydb/core/cms/console/console__set_config.cpp
+++ b/ydb/core/cms/console/console__set_config.cpp
@@ -5,8 +5,7 @@
 
 #include <ydb/core/base/path.h>
 
-namespace NKikimr {
-namespace NConsole {
+namespace NKikimr::NConsole {
 
 class TConsole::TTxSetConfig : public TTransactionBase<TConsole> {
 public:
@@ -95,5 +94,4 @@ ITransaction *TConsole::CreateTxSetConfig(TEvConsole::TEvSetConfigRequest::TPtr
     return new TTxSetConfig(ev, this);
 }
 
-} // namespace NConsole
-} // namespace NKikimr
+} // namespace NKikimr::NConsole
diff --git a/ydb/core/cms/console/console__toggle_config_validator.cpp b/ydb/core/cms/console/console__toggle_config_validator.cpp
index 26f0b6bc857..fb2dfb20e70 100644
--- a/ydb/core/cms/console/console__toggle_config_validator.cpp
+++ b/ydb/core/cms/console/console__toggle_config_validator.cpp
@@ -6,8 +6,7 @@
 #include <ydb/core/base/path.h>
 #include <ydb/core/cms/console/validators/registry.h>
 
-namespace NKikimr {
-namespace NConsole {
+namespace NKikimr::NConsole {
 
 class TConfigsManager::TTxToggleConfigValidator : public TTransactionBase<TConfigsManager> {
 public:
@@ -116,5 +115,4 @@ ITransaction *TConfigsManager::CreateTxToggleConfigValidator(TEvConsole::TEvTogg
     return new TTxToggleConfigValidator(ev, this);
 }
 
-} // namespace NConsole
-} // namespace NKikimr
+} // namespace NKikimr::NConsole
diff --git a/ydb/core/cms/console/console__update_confirmed_subdomain.cpp b/ydb/core/cms/console/console__update_confirmed_subdomain.cpp
index bf7e4a49fc9..a0b6e0d3a9f 100644
--- a/ydb/core/cms/console/console__update_confirmed_subdomain.cpp
+++ b/ydb/core/cms/console/console__update_confirmed_subdomain.cpp
@@ -1,7 +1,6 @@
 #include "console_tenants_manager.h"
 
-namespace NKikimr {
-namespace NConsole {
+namespace NKikimr::NConsole {
 
 class TTenantsManager::TTxUpdateConfirmedSubdomain : public TTransactionBase<TTenantsManager> {
 public:
@@ -71,5 +70,4 @@ ITransaction *TTenantsManager::CreateTxUpdateConfirmedSubdomain(const TString &p
     return new TTxUpdateConfirmedSubdomain(this, path, version, worker);
 }
 
-} // namespace NConsole
-} // namespace NKikimr
+} // namespace NKikimr::NConsole
diff --git a/ydb/core/cms/console/console__update_last_provided_config.cpp b/ydb/core/cms/console/console__update_last_provided_config.cpp
index fdfd093b5e5..d8453f6e3be 100644
--- a/ydb/core/cms/console/console__update_last_provided_config.cpp
+++ b/ydb/core/cms/console/console__update_last_provided_config.cpp
@@ -1,7 +1,6 @@
 #include "console_configs_manager.h"
 
-namespace NKikimr {
-namespace NConsole {
+namespace NKikimr::NConsole {
 
 class TConfigsManager::TTxUpdateLastProvidedConfig : public TTransactionBase<TConfigsManager> {
 public:
@@ -68,5 +67,4 @@ ITransaction *TConfigsManager::CreateTxUpdateLastProvidedConfig(TEvConsole::TEvC
     return new TTxUpdateLastProvidedConfig(ev, this);
 }
 
-} // namespace NConsole
-} // namespace NKikimr
+} // namespace NKikimr::NConsole
diff --git a/ydb/core/cms/console/console__update_pool_state.cpp b/ydb/core/cms/console/console__update_pool_state.cpp
index 1f12ff0e0d7..30dea4ec8ff 100644
--- a/ydb/core/cms/console/console__update_pool_state.cpp
+++ b/ydb/core/cms/console/console__update_pool_state.cpp
@@ -1,7 +1,6 @@
 #include "console_tenants_manager.h"
 
-namespace NKikimr {
-namespace NConsole {
+namespace NKikimr::NConsole {
 
 class TTenantsManager::TTxUpdatePoolState : public TTransactionBase<TTenantsManager> {
 public:
@@ -111,5 +110,4 @@ ITransaction *TTenantsManager::CreateTxUpdatePoolState(TTenant::TPtr tenant,
     return new TTxUpdatePoolState(this, tenant, pool, worker, state);
 }
 
-} // namespace NConsole
-} // namespace NKikimr
+} // namespace NKikimr::NConsole
diff --git a/ydb/core/cms/console/console__update_subdomain_key.cpp b/ydb/core/cms/console/console__update_subdomain_key.cpp
index 6a9fcba8cb7..f190cbef896 100644
--- a/ydb/core/cms/console/console__update_subdomain_key.cpp
+++ b/ydb/core/cms/console/console__update_subdomain_key.cpp
@@ -1,7 +1,6 @@
 #include "console_tenants_manager.h"
 
-namespace NKikimr {
-namespace NConsole {
+namespace NKikimr::NConsole {
 
 class TTenantsManager::TTxUpdateSubDomainKey : public TTransactionBase<TTenantsManager> {
 public:
@@ -109,5 +108,4 @@ ITransaction *TTenantsManager::CreateTxUpdateSubDomainKey(const TString &path,
     return new TTxUpdateSubDomainKey(this, path, schemeShardId, pathId, worker);
 }
 
-} // namespace NConsole
-} // namespace NKikimr
+} // namespace NKikimr::NConsole
diff --git a/ydb/core/cms/console/console__update_tenant_pool_config.cpp b/ydb/core/cms/console/console__update_tenant_pool_config.cpp
index 334e473a578..23a23afd870 100644
--- a/ydb/core/cms/console/console__update_tenant_pool_config.cpp
+++ b/ydb/core/cms/console/console__update_tenant_pool_config.cpp
@@ -1,8 +1,7 @@
 #include "console_tenants_manager.h"
 #include "console_impl.h"
 
-namespace NKikimr {
-namespace NConsole {
+namespace NKikimr::NConsole {
 
 class TTenantsManager::TTxUpdateTenantPoolConfig : public TTransactionBase<TTenantsManager> {
 public:
@@ -94,5 +93,4 @@ ITransaction *TTenantsManager::CreateTxUpdateTenantPoolConfig(TEvConsole::TEvUpd
     return new TTxUpdateTenantPoolConfig(ev, this);
 }
 
-} // namespace NConsole
-} // namespace NKikimr
+} // namespace NKikimr::NConsole
diff --git a/ydb/core/cms/console/console__update_tenant_state.cpp b/ydb/core/cms/console/console__update_tenant_state.cpp
index ea916bcfd6d..a7f12c0b704 100644
--- a/ydb/core/cms/console/console__update_tenant_state.cpp
+++ b/ydb/core/cms/console/console__update_tenant_state.cpp
@@ -1,7 +1,6 @@
 #include "console_tenants_manager.h"
 
-namespace NKikimr {
-namespace NConsole {
+namespace NKikimr::NConsole {
 
 class TTenantsManager::TTxUpdateTenantState : public TTransactionBase<TTenantsManager> {
 public:
@@ -70,5 +69,4 @@ ITransaction *TTenantsManager::CreateTxUpdateTenantState(const TString &path,
     return new TTxUpdateTenantState(this, path, state, worker);
 }
 
-} // namespace NConsole
-} // namespace NKikimr
+} // namespace NKikimr::NConsole
diff --git a/ydb/core/cms/console/console_configs_manager.cpp b/ydb/core/cms/console/console_configs_manager.cpp
index 90288dac9e2..20ec44dbdc1 100644
--- a/ydb/core/cms/console/console_configs_manager.cpp
+++ b/ydb/core/cms/console/console_configs_manager.cpp
@@ -11,8 +11,7 @@
 #include <util/random/random.h>
 #include <util/string/split.h>
 
-namespace NKikimr {
-namespace NConsole {
+namespace NKikimr::NConsole {
 
 void TConfigsManager::ClearState()
 {
@@ -628,5 +627,4 @@ void TConfigsManager::ScheduleLogCleanup(const TActorContext &ctx)
                     LogCleanupTimerCookieHolder.Get());
 }
 
-} // namespace NConsole
-} // namespace NKikimr
+} // namespace NKikimr::NConsole
diff --git a/ydb/core/cms/console/console_configs_manager.h b/ydb/core/cms/console/console_configs_manager.h
index 650ce47441d..f06761c97aa 100644
--- a/ydb/core/cms/console/console_configs_manager.h
+++ b/ydb/core/cms/console/console_configs_manager.h
@@ -15,8 +15,7 @@
 #include <library/cpp/actors/core/hfunc.h>
 #include <library/cpp/actors/interconnect/interconnect.h>
 
-namespace NKikimr {
-namespace NConsole {
+namespace NKikimr::NConsole {
 
 using NTabletFlatExecutor::ITransaction;
 using NTabletFlatExecutor::TTransactionBase;
@@ -213,5 +212,4 @@ private:
     TSchedulerCookieHolder LogCleanupTimerCookieHolder;
 };
 
-} // namespace NConsole
-} // namespace NKikimr
+} // namespace NKikimr::NConsole
diff --git a/ydb/core/cms/console/console_configs_provider.cpp b/ydb/core/cms/console/console_configs_provider.cpp
index 3a3578d2e4c..84a04981c72 100644
--- a/ydb/core/cms/console/console_configs_provider.cpp
+++ b/ydb/core/cms/console/console_configs_provider.cpp
@@ -7,8 +7,7 @@
 
 #include <library/cpp/actors/core/interconnect.h>
 
-namespace NKikimr {
-namespace NConsole {
+namespace NKikimr::NConsole {
 
 namespace {
 
@@ -1085,5 +1084,4 @@ void TConfigsProvider::Handle(TEvPrivate::TEvUpdateSubscriptions::TPtr &ev, cons
     ApplySubscriptionModifications(ev->Get()->Modifications, ctx);
 }
 
-} // namespace NConsole
-} // namespace NKikimr
+} // namespace NKikimr::NConsole
diff --git a/ydb/core/cms/console/console_configs_provider.h b/ydb/core/cms/console/console_configs_provider.h
index ddb74d52d48..aa2b1192b55 100644
--- a/ydb/core/cms/console/console_configs_provider.h
+++ b/ydb/core/cms/console/console_configs_provider.h
@@ -11,8 +11,7 @@
 
 #include <library/cpp/actors/core/hfunc.h>
 
-namespace NKikimr {
-namespace NConsole {
+namespace NKikimr::NConsole {
 
 class TConfigsProvider : public TActorBootstrapped<TConfigsProvider> {
 public:
@@ -212,5 +211,4 @@ private:
     TInMemorySubscriptionIndex InMemoryIndex;
 };
 
-} // namespace NConsole
-} // namespace NKikimr
+} // namespace NKikimr::NConsole
diff --git a/ydb/core/cms/console/console_impl.h b/ydb/core/cms/console/console_impl.h
index 8d42fd6c069..62835ca0d42 100644
--- a/ydb/core/cms/console/console_impl.h
+++ b/ydb/core/cms/console/console_impl.h
@@ -19,8 +19,7 @@
 
 #include <util/generic/set.h>
 
-namespace NKikimr {
-namespace NConsole {
+namespace NKikimr::NConsole {
 
 using NTabletFlatExecutor::ITransaction;
 using NTabletFlatExecutor::TTransactionBase;
@@ -172,5 +171,4 @@ private:
     TActorId NetClassifierUpdaterId;
 };
 
-} // namespace NConsole
-} // namespace NKikimr
+} // namespace NKikimr::NConsole
diff --git a/ydb/core/cms/console/console_tenants_manager.cpp b/ydb/core/cms/console/console_tenants_manager.cpp
index ff1bbb8c508..bf6f4e6787c 100644
--- a/ydb/core/cms/console/console_tenants_manager.cpp
+++ b/ydb/core/cms/console/console_tenants_manager.cpp
@@ -20,8 +20,7 @@
 #define BLOG_CRIT(stream) LOG_CRIT_S(*TlsActivationContext, NKikimrServices::CMS_TENANTS, stream)
 
 
-namespace NKikimr {
-namespace NConsole {
+namespace NKikimr::NConsole {
 
 using namespace NOperationId;
 using namespace NTenantSlotBroker;
@@ -3411,5 +3410,4 @@ TString MakeStoragePoolName(const TString &tenantName, const TString &poolTypeNa
     return Sprintf("%s:%s", tenantName.data(), poolTypeName.data());
 }
 
-} // namespace NConsole
-} // namespace NKikimr
+} // namespace NKikimr::NConsole
diff --git a/ydb/core/cms/console/console_tenants_manager.h b/ydb/core/cms/console/console_tenants_manager.h
index 17e09c14965..9edf2143714 100644
--- a/ydb/core/cms/console/console_tenants_manager.h
+++ b/ydb/core/cms/console/console_tenants_manager.h
@@ -25,8 +25,7 @@
 
 #include <util/generic/set.h>
 
-namespace NKikimr {
-namespace NConsole {
+namespace NKikimr::NConsole {
 
 using NTabletFlatExecutor::TTabletExecutedFlat;
 using NTabletFlatExecutor::ITransaction;
@@ -1009,8 +1008,7 @@ private:
     NKikimrConfig::TFeatureFlags FeatureFlags;
 };
 
-} // namespace NConsole
-} // namespace NKikimr
+} // namespace NKikimr::NConsole
 
 template<>
 inline void Out<NKikimr::NConsole::TTenantsManager::TTenant::EState>(IOutputStream& o, NKikimr::NConsole::TTenantsManager::TTenant::EState x) {
diff --git a/ydb/core/cms/console/http.cpp b/ydb/core/cms/console/http.cpp
index feacd672df3..97b3dcb071a 100644
--- a/ydb/core/cms/console/http.cpp
+++ b/ydb/core/cms/console/http.cpp
@@ -3,9 +3,7 @@
 #include <util/random/random.h>
 #include <util/string/builder.h>
 
-namespace NKikimr {
-namespace NConsole {
-namespace NHttp {
+namespace NKikimr::NConsole::NHttp {
 
 void OutputStyles(IOutputStream &os)
 {
@@ -87,6 +85,4 @@ void OutputConfigHTML(IOutputStream &os, const NKikimrConfig::TAppConfig &config
     }
 }
 
-} // namespace NHttp
-} // namespace NConsole
-} // namespace NKikimr
+} // namespace NKikimr::NConsole::NHttp
diff --git a/ydb/core/cms/console/http.h b/ydb/core/cms/console/http.h
index f64ba795df1..f6850aa5271 100644
--- a/ydb/core/cms/console/http.h
+++ b/ydb/core/cms/console/http.h
@@ -10,9 +10,7 @@
 #define COLLAPSED_REF_CONTENT(target, text) \
     WITH_SCOPED(tmp, NKikimr::NConsole::NHttp::TCollapsedRef(__stream, target, text))
 
-namespace NKikimr {
-namespace NConsole {
-namespace NHttp {
+namespace NKikimr::NConsole::NHttp {
 
 struct TCollapsedRef {
     TCollapsedRef(IOutputStream& str, const TString& target, const TString& text)
@@ -43,6 +41,4 @@ void OutputStaticPart(IOutputStream &os);
 void OutputStyles(IOutputStream &os);
 void OutputConfigHTML(IOutputStream &os, const NKikimrConfig::TAppConfig &config);
 
-} // namespace NHttp
-} // namespace NConsole
-} // namespace NKikimr
+} // namespace NKikimr::NConsole::NHttp
diff --git a/ydb/core/cms/console/immediate_controls_configurator.cpp b/ydb/core/cms/console/immediate_controls_configurator.cpp
index 4f959a18913..f3348046f3e 100644
--- a/ydb/core/cms/console/immediate_controls_configurator.cpp
+++ b/ydb/core/cms/console/immediate_controls_configurator.cpp
@@ -7,8 +7,7 @@
 
 #include <library/cpp/actors/core/actor_bootstrapped.h>
 
-namespace NKikimr {
-namespace NConsole {
+namespace NKikimr::NConsole {
 
 class TImmediateControlsConfigurator : public TActorBootstrapped<TImmediateControlsConfigurator> {
 public:
@@ -216,5 +215,4 @@ IActor *CreateImmediateControlsConfigurator(TIntrusivePtr<TControlBoard> board,
     return new TImmediateControlsConfigurator(board, cfg, allowExistingControls);
 }
 
-} // namespace NConsole
-} // namespace NKikimr
+} // namespace NKikimr::NConsole
diff --git a/ydb/core/cms/console/immediate_controls_configurator.h b/ydb/core/cms/console/immediate_controls_configurator.h
index 53f1b3e5d75..e0af92676c5 100644
--- a/ydb/core/cms/console/immediate_controls_configurator.h
+++ b/ydb/core/cms/console/immediate_controls_configurator.h
@@ -5,8 +5,7 @@
 
 #include <util/generic/ptr.h>
 
-namespace NKikimr {
-namespace NConsole {
+namespace NKikimr::NConsole {
 
 /**
  * Immediate Controls Configurator is used to work with
@@ -16,5 +15,4 @@ IActor *CreateImmediateControlsConfigurator(TIntrusivePtr<TControlBoard> board,
                                             const NKikimrConfig::TImmediateControlsConfig &cfg,
                                             bool allowExistingControls = false);
 
-} // namespace NConsole
-} // namespace NKikimr
+} // namespace NKikimr::NConsole
diff --git a/ydb/core/cms/console/log_settings_configurator.cpp b/ydb/core/cms/console/log_settings_configurator.cpp
index 11d41e245e4..aa5c5cae763 100644
--- a/ydb/core/cms/console/log_settings_configurator.cpp
+++ b/ydb/core/cms/console/log_settings_configurator.cpp
@@ -8,8 +8,7 @@
 #include <util/stream/file.h>
 #include <google/protobuf/text_format.h>
 
-namespace NKikimr {
-namespace NConsole {
+namespace NKikimr::NConsole {
 
 class TLogSettingsConfigurator : public TActorBootstrapped<TLogSettingsConfigurator> {
 public:
@@ -217,5 +216,4 @@ IActor *CreateLogSettingsConfigurator(const TString &pathToConfigCacheFile)
     return new TLogSettingsConfigurator(pathToConfigCacheFile);
 }
 
-} // namespace NConsole
-} // namespace NKikimr
+} // namespace NKikimr::NConsole
diff --git a/ydb/core/cms/console/log_settings_configurator.h b/ydb/core/cms/console/log_settings_configurator.h
index e46a92d5650..4fa9df20d54 100644
--- a/ydb/core/cms/console/log_settings_configurator.h
+++ b/ydb/core/cms/console/log_settings_configurator.h
@@ -1,8 +1,7 @@
 #pragma once
 #include "defs.h"
 
-namespace NKikimr {
-namespace NConsole {
+namespace NKikimr::NConsole {
 
 /**
  * Log Settings Configurator is used to track log config changes and adjust current
@@ -12,5 +11,4 @@ IActor *CreateLogSettingsConfigurator();
 
 IActor *CreateLogSettingsConfigurator(const TString &pathToConfigCacheFile);
 
-} // namespace NConsole
-} // namespace NKikimr
+} // namespace NKikimr::NConsole
diff --git a/ydb/core/cms/console/logger.cpp b/ydb/core/cms/console/logger.cpp
index 646c89852f7..ee1bc328930 100644
--- a/ydb/core/cms/console/logger.cpp
+++ b/ydb/core/cms/console/logger.cpp
@@ -3,8 +3,7 @@
 
 #include <util/generic/utility.h>
 
-namespace NKikimr {
-namespace NConsole {
+namespace NKikimr::NConsole {
 
 using namespace NKikimrConsole;
 
@@ -192,5 +191,4 @@ void TLogger::SetMinLogItemId(ui64 id) {
     MinLogItemId = id;
 }
 
-} // NConsole
-} // NKikimr
+} // namespace NKikimr::NConsole
diff --git a/ydb/core/cms/console/logger.h b/ydb/core/cms/console/logger.h
index c87bbbde9e0..ad2dc33ce0a 100644
--- a/ydb/core/cms/console/logger.h
+++ b/ydb/core/cms/console/logger.h
@@ -9,8 +9,7 @@
 #include <util/datetime/base.h>
 #include <util/generic/set.h>
 
-namespace NKikimr {
-namespace NConsole {
+namespace NKikimr::NConsole {
 
 using NTabletFlatExecutor::TTransactionContext;
 
@@ -42,5 +41,4 @@ private:
     ui64 MinLogItemId = 0;
 };
 
-} // NConsole
-} // NKikimr
+} // namespace NKikimr::NConsole
diff --git a/ydb/core/cms/console/modifications_validator.cpp b/ydb/core/cms/console/modifications_validator.cpp
index f6c29f8a3eb..6b8455e73a6 100644
--- a/ydb/core/cms/console/modifications_validator.cpp
+++ b/ydb/core/cms/console/modifications_validator.cpp
@@ -4,8 +4,7 @@
 
 #include <ydb/library/yql/public/issue/protos/issue_severity.pb.h>
 
-namespace NKikimr {
-namespace NConsole {
+namespace NKikimr::NConsole {
 
 TModificationsValidator::TModificationsValidator(const TConfigIndex &index,
                                                  const TConfigModifications &diff,
@@ -370,5 +369,4 @@ void TModificationsValidator::AddLimitExceededIssue()
     Issues.push_back(issue);
 }
 
-} // namespace NConsole
-} // namespace NKikimr
+} // namespace NKikimr::NConsole
diff --git a/ydb/core/cms/console/modifications_validator.h b/ydb/core/cms/console/modifications_validator.h
index 05b85794809..17a53eaee79 100644
--- a/ydb/core/cms/console/modifications_validator.h
+++ b/ydb/core/cms/console/modifications_validator.h
@@ -3,8 +3,7 @@
 #include "config_index.h"
 #include "configs_config.h"
 
-namespace NKikimr {
-namespace NConsole {
+namespace NKikimr::NConsole {
 
 class TModificationsValidatorTests;
 
@@ -61,5 +60,4 @@ private:
     friend class TModificationsValidatorTests;
 };
 
-} // namespace NConsole
-} // namespace NKikimr
+} // namespace NKikimr::NConsole
diff --git a/ydb/core/cms/console/modifications_validator_ut.cpp b/ydb/core/cms/console/modifications_validator_ut.cpp
index 7f27bf94290..3e69fb05967 100644
--- a/ydb/core/cms/console/modifications_validator_ut.cpp
+++ b/ydb/core/cms/console/modifications_validator_ut.cpp
@@ -5,8 +5,7 @@
 
 #include <library/cpp/testing/unittest/registar.h>
 
-namespace NKikimr {
-namespace NConsole {
+namespace NKikimr::NConsole {
 
 using namespace NUT;
 
@@ -1648,5 +1647,4 @@ public:
 
 UNIT_TEST_SUITE_REGISTRATION(TModificationsValidatorTests);
 
-} // namespace NConsole
-} // namespace NKikimr
+} // namespace NKikimr::NConsole
diff --git a/ydb/core/cms/console/shared_cache_configurator.cpp b/ydb/core/cms/console/shared_cache_configurator.cpp
index 60118148496..7228b4d422b 100644
--- a/ydb/core/cms/console/shared_cache_configurator.cpp
+++ b/ydb/core/cms/console/shared_cache_configurator.cpp
@@ -6,8 +6,7 @@
 
 #include <library/cpp/actors/core/actor_bootstrapped.h>
 
-namespace NKikimr {
-namespace NConsole {
+namespace NKikimr::NConsole {
 
 class TSharedCacheConfigurator : public TActorBootstrapped<TSharedCacheConfigurator> {
 public:
@@ -75,5 +74,4 @@ IActor *CreateSharedCacheConfigurator()
     return new TSharedCacheConfigurator();
 }
 
-} // namespace NConsole
-} // namespace NKikimr
+} // namespace NKikimr::NConsole
diff --git a/ydb/core/cms/console/shared_cache_configurator.h b/ydb/core/cms/console/shared_cache_configurator.h
index 336f20cf52b..3a7df04e42a 100644
--- a/ydb/core/cms/console/shared_cache_configurator.h
+++ b/ydb/core/cms/console/shared_cache_configurator.h
@@ -1,13 +1,11 @@
 #pragma once
 #include "defs.h"
 
-namespace NKikimr {
-namespace NConsole {
+namespace NKikimr::NConsole {
 
 /**
  * Shared Cache Configurator tracks and applies changes to shared cache configuration.
  */
 IActor *CreateSharedCacheConfigurator();
 
-} // namespace NConsole
-} // namespace NKikimr
+} // namespace NKikimr::NConsole
diff --git a/ydb/core/cms/console/tx_processor.cpp b/ydb/core/cms/console/tx_processor.cpp
index 9ba7e9ad4cb..e5dcb8fd520 100644
--- a/ydb/core/cms/console/tx_processor.cpp
+++ b/ydb/core/cms/console/tx_processor.cpp
@@ -1,7 +1,6 @@
 #include "tx_processor.h"
 
-namespace NKikimr {
-namespace NConsole {
+namespace NKikimr::NConsole {
 
 TTxProcessor::TTxProcessor(ITxExecutor &executor,
                            const TString &name,
@@ -249,5 +248,4 @@ void TTxProcessor::ProcessNextTx(const TActorContext &ctx)
     Executor.Execute(ActiveTx, ctx);
 }
 
-} // namespace NConsole
-} // namespace NKikimr
+} // namespace NKikimr::NConsole
diff --git a/ydb/core/cms/console/tx_processor.h b/ydb/core/cms/console/tx_processor.h
index c179b032145..3c6fb8b3740 100644
--- a/ydb/core/cms/console/tx_processor.h
+++ b/ydb/core/cms/console/tx_processor.h
@@ -7,8 +7,7 @@
 #include <util/generic/ptr.h>
 #include <util/generic/string.h>
 
-namespace NKikimr {
-namespace NConsole {
+namespace NKikimr::NConsole {
 
 using NTabletFlatExecutor::ITransaction;
 
@@ -166,5 +165,4 @@ private:
     TString LogPrefix;
 };
 
-} // namespace NConsole
-} // namespace NKikimr
+} // namespace NKikimr::NConsole
diff --git a/ydb/core/cms/console/ut_helpers.h b/ydb/core/cms/console/ut_helpers.h
index ac9711963ba..5786a8b89e6 100644
--- a/ydb/core/cms/console/ut_helpers.h
+++ b/ydb/core/cms/console/ut_helpers.h
@@ -11,9 +11,7 @@
 
 #include <library/cpp/testing/unittest/registar.h>
 
-namespace NKikimr {
-namespace NConsole {
-namespace NUT {
+namespace NKikimr::NConsole::NUT {
 
 inline NKikimrConsole::TUsageScope MakeUsageScope(const TVector<ui32> &nodes)
 {
@@ -296,6 +294,4 @@ inline void CheckEqualsIgnoringVersion(NKikimrConfig::TAppConfig config1, NKikim
 }
 
 
-} // namespace NUT
-} // namespace NConsole
-} // namesapce NKikimr
+} // namesapce NKikimr::NConsole::NUT
diff --git a/ydb/core/cms/console/util.cpp b/ydb/core/cms/console/util.cpp
index 594755bb564..53886b088e9 100644
--- a/ydb/core/cms/console/util.cpp
+++ b/ydb/core/cms/console/util.cpp
@@ -2,8 +2,7 @@
 
 #include <util/random/random.h>
 
-namespace NKikimr {
-namespace NConsole {
+namespace NKikimr::NConsole {
 
     NTabletPipe::TClientRetryPolicy FastConnectRetryPolicy() {
         auto policy = NTabletPipe::TClientRetryPolicy::WithRetries();
@@ -11,5 +10,4 @@ namespace NConsole {
         return policy;
     }
 
-} // namespace NConsole
-} // namespace NKikimr
+} // namespace NKikimr::NConsole
diff --git a/ydb/core/cms/console/util.h b/ydb/core/cms/console/util.h
index 39b36daaee6..a11b1adc406 100644
--- a/ydb/core/cms/console/util.h
+++ b/ydb/core/cms/console/util.h
@@ -3,10 +3,8 @@
 
 #include <ydb/core/base/tablet_pipe.h>
 
-namespace NKikimr {
-namespace NConsole {
+namespace NKikimr::NConsole {
 
     NTabletPipe::TClientRetryPolicy FastConnectRetryPolicy();
 
-} // namespace NConsole
-} // namespace NKikimr
+} // namespace NKikimr::NConsole
diff --git a/ydb/core/cms/console/validators/core_validators.cpp b/ydb/core/cms/console/validators/core_validators.cpp
index 5d0a707c72c..30e60a62357 100644
--- a/ydb/core/cms/console/validators/core_validators.cpp
+++ b/ydb/core/cms/console/validators/core_validators.cpp
@@ -3,8 +3,7 @@
 #include "validator_bootstrap.h"
 #include "validator_nameservice.h"
 
-namespace NKikimr {
-namespace NConsole {
+namespace NKikimr::NConsole {
 
 void RegisterCoreValidators()
 {
@@ -12,5 +11,4 @@ void RegisterCoreValidators()
     RegisterValidator(new TNameserviceConfigValidator);
 }
 
-} // namespace NConsole
-} // namespace NKikimr
+} // namespace NKikimr::NConsole
diff --git a/ydb/core/cms/console/validators/core_validators.h b/ydb/core/cms/console/validators/core_validators.h
index 4d7b37d112b..5b29ee10fd0 100644
--- a/ydb/core/cms/console/validators/core_validators.h
+++ b/ydb/core/cms/console/validators/core_validators.h
@@ -1,9 +1,7 @@
 #pragma once
 
-namespace NKikimr {
-namespace NConsole {
+namespace NKikimr::NConsole {
 
 void RegisterCoreValidators();
 
-} // namespace NConsole
-} // namespace NKikimr
+} // namespace NKikimr::NConsole
diff --git a/ydb/core/cms/console/validators/registry.cpp b/ydb/core/cms/console/validators/registry.cpp
index 26819bf5142..d3a67b937f3 100644
--- a/ydb/core/cms/console/validators/registry.cpp
+++ b/ydb/core/cms/console/validators/registry.cpp
@@ -1,7 +1,6 @@
 #include "registry.h"
 
-namespace NKikimr {
-namespace NConsole {
+namespace NKikimr::NConsole {
 
 TValidatorsRegistry::TPtr TValidatorsRegistry::Instance_;
 TMutex TValidatorsRegistry::Mutex;
@@ -181,5 +180,4 @@ void TValidatorsRegistry::RemoveFromValidatorClasses(IConfigValidator::TPtr vali
     }
 }
 
-} // namespace NConsole
-} // namespace NKikimr
+} // namespace NKikimr::NConsole
diff --git a/ydb/core/cms/console/validators/registry.h b/ydb/core/cms/console/validators/registry.h
index 7a1ae42c2e6..ed28cd95956 100644
--- a/ydb/core/cms/console/validators/registry.h
+++ b/ydb/core/cms/console/validators/registry.h
@@ -7,8 +7,7 @@
 #include <util/generic/bitmap.h>
 #include <util/system/mutex.h>
 
-namespace NKikimr {
-namespace NConsole {
+namespace NKikimr::NConsole {
 
 class TValidatorsRegistry  : public TThrRefBase {
 public:
@@ -75,5 +74,4 @@ private:
     static TPtr Instance_;
 };
 
-} // namespace NConsole
-} // namespace NKikimr
+} // namespace NKikimr::NConsole
diff --git a/ydb/core/cms/console/validators/registry_ut.cpp b/ydb/core/cms/console/validators/registry_ut.cpp
index dade37b722c..98ed0a2c99e 100644
--- a/ydb/core/cms/console/validators/registry_ut.cpp
+++ b/ydb/core/cms/console/validators/registry_ut.cpp
@@ -2,8 +2,7 @@
 
 #include <library/cpp/testing/unittest/registar.h>
 
-namespace NKikimr {
-namespace NConsole {
+namespace NKikimr::NConsole {
 
 namespace {
 
@@ -265,5 +264,4 @@ Y_UNIT_TEST_SUITE(TRegistryTests) {
     }
 }
 
-} // namespace NConsole
-} // namespace NKikimr
+} // namespace NKikimr::NConsole
diff --git a/ydb/core/cms/console/validators/validator.cpp b/ydb/core/cms/console/validators/validator.cpp
index 36e31dd5d1f..bb31ce5ffbf 100644
--- a/ydb/core/cms/console/validators/validator.cpp
+++ b/ydb/core/cms/console/validators/validator.cpp
@@ -1,8 +1,7 @@
 #include "validator.h"
 #include "registry.h"
 
-namespace NKikimr {
-namespace NConsole {
+namespace NKikimr::NConsole {
 
 void RegisterValidator(IConfigValidator::TPtr validator)
 {
@@ -11,5 +10,4 @@ void RegisterValidator(IConfigValidator::TPtr validator)
              validator->GetName().data(), (ui32)TValidatorsRegistry::Instance()->IsLocked());
 }
 
-} // namespace NConsole
-} // namespace NKikimr
+} // namespace NKikimr::NConsole
diff --git a/ydb/core/cms/console/validators/validator.h b/ydb/core/cms/console/validators/validator.h
index ffe52809fcb..6c5c4cd83ee 100644
--- a/ydb/core/cms/console/validators/validator.h
+++ b/ydb/core/cms/console/validators/validator.h
@@ -10,8 +10,7 @@
 #include <util/generic/vector.h>
 #include <util/string/printf.h>
 
-namespace NKikimr {
-namespace NConsole {
+namespace NKikimr::NConsole {
 
 // Base class for config validators. Validators are used
 // by CMS to check uploaded cluster configs.
@@ -123,5 +122,4 @@ private:
 // All registered validators should have unique names.
 void RegisterValidator(IConfigValidator::TPtr validator);
 
-} // namespace NConsole
-} // namespace NKikimr
+} // namespace NKikimr::NConsole
diff --git a/ydb/core/cms/console/validators/validator_bootstrap.cpp b/ydb/core/cms/console/validators/validator_bootstrap.cpp
index 4732fa802a3..1d13e6b507e 100644
--- a/ydb/core/cms/console/validators/validator_bootstrap.cpp
+++ b/ydb/core/cms/console/validators/validator_bootstrap.cpp
@@ -6,8 +6,7 @@
 
 #include <util/string/builder.h>
 
-namespace NKikimr {
-namespace NConsole {
+namespace NKikimr::NConsole {
 
 TBootstrapConfigValidator::TBootstrapConfigValidator()
     : IConfigValidator("bootstrap",
@@ -277,5 +276,4 @@ bool TBootstrapConfigValidator::IsUnlimitedResource(const NKikimrResourceBroker:
     return true;
 }
 
-} // namespace NConsole
-} // namespace NKikimr
+} // namespace NKikimr::NConsole
diff --git a/ydb/core/cms/console/validators/validator_bootstrap.h b/ydb/core/cms/console/validators/validator_bootstrap.h
index 0b1b668ceba..b4b69542fca 100644
--- a/ydb/core/cms/console/validators/validator_bootstrap.h
+++ b/ydb/core/cms/console/validators/validator_bootstrap.h
@@ -2,8 +2,7 @@
 
 #include "validator.h"
 
-namespace NKikimr {
-namespace NConsole {
+namespace NKikimr::NConsole {
 
 class TBootstrapConfigValidator : public IConfigValidator {
 public:
@@ -24,5 +23,4 @@ private:
     bool IsUnlimitedResource(const NKikimrResourceBroker::TResources &limit) const;
 };
 
-} // namespace NConsole
-} // namespace NKikimr
+} // namespace NKikimr::NConsole
diff --git a/ydb/core/cms/console/validators/validator_bootstrap_ut.cpp b/ydb/core/cms/console/validators/validator_bootstrap_ut.cpp
index 24f0045e46f..845bf8bf8cc 100644
--- a/ydb/core/cms/console/validators/validator_bootstrap_ut.cpp
+++ b/ydb/core/cms/console/validators/validator_bootstrap_ut.cpp
@@ -1,8 +1,7 @@
 #include "validator_bootstrap.h"
 #include "validator_ut_common.h"
 
-namespace NKikimr {
-namespace NConsole {
+namespace NKikimr::NConsole {
 
 using namespace NTests;
 
@@ -167,5 +166,4 @@ Y_UNIT_TEST_SUITE(BootstrapTabletsValidatorTests) {
     }
 }
 
-} // namespace NConsole
-} // namespace NKikimr
+} // namespace NKikimr::NConsole
diff --git a/ydb/core/cms/console/validators/validator_nameservice.cpp b/ydb/core/cms/console/validators/validator_nameservice.cpp
index 0867be38132..807e3adbcd1 100644
--- a/ydb/core/cms/console/validators/validator_nameservice.cpp
+++ b/ydb/core/cms/console/validators/validator_nameservice.cpp
@@ -7,8 +7,7 @@
 
 #include <util/string/builder.h>
 
-namespace NKikimr {
-namespace NConsole {
+namespace NKikimr::NConsole {
 
 TNameserviceConfigValidator::TNameserviceConfigValidator()
     : IConfigValidator("nameservice", NKikimrConsole::TConfigItem::NameserviceConfigItem)
@@ -169,5 +168,4 @@ bool TNameserviceConfigValidator::CheckConfig(const NKikimrConfig::TAppConfig &o
     return true;
 }
 
-} // namespace NConsole
-} // namespace NKikimr
+} // namespace NKikimr::NConsole
diff --git a/ydb/core/cms/console/validators/validator_nameservice.h b/ydb/core/cms/console/validators/validator_nameservice.h
index d10cda0dfe7..ea417a1cf3f 100644
--- a/ydb/core/cms/console/validators/validator_nameservice.h
+++ b/ydb/core/cms/console/validators/validator_nameservice.h
@@ -2,8 +2,7 @@
 
 #include "validator.h"
 
-namespace NKikimr {
-namespace NConsole {
+namespace NKikimr::NConsole {
 
 class TNameserviceConfigValidator : public IConfigValidator {
 public:
@@ -17,5 +16,4 @@ public:
 private:
 };
 
-} // namespace NConsole
-} // namespace NKikimr
+} // namespace NKikimr::NConsole
diff --git a/ydb/core/cms/console/validators/validator_nameservice_ut.cpp b/ydb/core/cms/console/validators/validator_nameservice_ut.cpp
index 939e3fe7f34..d43dc3c749e 100644
--- a/ydb/core/cms/console/validators/validator_nameservice_ut.cpp
+++ b/ydb/core/cms/console/validators/validator_nameservice_ut.cpp
@@ -3,8 +3,7 @@
 
 #include <library/cpp/testing/unittest/registar.h>
 
-namespace NKikimr {
-namespace NConsole {
+namespace NKikimr::NConsole {
 
 using namespace NTests;
 
@@ -162,5 +161,4 @@ Y_UNIT_TEST_SUITE(NameserviceConfigValidatorTests) {
     }
 }
 
-} // namespace NConsole
-} // namespace NKikimr
+} // namespace NKikimr::NConsole
diff --git a/ydb/core/cms/console/validators/validator_ut_common.h b/ydb/core/cms/console/validators/validator_ut_common.h
index 416b6f8dff7..391a64aac2d 100644
--- a/ydb/core/cms/console/validators/validator_ut_common.h
+++ b/ydb/core/cms/console/validators/validator_ut_common.h
@@ -6,8 +6,7 @@
 
 #include <library/cpp/testing/unittest/registar.h>
 
-namespace NKikimr {
-namespace NConsole {
+namespace NKikimr::NConsole {
 namespace NTests {
 
 inline void RemoveNode(ui32 id,
@@ -164,5 +163,4 @@ void CheckConfig(const NKikimrConfig::TAppConfig &config,
 }
 
 } // namespace NTests
-} // namespace NConsole
-} // namespace NKikimr
+} // namespace NKikimr::NConsole
diff --git a/ydb/core/cms/defs.h b/ydb/core/cms/defs.h
index 93442598542..fecc9397daa 100644
--- a/ydb/core/cms/defs.h
+++ b/ydb/core/cms/defs.h
@@ -6,9 +6,3 @@
 #include <ydb/core/base/events.h>
 
 #include <util/datetime/base.h>
-
-namespace NKikimr {
-namespace NCms {
-
-} // NCms
-} // NKikimr
diff --git a/ydb/core/cms/downtime.cpp b/ydb/core/cms/downtime.cpp
index 2d72a676fa7..071b4e2e288 100644
--- a/ydb/core/cms/downtime.cpp
+++ b/ydb/core/cms/downtime.cpp
@@ -6,8 +6,7 @@
 
 #include <util/string/join.h>
 
-namespace NKikimr {
-namespace NCms {
+namespace NKikimr::NCms {
 
 TDowntime::TDowntime(TDuration ignoredDowntimeGap)
     : IgnoredDowntimeGap(ignoredDowntimeGap)
@@ -279,8 +278,7 @@ void TDowntimes::DbStoreState(TTransactionContext& txc,
     }
 }
 
-} // NCms
-} // NKikimr
+} // namespace NKikimr::NCms
 
 Y_DECLARE_OUT_SPEC(, NKikimr::NCms::TDowntime::TSegment, stream, value) {
     stream << "[" << value.Start.ToStringLocalUpToSeconds() << "-"
diff --git a/ydb/core/cms/downtime.h b/ydb/core/cms/downtime.h
index 0e517a1467f..68f3ea7648d 100644
--- a/ydb/core/cms/downtime.h
+++ b/ydb/core/cms/downtime.h
@@ -8,8 +8,7 @@
 #include <util/datetime/base.h>
 #include <util/generic/set.h>
 
-namespace NKikimr {
-namespace NCms {
+namespace NKikimr::NCms {
 
 using NTabletFlatExecutor::TTransactionContext;
 
@@ -126,5 +125,4 @@ private:
     TDuration IgnoredDowntimeGap;
 };
 
-} // NCms
-} // NKikimr
+} // namespace NKikimr::NCms
diff --git a/ydb/core/cms/erasure_checkers.cpp b/ydb/core/cms/erasure_checkers.cpp
index 122cd4b9b35..253cdfc0f2d 100644
--- a/ydb/core/cms/erasure_checkers.cpp
+++ b/ydb/core/cms/erasure_checkers.cpp
@@ -1,7 +1,6 @@
 #include "erasure_checkers.h"
 
-namespace NKikimr {
-namespace NCms {
+namespace NKikimr::NCms {
 
 bool TErasureCounterBase::IsDown(const TVDiskInfo& vdisk, 
                                  TClusterInfoPtr info,
@@ -219,5 +218,4 @@ TSimpleSharedPtr<IErasureCounter> CreateErasureCounter(TErasureType::EErasureSpe
     }
 }
 
-} // namespace NCms
-} // namespace NKikimr
+} // namespace NKikimr::NCms
diff --git a/ydb/core/cms/erasure_checkers.h b/ydb/core/cms/erasure_checkers.h
index 656409ee33d..51d9ca9553d 100644
--- a/ydb/core/cms/erasure_checkers.h
+++ b/ydb/core/cms/erasure_checkers.h
@@ -7,8 +7,7 @@
 #include <ydb/core/erasure/erasure.h>
 #include <ydb/core/protos/cms.pb.h>
 
-namespace NKikimr {
-namespace NCms {
+namespace NKikimr::NCms {
 
 using namespace NKikimrCms;
 
@@ -105,5 +104,5 @@ public:
 TSimpleSharedPtr<IErasureCounter>
 CreateErasureCounter(TErasureType::EErasureSpecies es, 
                      const TVDiskInfo& vdisk, ui32 groupId);
-}
-}
+
+} // namespace NKikimr::NCms
diff --git a/ydb/core/cms/http.cpp b/ydb/core/cms/http.cpp
index 82efbc9833a..4ac2ae4e96d 100644
--- a/ydb/core/cms/http.cpp
+++ b/ydb/core/cms/http.cpp
@@ -21,8 +21,7 @@
 #include <library/cpp/mime/types/mime.h>
 #include <library/cpp/resource/resource.h>
 
-namespace NKikimr {
-namespace NCms {
+namespace NKikimr::NCms {
 
 template <typename HandlerActorType>
 class TApiMethodHandler : public TApiMethodHandlerBase {
@@ -209,5 +208,4 @@ IActor *CreateCmsHttp() {
     return new TCmsHttp();
 }
 
-} // NCms
-} // NKikimr
+} // namespace NKikimr::NCms
diff --git a/ydb/core/cms/http.h b/ydb/core/cms/http.h
index 1401d2b89b1..875e648f570 100644
--- a/ydb/core/cms/http.h
+++ b/ydb/core/cms/http.h
@@ -4,10 +4,8 @@
 
 #include <library/cpp/actors/core/actor.h>
 
-namespace NKikimr {
-namespace NCms {
+namespace NKikimr::NCms {
 
 IActor *CreateCmsHttp();
 
-} // NCms
-} // NKikimr
+} // namespace NKikimr::NCms
diff --git a/ydb/core/cms/info_collector.cpp b/ydb/core/cms/info_collector.cpp
index 1cfd3120da2..55fc07e1384 100644
--- a/ydb/core/cms/info_collector.cpp
+++ b/ydb/core/cms/info_collector.cpp
@@ -19,8 +19,7 @@
 #define LOG_W(stream) LOG_WARN_S  (*TlsActivationContext, NKikimrServices::CMS, "[InfoCollector] " << stream)
 #define LOG_E(stream) LOG_ERROR_S (*TlsActivationContext, NKikimrServices::CMS, "[InfoCollector] " << stream)
 
-namespace NKikimr {
-namespace NCms {
+namespace NKikimr::NCms {
 
 using namespace NNodeWhiteboard;
 using namespace NKikimrWhiteboard;
@@ -513,5 +512,4 @@ IActor* CreateInfoCollector(const TActorId& client, const TDuration& timeout) {
     return new TInfoCollector(client, timeout);
 }
 
-} // NCms
-} // NKikimr
+} // namespace NKikimr::NCms
diff --git a/ydb/core/cms/info_collector.h b/ydb/core/cms/info_collector.h
index ec030909e6b..3d37a5a920d 100644
--- a/ydb/core/cms/info_collector.h
+++ b/ydb/core/cms/info_collector.h
@@ -2,10 +2,8 @@
 
 #include "defs.h"
 
-namespace NKikimr {
-namespace NCms {
+namespace NKikimr::NCms {
 
 IActor* CreateInfoCollector(const TActorId& client, const TDuration& timeout);
 
-} // NCms
-} // NKikimr
+} // namespace NKikimr::NCms
diff --git a/ydb/core/cms/json_proxy.h b/ydb/core/cms/json_proxy.h
index d827e04a397..78b73ae6a46 100644
--- a/ydb/core/cms/json_proxy.h
+++ b/ydb/core/cms/json_proxy.h
@@ -20,8 +20,7 @@
 
 #include <iostream>
 
-namespace NKikimr {
-namespace NCms {
+namespace NKikimr::NCms {
 
 template <typename TRequestEvent, typename TResponseEvent, bool ForwardToken = false>
 class TJsonProxyBase : public TActorBootstrapped<TJsonProxyBase<TRequestEvent, TResponseEvent, ForwardToken>> {
@@ -246,5 +245,4 @@ using TJsonProxyCms = TJsonProxyCmsBase<TRequestEvent, TResponseEvent, false, Fo
 template <typename TRequestEvent, typename TResponseEvent, bool ForwardToken = false>
 using TJsonProxyConsole = TJsonProxyCmsBase<TRequestEvent, TResponseEvent, true, ForwardToken>;
 
-} // NCms
-} // NKikimr
+} // namespace NKikimr::NCms
diff --git a/ydb/core/cms/json_proxy_config_items.h b/ydb/core/cms/json_proxy_config_items.h
index 53fa0a2d9ba..eaf7d8f00c6 100644
--- a/ydb/core/cms/json_proxy_config_items.h
+++ b/ydb/core/cms/json_proxy_config_items.h
@@ -4,8 +4,7 @@
 
 #include <util/string/split.h>
 
-namespace NKikimr {
-namespace NCms {
+namespace NKikimr::NCms {
 
 class TJsonProxyConfigItems : public TJsonProxyConsole<NConsole::TEvConsole::TEvGetConfigItemsRequest,
                                                        NConsole::TEvConsole::TEvGetConfigItemsResponse> {
@@ -36,6 +35,4 @@ public:
     }
 };
 
-
-} // NCms
-} // NKikimr
+} // NKikimr::NCms
diff --git a/ydb/core/cms/json_proxy_config_updates.h b/ydb/core/cms/json_proxy_config_updates.h
index 1cf9b62e92b..a57cce3d968 100644
--- a/ydb/core/cms/json_proxy_config_updates.h
+++ b/ydb/core/cms/json_proxy_config_updates.h
@@ -4,8 +4,7 @@
 
 #include <util/string/split.h>
 
-namespace NKikimr {
-namespace NCms {
+namespace NKikimr::NCms {
 
 class TJsonProxyConfigUpdates : public TJsonProxyConsole<NConsole::TEvConsole::TEvCheckConfigUpdatesRequest,
                                                          NConsole::TEvConsole::TEvCheckConfigUpdatesResponse> {
@@ -43,6 +42,4 @@ public:
     }
 };
 
-
-} // NCms
-} // NKikimr
+} // namespace NKikimr::NCms
diff --git a/ydb/core/cms/json_proxy_config_validators.h b/ydb/core/cms/json_proxy_config_validators.h
index 98d981a1e37..583aeeb8185 100644
--- a/ydb/core/cms/json_proxy_config_validators.h
+++ b/ydb/core/cms/json_proxy_config_validators.h
@@ -4,8 +4,7 @@
 
 #include <util/string/split.h>
 
-namespace NKikimr {
-namespace NCms {
+namespace NKikimr::NCms {
 
 class TJsonProxyConfigValidators : public TJsonProxyConsole<NConsole::TEvConsole::TEvListConfigValidatorsRequest,
                                                              NConsole::TEvConsole::TEvListConfigValidatorsResponse> {
@@ -25,6 +24,4 @@ public:
     }
 };
 
-
-} // NCms
-} // NKikimr
+} // namespace NKikimr::NCms
diff --git a/ydb/core/cms/json_proxy_console_log.h b/ydb/core/cms/json_proxy_console_log.h
index 78f581b3414..d26a30899c0 100644
--- a/ydb/core/cms/json_proxy_console_log.h
+++ b/ydb/core/cms/json_proxy_console_log.h
@@ -2,8 +2,7 @@
 
 #include "json_proxy.h"
 
-namespace NKikimr {
-namespace NCms {
+namespace NKikimr::NCms {
 
 using namespace NConsole;
 
@@ -71,6 +70,4 @@ public:
     }
 };
 
-
-} // NCms
-} // NKikimr
+} // namespace NKikimr::NCms
diff --git a/ydb/core/cms/json_proxy_log.h b/ydb/core/cms/json_proxy_log.h
index 70177824695..f895f525e7f 100644
--- a/ydb/core/cms/json_proxy_log.h
+++ b/ydb/core/cms/json_proxy_log.h
@@ -2,8 +2,7 @@
 
 #include "json_proxy.h"
 
-namespace NKikimr {
-namespace NCms {
+namespace NKikimr::NCms {
 
 class TJsonProxyLog : public TJsonProxyCms<TEvCms::TEvGetLogTailRequest, TEvCms::TEvGetLogTailResponse> {
 private:
@@ -47,6 +46,4 @@ public:
     }
 };
 
-
-} // NCms
-} // NKikimr
+} // namespace NKikimr::NCms
diff --git a/ydb/core/cms/json_proxy_operations.h b/ydb/core/cms/json_proxy_operations.h
index 6bce70054d9..3c18dfdbcac 100644
--- a/ydb/core/cms/json_proxy_operations.h
+++ b/ydb/core/cms/json_proxy_operations.h
@@ -4,8 +4,7 @@
 
 #include <util/string/split.h>
 
-namespace NKikimr {
-namespace NCms {
+namespace NKikimr::NCms {
 
 template <typename TRequestEvent, typename TResponseEvent>
 class TJsonProxyDataShard : public TJsonProxy<TRequestEvent, TResponseEvent> {
@@ -184,6 +183,4 @@ public:
     }
 };
 
-
-} // NCms
-} // NKikimr
+} // namespace NKikimr::NCms
diff --git a/ydb/core/cms/json_proxy_proto.h b/ydb/core/cms/json_proxy_proto.h
index 3c24e845ae7..ebff56630c6 100644
--- a/ydb/core/cms/json_proxy_proto.h
+++ b/ydb/core/cms/json_proxy_proto.h
@@ -17,8 +17,7 @@
 #include <util/generic/serialized_enum.h>
 #include <iostream>
 
-namespace NKikimr {
-namespace NCms {
+namespace NKikimr::NCms {
 
 class TJsonProxyProto : public TActorBootstrapped<TJsonProxyProto> {
 private:
@@ -199,5 +198,4 @@ protected:
     NMon::TEvHttpInfo::TPtr RequestEvent;
 };
 
-} // NCms
-} // NKikimr
+} // namespace NKikimr::NCms
diff --git a/ydb/core/cms/json_proxy_sentinel.h b/ydb/core/cms/json_proxy_sentinel.h
index cc069fe26a3..70b7f3da53f 100644
--- a/ydb/core/cms/json_proxy_sentinel.h
+++ b/ydb/core/cms/json_proxy_sentinel.h
@@ -2,8 +2,7 @@
 
 #include "json_proxy.h"
 
-namespace NKikimr {
-namespace NCms {
+namespace NKikimr::NCms {
 
 class TJsonProxySentinel : public TJsonProxyCms<TEvCms::TEvGetSentinelStateRequest, TEvCms::TEvGetSentinelStateResponse> {
 private:
@@ -65,6 +64,4 @@ public:
     }
 };
 
-
-} // NCms
-} // NKikimr
+} // namespace NKikimr::NCms
diff --git a/ydb/core/cms/json_proxy_toggle_config_validator.h b/ydb/core/cms/json_proxy_toggle_config_validator.h
index fdf80b90259..5ba5c6d9931 100644
--- a/ydb/core/cms/json_proxy_toggle_config_validator.h
+++ b/ydb/core/cms/json_proxy_toggle_config_validator.h
@@ -4,8 +4,7 @@
 
 #include <util/string/split.h>
 
-namespace NKikimr {
-namespace NCms {
+namespace NKikimr::NCms {
 
 class TJsonProxyToggleConfigValidator : public TJsonProxyConsole<NConsole::TEvConsole::TEvToggleConfigValidatorRequest,
                                                                  NConsole::TEvConsole::TEvToggleConfigValidatorResponse> {
@@ -36,6 +35,4 @@ public:
     }
 };
 
-
-} // NCms
-} // NKikimr
+} // namespace NKikimr::NCms
diff --git a/ydb/core/cms/log_formatter.h b/ydb/core/cms/log_formatter.h
index 2ebb9e74702..d4bbd707b1c 100644
--- a/ydb/core/cms/log_formatter.h
+++ b/ydb/core/cms/log_formatter.h
@@ -4,8 +4,7 @@
 #include <ydb/core/protos/cms.pb.h>
 #include <ydb/core/base/ticket_parser.h>
 
-namespace NKikimr {
-namespace NCms {
+namespace NKikimr::NCms {
 
 template <NKikimrCms::ETextFormat format>
 class TLogFormatter {
@@ -156,5 +155,4 @@ TString TLogFormatter<NKikimrCms::TEXT_FORMAT_DETAILED>::FormatData(const NKikim
     return ss.Str();
 }
 
-} // NCms
-} // NKikimr
+} // namespace NKikimr::NCms
diff --git a/ydb/core/cms/logger.cpp b/ydb/core/cms/logger.cpp
index b6349d488bd..47bc57e7360 100644
--- a/ydb/core/cms/logger.cpp
+++ b/ydb/core/cms/logger.cpp
@@ -3,8 +3,7 @@
 
 #include <util/generic/utility.h>
 
-namespace NKikimr {
-namespace NCms {
+namespace NKikimr::NCms {
 
 using namespace NKikimrCms;
 
@@ -132,5 +131,4 @@ void TLogger::DbLogData(const TLogRecordData &data,
         .Update<Schema::LogRecords::Data>(data);
 }
 
-} // NCms
-} // NKikimr
+} // namespace NKikimr::NCms
diff --git a/ydb/core/cms/logger.h b/ydb/core/cms/logger.h
index 03e718795a3..92361f91a8c 100644
--- a/ydb/core/cms/logger.h
+++ b/ydb/core/cms/logger.h
@@ -10,8 +10,7 @@
 #include <util/datetime/base.h>
 #include <util/generic/set.h>
 
-namespace NKikimr {
-namespace NCms {
+namespace NKikimr::NCms {
 
 using NTabletFlatExecutor::TTransactionContext;
 
@@ -37,5 +36,4 @@ private:
     TCmsStatePtr State;
 };
 
-} // NCms
-} // NKikimr
+} // namespace NKikimr::NCms
diff --git a/ydb/core/cms/pdisk_state.h b/ydb/core/cms/pdisk_state.h
index 6dd673a7299..b3c84375467 100644
--- a/ydb/core/cms/pdisk_state.h
+++ b/ydb/core/cms/pdisk_state.h
@@ -2,11 +2,9 @@
 
 #include <ydb/core/protos/node_whiteboard.pb.h>
 
-namespace NKikimr {
-namespace NCms {
+namespace NKikimr::NCms {
 
 using TPDiskStateInfo = NKikimrWhiteboard::TPDiskStateInfo;
 using EPDiskState = NKikimrBlobStorage::TPDiskState::E;
 
-} // NCms
-} // NKikimr
+} // namespace NKikimr::NCms
diff --git a/ydb/core/cms/pdiskid.h b/ydb/core/cms/pdiskid.h
index a1ff7b215f9..6f30f6a9ea5 100644
--- a/ydb/core/cms/pdiskid.h
+++ b/ydb/core/cms/pdiskid.h
@@ -1,8 +1,7 @@
 #pragma once
 #include "defs.h"
 
-namespace NKikimr {
-namespace NCms {
+namespace NKikimr::NCms {
 
 struct TPDiskID {
     ui32 NodeId;
@@ -60,8 +59,7 @@ struct TPDiskIDHash {
     }
 };
 
-} // NCms
-} // NKikimr
+} // namespace NKikimr::NCms
 
 template<>
 inline void Out<NKikimr::NCms::TPDiskID>(IOutputStream& o, const NKikimr::NCms::TPDiskID& x) {
diff --git a/ydb/core/cms/scheme.h b/ydb/core/cms/scheme.h
index 013792f93f9..f581ab03790 100644
--- a/ydb/core/cms/scheme.h
+++ b/ydb/core/cms/scheme.h
@@ -5,8 +5,7 @@
 #include <ydb/core/scheme/scheme_types_defs.h>
 #include <ydb/core/tablet_flat/flat_cxx_database.h>
 
-namespace NKikimr {
-namespace NCms {
+namespace NKikimr::NCms {
 
 struct Schema : NIceDb::Schema {
     struct Param : Table<1> {
@@ -137,5 +136,4 @@ struct Schema : NIceDb::Schema {
                                      ExecutorLogFlushPeriod<TDuration::MicroSeconds(512).GetValue()>>;
 };
 
-} // NCms
-} // NKikimr
+} // namespace NKikimr::NCms
diff --git a/ydb/core/cms/sentinel.h b/ydb/core/cms/sentinel.h
index 911ad892fe7..9fa1e4e0342 100644
--- a/ydb/core/cms/sentinel.h
+++ b/ydb/core/cms/sentinel.h
@@ -4,8 +4,7 @@
 #include "cms_state.h"
 #include "pdiskid.h"
 
-namespace NKikimr {
-namespace NCms {
+namespace NKikimr::NCms {
 
 struct TEvSentinel {
     enum EEv {
@@ -51,5 +50,4 @@ struct TEvSentinel {
 
 IActor* CreateSentinel(TCmsStatePtr state);
 
-} // NCms
-} // NKikimr
+} // namespace NKikimr::NCms
diff --git a/ydb/core/cms/sentinel_impl.h b/ydb/core/cms/sentinel_impl.h
index ea05ebcb2fa..55a8f5e7ec2 100644
--- a/ydb/core/cms/sentinel_impl.h
+++ b/ydb/core/cms/sentinel_impl.h
@@ -11,9 +11,7 @@
 #include <util/generic/hash_set.h>
 #include <util/generic/map.h>
 
-namespace NKikimr {
-namespace NCms {
-namespace NSentinel {
+namespace NKikimr::NCms::NSentinel {
 
 using EPDiskStatus = NKikimrBlobStorage::EDriveStatus;
 using TLimitsMap = TMap<EPDiskState, ui32>;
@@ -182,6 +180,4 @@ private:
 
 IActor* CreateBSCClientActor(const TCmsStatePtr& cmsState);
 
-} // NSentinel
-} // NCms
-} // NKikimr
+} // namespace NKikimr::NCms::NSentinel
diff --git a/ydb/core/cms/services.cpp b/ydb/core/cms/services.cpp
index 78824908f02..abf0eaecd3e 100644
--- a/ydb/core/cms/services.cpp
+++ b/ydb/core/cms/services.cpp
@@ -2,8 +2,7 @@
 
 #include <util/generic/hash.h>
 
-namespace NKikimr {
-namespace NCms {
+namespace NKikimr::NCms {
 
 bool TryFromWhiteBoardRole(const TString& role, EService& value) {
     static const THashMap<TString, EService> roleToService = {
@@ -20,5 +19,4 @@ bool TryFromWhiteBoardRole(const TString& role, EService& value) {
     return true;
 }
 
-} // NCms
-} // NKikimr
+} // namespace NKikimr::NCms
diff --git a/ydb/core/cms/services.h b/ydb/core/cms/services.h
index 2e3467f2324..9748a25f523 100644
--- a/ydb/core/cms/services.h
+++ b/ydb/core/cms/services.h
@@ -2,8 +2,7 @@
 
 #include <util/generic/flags.h>
 
-namespace NKikimr {
-namespace NCms {
+namespace NKikimr::NCms {
 
 enum class EService: ui8 {
     Storage = 1 /* "storage" */,
@@ -15,5 +14,4 @@ Y_DECLARE_OPERATORS_FOR_FLAGS(TServices);
 
 bool TryFromWhiteBoardRole(const TString& role, EService& value);
 
-} // NCms
-} // NKikimr
+} // namespace NKikimr::NCms
diff --git a/ydb/core/cms/walle.h b/ydb/core/cms/walle.h
index 9a08bb45758..7d8d1d1337b 100644
--- a/ydb/core/cms/walle.h
+++ b/ydb/core/cms/walle.h
@@ -8,8 +8,7 @@
 #include <util/generic/set.h>
 #include <util/generic/string.h>
 
-namespace NKikimr {
-namespace NCms {
+namespace NKikimr::NCms {
 
 constexpr const char *WALLE_CMS_USER = "Wall-E";
 constexpr const char *WALLE_API_URL_PREFIX = "/api/walle/v11/";
@@ -35,5 +34,4 @@ inline void WalleAuditLog(const IEventBase* request, const IEventBase* response,
     AuditLog("Wall-E adapter", request, response, ctx);
 }
 
-} // NCms
-} // NKikimr
+} // namespace NKikimr::NCms
diff --git a/ydb/core/cms/walle_api_handler.cpp b/ydb/core/cms/walle_api_handler.cpp
index e249816a3b6..953a560b110 100644
--- a/ydb/core/cms/walle_api_handler.cpp
+++ b/ydb/core/cms/walle_api_handler.cpp
@@ -12,8 +12,7 @@
 #include <library/cpp/json/json_reader.h>
 #include <library/cpp/json/json_writer.h>
 
-namespace NKikimr {
-namespace NCms {
+namespace NKikimr::NCms {
 
 using namespace NKikimrCms;
 
@@ -381,5 +380,4 @@ IActor *CreateWalleApiHandler(NMon::TEvHttpInfo::TPtr &event)
     return new TWalleCrateTaskHandler(event);
 }
 
-} // NCms
-} // NKikimr
+} // namespace NKikimr::NCms
diff --git a/ydb/core/cms/walle_check_task_adapter.cpp b/ydb/core/cms/walle_check_task_adapter.cpp
index e5570c9af91..465c371d0d3 100644
--- a/ydb/core/cms/walle_check_task_adapter.cpp
+++ b/ydb/core/cms/walle_check_task_adapter.cpp
@@ -3,8 +3,7 @@
 #include <library/cpp/actors/core/actor_bootstrapped.h>
 #include <library/cpp/actors/core/hfunc.h>
 
-namespace NKikimr {
-namespace NCms {
+namespace NKikimr::NCms {
 
 using namespace NKikimrCms;
 using namespace NNodeWhiteboard;
@@ -124,5 +123,4 @@ IActor *CreateWalleAdapter(TEvCms::TEvWalleCheckTaskRequest::TPtr &ev,
     return new TWalleCheckTaskAdapter(ev, state, cms);
 }
 
-} // NCms
-} // NKikimr
+} // namespace NKikimr::NCms
diff --git a/ydb/core/cms/walle_create_task_adapter.cpp b/ydb/core/cms/walle_create_task_adapter.cpp
index 37035940f0a..46fc55d9860 100644
--- a/ydb/core/cms/walle_create_task_adapter.cpp
+++ b/ydb/core/cms/walle_create_task_adapter.cpp
@@ -5,8 +5,7 @@
 #include <library/cpp/actors/core/actor_bootstrapped.h>
 #include <library/cpp/actors/core/hfunc.h>
 
-namespace NKikimr {
-namespace NCms {
+namespace NKikimr::NCms {
 
 using namespace NKikimrCms;
 
@@ -225,5 +224,4 @@ IActor *CreateWalleAdapter(TEvCms::TEvWalleCreateTaskRequest::TPtr &ev, TActorId
     return new TWalleCreateTaskAdapter(ev, cms);
 }
 
-} // NCms
-} // NKikimr
+} // namespace NKikimr::NCms
diff --git a/ydb/core/cms/walle_list_tasks_adapter.cpp b/ydb/core/cms/walle_list_tasks_adapter.cpp
index d256294cc18..d5429b1630f 100644
--- a/ydb/core/cms/walle_list_tasks_adapter.cpp
+++ b/ydb/core/cms/walle_list_tasks_adapter.cpp
@@ -3,8 +3,7 @@
 #include <library/cpp/actors/core/actor_bootstrapped.h>
 #include <library/cpp/actors/core/hfunc.h>
 
-namespace NKikimr {
-namespace NCms {
+namespace NKikimr::NCms {
 
 using namespace NKikimrCms;
 using namespace NNodeWhiteboard;
@@ -70,5 +69,4 @@ IActor *CreateWalleAdapter(TEvCms::TEvWalleListTasksRequest::TPtr &ev, const TCm
     return new TWalleListTasksAdapter(ev, state);
 }
 
-} // NCms
-} // NKikimr
+} // namespace NKikimr::NCms
diff --git a/ydb/core/cms/walle_remove_task_adapter.cpp b/ydb/core/cms/walle_remove_task_adapter.cpp
index 899d4848250..5cd79426386 100644
--- a/ydb/core/cms/walle_remove_task_adapter.cpp
+++ b/ydb/core/cms/walle_remove_task_adapter.cpp
@@ -3,8 +3,7 @@
 #include <library/cpp/actors/core/actor_bootstrapped.h>
 #include <library/cpp/actors/core/hfunc.h>
 
-namespace NKikimr {
-namespace NCms {
+namespace NKikimr::NCms {
 
 using namespace NKikimrCms;
 using namespace NNodeWhiteboard;
@@ -92,5 +91,4 @@ IActor *CreateWalleAdapter(TEvCms::TEvWalleRemoveTaskRequest::TPtr &ev, const TC
     return new TWalleRemoveTaskAdapter(ev, state, cms);
 }
 
-} // NCms
-} // NKikimr
+} // NKikimr::NCms