diff --git a/plinth/modules/i2p/__init__.py b/plinth/modules/i2p/__init__.py
index d9b6435f4..45948fd0b 100644
--- a/plinth/modules/i2p/__init__.py
+++ b/plinth/modules/i2p/__init__.py
@@ -66,9 +66,9 @@ additional_favorites = [
 ]
 
 tunnels_to_manage = {
-    'I2P HTTP Proxy': 'i2p_socks_http-freedombox',
-    'I2P HTTPS Proxy': 'i2p_socks_https-freedombox',
-    'Irc2P': 'i2p_irc-freedombox'
+    'I2P HTTP Proxy': 'i2p-http-proxy-freedombox',
+    'I2P HTTPS Proxy': 'i2p-https-proxy-freedombox',
+    'Irc2P': 'i2p-irc-freedombox'
 }
 
 service_ports = ['http', 'https'] + list(tunnels_to_manage.values())
diff --git a/plinth/modules/i2p/data/usr/lib/firewalld/services/i2p-http-proxy-freedombox.xml b/plinth/modules/i2p/data/usr/lib/firewalld/services/i2p-http-proxy-freedombox.xml
new file mode 100644
index 000000000..7b6cdd383
--- /dev/null
+++ b/plinth/modules/i2p/data/usr/lib/firewalld/services/i2p-http-proxy-freedombox.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<service>
+  <short>I2P HTTP Proxy</short>
+  <description>The Invisible Internet Project is an anonymous network layer intended to protect communication from censorship and surveillance. I2P provides anonymity by sending encrypted traffic through a volunteer-run network distributed around the world. Enable this if a running an I2P server with HTTP proxy and wish to connect into the I2P network to browse eepsites.</description>
+  <port protocol="tcp" port="4444"/>
+</service>
diff --git a/plinth/modules/i2p/data/usr/lib/firewalld/services/i2p-https-proxy-freedombox.xml b/plinth/modules/i2p/data/usr/lib/firewalld/services/i2p-https-proxy-freedombox.xml
new file mode 100644
index 000000000..d4c1e8836
--- /dev/null
+++ b/plinth/modules/i2p/data/usr/lib/firewalld/services/i2p-https-proxy-freedombox.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<service>
+  <short>I2P HTTPS Proxy</short>
+  <description>The Invisible Internet Project is an anonymous network layer intended to protect communication from censorship and surveillance. I2P provides anonymity by sending encrypted traffic through a volunteer-run network distributed around the world. Enable this if a running an I2P server with HTTPS proxy and wish to connect into the I2P network to browse eepsites.</description>
+  <port protocol="tcp" port="4445"/>
+</service>
diff --git a/plinth/modules/i2p/data/usr/lib/firewalld/services/i2p-irc-freedombox.xml b/plinth/modules/i2p/data/usr/lib/firewalld/services/i2p-irc-freedombox.xml
new file mode 100644
index 000000000..21aeb2fcc
--- /dev/null
+++ b/plinth/modules/i2p/data/usr/lib/firewalld/services/i2p-irc-freedombox.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<service>
+  <short>I2P IRC Tunnel</short>
+  <description>The Invisible Internet Project is an anonymous network layer intended to protect communication from censorship and surveillance. I2P provides anonymity by sending encrypted traffic through a volunteer-run network distributed around the world. Enable this if a running an I2P server with IRC tunnel and wish to access the Irc2P network.</description>
+  <port protocol="tcp" port="6668"/>
+</service>
diff --git a/plinth/modules/i2p/data/usr/lib/firewalld/services/i2p_irc-freedombox.xml b/plinth/modules/i2p/data/usr/lib/firewalld/services/i2p_irc-freedombox.xml
deleted file mode 100644
index bac78c108..000000000
--- a/plinth/modules/i2p/data/usr/lib/firewalld/services/i2p_irc-freedombox.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<service>
-  <short>I2P IRC</short>
-  <description>An entry into an IRC proxy server on I2P</description>
-  <port protocol="tcp" port="6668"/>
-  <port protocol="udp" port="6668"/>
-</service>
diff --git a/plinth/modules/i2p/data/usr/lib/firewalld/services/i2p_socks_http-freedombox.xml b/plinth/modules/i2p/data/usr/lib/firewalld/services/i2p_socks_http-freedombox.xml
deleted file mode 100644
index 5af862d8d..000000000
--- a/plinth/modules/i2p/data/usr/lib/firewalld/services/i2p_socks_http-freedombox.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<service>
-  <short>I2P SOCKS5 HTTP Proxy</short>
-  <description>A SOCKS5 HTTP proxy into the I2P network to browse eepsites.</description>
-  <port protocol="tcp" port="4444"/>
-  <port protocol="udp" port="4444"/>
-</service>
diff --git a/plinth/modules/i2p/data/usr/lib/firewalld/services/i2p_socks_https-freedombox.xml b/plinth/modules/i2p/data/usr/lib/firewalld/services/i2p_socks_https-freedombox.xml
deleted file mode 100644
index d394d3607..000000000
--- a/plinth/modules/i2p/data/usr/lib/firewalld/services/i2p_socks_https-freedombox.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<service>
-  <short>I2P SOCKS5 HTTPS Proxy</short>
-  <description>A SOCKS5 HTTPS proxy into the I2P network to browse eepsites.</description>
-  <port protocol="tcp" port="4445"/>
-  <port protocol="udp" port="4445"/>
-</service>