diff --git a/sat/plugins/plugin_merge_req_mercurial.py b/sat/plugins/plugin_merge_req_mercurial.py
index 65d50722..4d706e62 100644
--- a/sat/plugins/plugin_merge_req_mercurial.py
+++ b/sat/plugins/plugin_merge_req_mercurial.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python3
 
-
-# SàT plugin for import external blogs
+# SàT plugin managing Mercurial VCS
 # Copyright (C) 2009-2020 Jérôme Poisson (goffi@goffi.org)
 
 # This program is free software: you can redistribute it and/or modify
diff --git a/sat/plugins/plugin_xep_0050.py b/sat/plugins/plugin_xep_0050.py
index 773cde9d..a716f17f 100644
--- a/sat/plugins/plugin_xep_0050.py
+++ b/sat/plugins/plugin_xep_0050.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python3
 
-
-# SAT plugin for Ad-Hoc Commands (XEP-0050)
+# SàT plugin for Ad-Hoc Commands (XEP-0050)
 # Copyright (C) 2009-2020 Jérôme Poisson (goffi@goffi.org)
 
 # This program is free software: you can redistribute it and/or modify
diff --git a/sat/tools/common/async_process.py b/sat/tools/common/async_process.py
index 204ee18e..b4ec9392 100644
--- a/sat/tools/common/async_process.py
+++ b/sat/tools/common/async_process.py
@@ -99,7 +99,7 @@ class CommandProtocol(protocol.ProcessProtocol):
         """Create a new CommandProtocol and execute the given command.
 
         @param *args(unicode): command arguments
-            if cls.command is specified, it will be the path to the command to execture
+            if cls.command is specified, it will be the path to the command to execute
             otherwise, first argument must be the path
         @param **kwargs: can be:
             - stdin(unicode, None): data to push to standard input
diff --git a/sat/tools/common/files_utils.py b/sat/tools/common/files_utils.py
index 61096415..723e26be 100644
--- a/sat/tools/common/files_utils.py
+++ b/sat/tools/common/files_utils.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python3
 
-
-# SAT: a jabber client
+# SaT: an XMPP client
 # Copyright (C) 2009-2020 Jérôme Poisson (goffi@goffi.org)
 
 # This program is free software: you can redistribute it and/or modify
diff --git a/sat/tools/utils.py b/sat/tools/utils.py
index d8bd0ba1..fb662f55 100644
--- a/sat/tools/utils.py
+++ b/sat/tools/utils.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python3
 
-
-# SAT: a jabber client
+# SaT: an XMPP client
 # Copyright (C) 2009-2020 Jérôme Poisson (goffi@goffi.org)
 
 # This program is free software: you can redistribute it and/or modify
diff --git a/sat_frontends/jp/cmd_adhoc.py b/sat_frontends/jp/cmd_adhoc.py
index 78659f26..9dd52349 100644
--- a/sat_frontends/jp/cmd_adhoc.py
+++ b/sat_frontends/jp/cmd_adhoc.py
@@ -163,7 +163,7 @@ class Run(base.CommandBase):
 
 
 class List(base.CommandBase):
-    """Run an Ad-Hoc command"""
+    """List Ad-Hoc commands available on a service"""
 
     def __init__(self, host):
         super(List, self).__init__(
@@ -175,7 +175,7 @@ class List(base.CommandBase):
             "-j",
             "--jid",
             default="",
-            help=_("jid of the service (default: profile's server"),
+            help=_("jid of the service (default: profile's server)"),
         )
 
     async def start(self):