diff --git a/locales/en.ftl b/locales/en.ftl
index efb589cf..9c663031 100644
--- a/locales/en.ftl
+++ b/locales/en.ftl
@@ -10,14 +10,12 @@ welcome = Welcome!
 
 ## Language Feature
 
-language = 
-    .select = Please, select your language
-    .changed = Language successfully changed!
+language-select = Please, select your language
+language-changed = Language successfully changed!
 
 ## Admin Feature
 
-admin =
-    .commands-updated = Commands updated.
+admin-commands-updated = Commands updated.
 
 ## Unhandled Feature
 
diff --git a/src/bot/features/language.ts b/src/bot/features/language.ts
index 93a43fdf..2211496e 100644
--- a/src/bot/features/language.ts
+++ b/src/bot/features/language.ts
@@ -10,7 +10,7 @@ const composer = new Composer<Context>()
 const feature = composer.chatType('private')
 
 feature.command('language', logHandle('command-language'), async (ctx) => {
-  return ctx.reply(ctx.t('language.select'), {
+  return ctx.reply(ctx.t('language-select'), {
     reply_markup: await createChangeLanguageKeyboard(ctx),
   })
 })
@@ -26,7 +26,7 @@ feature.callbackQuery(
     if (i18n.locales.includes(languageCode)) {
       await ctx.i18n.setLocale(languageCode)
 
-      return ctx.editMessageText(ctx.t('language.changed'), {
+      return ctx.editMessageText(ctx.t('language-changed'), {
         reply_markup: await createChangeLanguageKeyboard(ctx),
       })
     }
diff --git a/src/bot/handlers/commands/setcommands.ts b/src/bot/handlers/commands/setcommands.ts
index 40c2fc02..dd694027 100644
--- a/src/bot/handlers/commands/setcommands.ts
+++ b/src/bot/handlers/commands/setcommands.ts
@@ -104,5 +104,5 @@ export async function setCommandsHandler(ctx: CommandContext<Context>) {
     },
   )
 
-  return ctx.reply(ctx.t('admin.commands-updated'))
+  return ctx.reply(ctx.t('admin-commands-updated'))
 }