diff --git a/mailstream/mailstream.php b/mailstream/mailstream.php
index 1a661f8e..9eafaf31 100644
--- a/mailstream/mailstream.php
+++ b/mailstream/mailstream.php
@@ -67,7 +67,7 @@ function mailstream_module()
 /**
  * Adds an item in "addon features" in the admin menu of the site
  *
- * @param Friendica\App $a App object (unused)
+ * @param App $a App object (unused)
  * @param string        $o HTML form data
  */
 function mailstream_addon_admin(App $a, &$o)
@@ -138,8 +138,8 @@ function mailstream_send_hook(App $a, $data)
  * mailstream is enabled and the necessary data is available, forks a
  * workerqueue item to send the email.
  *
- * @param Friendica\App $a    App object (unused)
- * @param array         $item content of the item (may or may not already be stored in the item table)
+ * @param App $a    App object (unused)
+ * @param array     $item content of the item (may or may not already be stored in the item table)
  */
 function mailstream_post_hook(App $a, &$item)
 {
diff --git a/membersince/membersince.php b/membersince/membersince.php
index b70a510f..408de60e 100644
--- a/membersince/membersince.php
+++ b/membersince/membersince.php
@@ -7,6 +7,7 @@
  * Status: Unsupported
  */
 
+use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\DI;
 use Friendica\Util\DateTimeFormat;
@@ -16,7 +17,7 @@ function membersince_install()
 	Hook::register('profile_advanced', 'addon/membersince/membersince.php', 'membersince_display');
 }
 
-function membersince_display(Friendica\App $a, array &$b)
+function membersince_display(App $a, array &$b)
 {
 	if ($a->getCurrentTheme() == 'frio') {
 		// Works in Frio.
diff --git a/rendertime/rendertime.php b/rendertime/rendertime.php
index e87f495b..8e4e6c21 100644
--- a/rendertime/rendertime.php
+++ b/rendertime/rendertime.php
@@ -44,10 +44,10 @@ function rendertime_addon_admin_post(App $a)
 }
 
 /**
- * @param Friendica\App $a
+ * @param App $a
  * @param string $o
  */
-function rendertime_page_end(Friendica\App $a, &$o)
+function rendertime_page_end(App $a, &$o)
 {
 
 	$profiler = DI::profiler();
diff --git a/smileybutton/smileybutton.php b/smileybutton/smileybutton.php
index abb71d3d..dd68a8e2 100644
--- a/smileybutton/smileybutton.php
+++ b/smileybutton/smileybutton.php
@@ -7,6 +7,7 @@
  * Maintainer: Hypolite Petovan <https://friendica.mrpetovan.com/profile/hypolite>
  */
 
+use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\DI;
 
@@ -16,7 +17,7 @@ function smileybutton_install()
 	Hook::register('jot_tool', 'addon/smileybutton/smileybutton.php', 'smileybutton_jot_tool');
 }
 
-function smileybutton_jot_tool(Friendica\App $a, array &$b)
+function smileybutton_jot_tool(App $a, string &$body)
 {
 	// Disable if theme is quattro
 	// TODO add style for quattro
@@ -113,7 +114,7 @@ function smileybutton_jot_tool(Friendica\App $a, array &$b)
 	$image_url = DI::baseUrl()->get() . '/' . $image;
 
 	//Add the hmtl and script to the page
-	$b = <<< EOT
+	$body = <<< EOT
 	<div id="profile-smiley-wrapper">
 		<button type="button" class="btn btn-link smiley_button" onclick="toggle_smileybutton()"><img src="$image_url" alt="smiley"></button>
 		<div id="smileybutton">