diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index ea0a461b0..c2ce3d125 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -375,7 +375,7 @@ set (TARGET_SOURCES
         ${PM3_ROOT}/client/src/cmdlfguard.c
         ${PM3_ROOT}/client/src/cmdlfhid.c
         ${PM3_ROOT}/client/src/cmdlfhitag.c
-        ${PM3_ROOT}/client/src/cmdlfhitags.c
+        ${PM3_ROOT}/client/src/cmdlfhitaghts.c
         ${PM3_ROOT}/client/src/cmdlfidteck.c
         ${PM3_ROOT}/client/src/cmdlfindala.c
         ${PM3_ROOT}/client/src/cmdlfio.c
diff --git a/client/Makefile b/client/Makefile
index aafe4ed79..2da13c683 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -659,7 +659,7 @@ SRCS =  mifare/aiddesfire.c \
 		cmdlfgallagher.c \
 		cmdlfhid.c \
 		cmdlfhitag.c \
-		cmdlfhitags.c \
+		cmdlfhitaghts.c \
 		cmdlfidteck.c \
 		cmdlfindala.c \
 		cmdlfio.c \
diff --git a/client/experimental_lib/CMakeLists.txt b/client/experimental_lib/CMakeLists.txt
index a1c3b9a7c..c71b68156 100644
--- a/client/experimental_lib/CMakeLists.txt
+++ b/client/experimental_lib/CMakeLists.txt
@@ -376,7 +376,7 @@ set (TARGET_SOURCES
         ${PM3_ROOT}/client/src/cmdlfguard.c
         ${PM3_ROOT}/client/src/cmdlfhid.c
         ${PM3_ROOT}/client/src/cmdlfhitag.c
-        ${PM3_ROOT}/client/src/cmdlfhitags.c
+        ${PM3_ROOT}/client/src/cmdlfhitaghts.c
         ${PM3_ROOT}/client/src/cmdlfidteck.c
         ${PM3_ROOT}/client/src/cmdlfindala.c
         ${PM3_ROOT}/client/src/cmdlfio.c
diff --git a/client/src/cmdlfhitag.c b/client/src/cmdlfhitag.c
index 829dea62e..24b2c3fa4 100644
--- a/client/src/cmdlfhitag.c
+++ b/client/src/cmdlfhitag.c
@@ -31,7 +31,7 @@
 #include "pm3_cmd.h"    // return codes
 #include "hitag2/hitag2_crypto.h"
 #include "util_posix.h"             // msclock
-#include "cmdlfhitags.h"
+#include "cmdlfhitaghts.h"
 
 static int CmdHelp(const char *Cmd);
 
@@ -2478,7 +2478,7 @@ static int CmdLFHitag2Selftest(const char *Cmd) {
 static command_t CommandTable[] = {
     {"help",        CmdHelp,                    AlwaysAvailable, "This help"},
     {"list",        CmdLFHitagList,             AlwaysAvailable, "List Hitag trace history"},
-    {"s",           CmdLFHitagS,                AlwaysAvailable, "Hitag S/8211 operations"},
+    {"hts",           CmdLFHitagS,                AlwaysAvailable, "{ Hitag S/8211 operations }"},
     {"-----------", CmdHelp,                    IfPm3Hitag,      "------------------------ " _CYAN_("General") " ------------------------"},
     {"info",        CmdLFHitagInfo,             IfPm3Hitag,      "Hitag 2 tag information"},
     {"reader",      CmdLFHitagReader,           IfPm3Hitag,      "Act like a Hitag 2 reader"},
diff --git a/client/src/cmdlfhitags.c b/client/src/cmdlfhitaghts.c
similarity index 93%
rename from client/src/cmdlfhitags.c
rename to client/src/cmdlfhitaghts.c
index 2f36ff189..11be52dac 100644
--- a/client/src/cmdlfhitags.c
+++ b/client/src/cmdlfhitaghts.c
@@ -16,7 +16,7 @@
 // Low frequency Hitag S support
 //-----------------------------------------------------------------------------
 
-#include "cmdlfhitags.h"
+#include "cmdlfhitaghts.h"
 #include <ctype.h>
 #include "cmdparser.h"  // command_t
 #include "comms.h"
@@ -39,15 +39,15 @@ static int CmdHelp(const char *Cmd);
 
 static int CmdLFHitagSRead(const char *Cmd) {
     CLIParserContext *ctx;
-    CLIParserInit(&ctx, "lf hitag s read",
+    CLIParserInit(&ctx, "lf hitag hts read",
                   "Read Hitag S memory.\n\n"
                   "  Crypto mode: \n"
                   "    - key format ISK high + ISK low\n"
                   "    - default key 4F4E4D494B52 (ONMIKR)\n",
                   "  lf hitag s read                         -> Hitag S, plain mode\n"
-                  "  lf hitag s read --nrar 0102030411223344 -> Hitag S, challenge mode\n"
-                  "  lf hitag s read --crypto                -> Hitag S, crypto mode, def key\n"
-                  "  lf hitag s read -k 4F4E4D494B52         -> Hitag S, crypto mode\n\n"
+                  "  lf hitag hts read --nrar 0102030411223344 -> Hitag S, challenge mode\n"
+                  "  lf hitag hts read --crypto                -> Hitag S, crypto mode, def key\n"
+                  "  lf hitag hts read -k 4F4E4D494B52         -> Hitag S, crypto mode\n\n"
     );
 
     void *argtable[] = {
@@ -164,15 +164,15 @@ static int CmdLFHitagSRead(const char *Cmd) {
 
 static int CmdLFHitagSWrite(const char *Cmd) {
     CLIParserContext *ctx;
-    CLIParserInit(&ctx, "lf hitag s write",
+    CLIParserInit(&ctx, "lf hitag hts write",
                   "Write a page in Hitag S memory.\n"
                   "  Crypto mode: \n"
                   "    - key format ISK high + ISK low\n"
                   "    - default key 4F4E4D494B52 (ONMIKR)\n",
                   "  lf hitag write -p 6 -d 01020304                         -> Hitag S, plain mode\n"
-                  "  lf hitag write -p 6 -d 01020304 --nrar 0102030411223344 -> Hitag S, challenge mode\n"
-                  "  lf hitag write -p 6 -d 01020304 --crypto                -> Hitag S, crypto mode, def key\n"
-                  "  lf hitag write -p 6 -d 01020304 -k 4F4E4D494B52         -> Hitag S, crypto mode\n\n"
+                  "  lf hitag hts write -p 6 -d 01020304 --nrar 0102030411223344 -> Hitag S, challenge mode\n"
+                  "  lf hitag hts write -p 6 -d 01020304 --crypto                -> Hitag S, crypto mode, def key\n"
+                  "  lf hitag hts write -p 6 -d 01020304 -k 4F4E4D494B52         -> Hitag S, crypto mode\n\n"
     );
 
     void *argtable[] = {
@@ -286,7 +286,7 @@ static int CmdLFHitagSWrite(const char *Cmd) {
 }
 
 static int CmdLFHitagSList(const char *Cmd) {
-    return CmdTraceListAlias(Cmd, "lf hitag s", "hitags");
+    return CmdTraceListAlias(Cmd, "lf hitag hts", "hitags");
 }
 
 static command_t CommandTable[] = {
diff --git a/client/src/cmdlfhitags.h b/client/src/cmdlfhitaghts.h
similarity index 100%
rename from client/src/cmdlfhitags.h
rename to client/src/cmdlfhitaghts.h