diff --git a/net-mgmt/collectd/pkg-descr b/net-mgmt/collectd/pkg-descr
index b50a748d9..10fdf4d22 100644
--- a/net-mgmt/collectd/pkg-descr
+++ b/net-mgmt/collectd/pkg-descr
@@ -14,9 +14,9 @@ Plugin Changelog
 
 1.3
 
-* Add support for CPU aggregation (contributed by @pmhausen)
-* Make Graphite separate instances configurable (contributed by @pmhausen)
-* Add disk I/O plugin (contributed by @pmhausen)
+* Add support for CPU aggregation (contributed by pmhausen)
+* Make Graphite separate instances configurable (contributed by pmhausen)
+* Add disk I/O plugin (contributed by pmhausen)
 
 1.2
 
diff --git a/net-mgmt/telegraf/pkg-descr b/net-mgmt/telegraf/pkg-descr
index bfcb0cd53..2be143db9 100644
--- a/net-mgmt/telegraf/pkg-descr
+++ b/net-mgmt/telegraf/pkg-descr
@@ -94,8 +94,8 @@ Plugin Changelog
 
 1.8.1
 
-* Fix 'flush interval' templating by @Jontron123
-* Add ability to disable TLS for Graphite by @primemaster
+* Fix 'flush interval' templating (contributed by Jontron123)
+* Add ability to disable TLS for Graphite (contributed by primemaster)
 
 1.8.0
 
diff --git a/net/frr/pkg-descr b/net/frr/pkg-descr
index e9a8bd2d8..f21cd3062 100644
--- a/net/frr/pkg-descr
+++ b/net/frr/pkg-descr
@@ -207,9 +207,9 @@ Plugin Changelog
 
 1.12
 
-* Add passive-interface to OSPFv3 (by Michael Muenz)
-* Allow to set area per interface for OSPFv2 (by @twoequaldots)
-* Allow to set ebgp-multihop in BGP (by @bpeavy and Greg Goodrich)
+* Add passive-interface to OSPFv3 (contributed by Michael Muenz)
+* Allow to set area per interface for OSPFv2 (contributed by twoequaldots)
+* Allow to set ebgp-multihop in BGP (contributed by bpeavy and Greg Goodrich)
 
 1.11
 
diff --git a/security/clamav/pkg-descr b/security/clamav/pkg-descr
index ba2697c34..d54ada582 100644
--- a/security/clamav/pkg-descr
+++ b/security/clamav/pkg-descr
@@ -11,7 +11,7 @@ Plugin Changelog
 
 1.8.1
 
-* Fixed detect broken executables option (contributed by @sopex)
+* Fixed detect broken executables option (contributed by sopex)
 
 1.8
 
diff --git a/security/maltrail/pkg-descr b/security/maltrail/pkg-descr
index 69ad13f61..cbc444bf1 100644
--- a/security/maltrail/pkg-descr
+++ b/security/maltrail/pkg-descr
@@ -35,7 +35,7 @@ Changelog
 
 1.5
 
-* Change whitelisting format (by @jkellerer)
+* Change whitelisting format (contributed by jkellerer)
 * Add alienvault to disabled feeds
 
 1.4
diff --git a/www/nginx/pkg-descr b/www/nginx/pkg-descr
index d6b49aa7d..0f7cb8ac8 100644
--- a/www/nginx/pkg-descr
+++ b/www/nginx/pkg-descr
@@ -155,8 +155,8 @@ Plugin Changelog
 1.14
 
 * add load balancer algorithm option (ip_hash)
-* fix URL flag not stored (contributed by jkellerer) [1]
-* allow to whitelist specific source IPs in the web application firewall (contributed by Julio Cesar Camargo) [2]
+* fix URL flag not stored (contributed by jkellerer)[1]
+* allow to whitelist specific source IPs in the web application firewall (contributed by Julio Cesar Camargo)[2]
 
 [1] https://github.com/opnsense/plugins/pull/1375
 [2] https://github.com/opnsense/plugins/pull/1310
@@ -219,7 +219,7 @@ Plugin Changelog
 
 * Add proxy options for ignore client abort and disabling buffering
 * Add logviewer support for streams
-* Fix charset is not defined bug (contributed by ccesario [1])
+* Fix charset is not defined bug (contributed by ccesario)[1]
 * Add an existence check for locations
 * Add PROXY protocol for HTTP and Streams frontend
 * Add PROXY backend support for Streams
@@ -230,14 +230,14 @@ Plugin Changelog
 1.4 (Development only)
 
 * move upstreams from HTTP to their own menu because they are used for TCP load balancing as well
-* add TCP load balancing [1]
+* add TCP load balancing[1]
 * add support for IP based ACLs
-* add log rotation (contributed by Julius Cesar Camargo [2])
+* add log rotation (contributed by Julius Cesar Camargo)[2]
 * add support for satisfy, body size limitation
-* change: allow to disable internal bot protection (contributed by @fzoske) [3]
+* change: allow to disable internal bot protection (contributed by fzoske)[3]
 * change: do not save when no change in the list happened to prevent filling the log history
 * fix: translate a german string in upstream server to english
-* replace headers instead of just adding our own (duplication issue #971), suppress X-Powered-By from Upstream [4]
+* replace headers instead of just adding our own (duplication issue #971), suppress X-Powered-By from Upstream[4]
 
 [1] https://github.com/opnsense/plugins/pull/930
 [2] https://github.com/opnsense/plugins/pull/982
@@ -253,13 +253,13 @@ Plugin Changelog
 * add limiter support
 * add permanent ban feature (use alias in firewall rules)
 * add caching feature (local file system)
-* add path prefix support (contributed by @ccesario )
+* add path prefix support (contributed by ccesario)
 * add port to upstream server table
 * add support to download waf rules
 * improvement: export full chain instead of only the server certificate (fixes some issues with some tools which need it)
 * web interface (allow HTTP/2 server push to increase performance)
 * support for (secure) web sockets in reverse proxy mode
-* bugfix: fix issues with multiple hostnames (IPv6 issues with TLS SNI by @ccesario )
+* bugfix: fix issues with multiple hostnames  due to IPv6 issues with TLS SNI (contributed by ccesario)
 * bugfix: warning in certificate rendering
 
 1.1