diff --git a/firewall/interception/interception.go b/firewall/interception/module.go
similarity index 97%
rename from firewall/interception/interception.go
rename to firewall/interception/module.go
index 8f80188e..0b0e86d0 100644
--- a/firewall/interception/interception.go
+++ b/firewall/interception/module.go
@@ -8,8 +8,6 @@ import (
 	"github.com/safing/portmaster/network/packet"
 )
 
-// FIXME: rename to "module"
-
 var (
 	module *modules.Module
 
diff --git a/firewall/filter.go b/firewall/module.go
similarity index 98%
rename from firewall/filter.go
rename to firewall/module.go
index b85d324e..345316c0 100644
--- a/firewall/filter.go
+++ b/firewall/module.go
@@ -11,8 +11,6 @@ import (
 	"github.com/safing/portmaster/network"
 )
 
-// FIXME: rename to "module"
-
 var module *modules.Module
 
 func init() {
diff --git a/firewall/interception.go b/firewall/packet_handler.go
similarity index 99%
rename from firewall/interception.go
rename to firewall/packet_handler.go
index 6ef4bda9..4fc783ba 100644
--- a/firewall/interception.go
+++ b/firewall/packet_handler.go
@@ -24,8 +24,6 @@ import (
 	"github.com/safing/portmaster/network/reference"
 )
 
-// FIXME: rename to "packet_handler"
-
 var (
 	nameserverIPMatcher      func(ip net.IP) bool
 	nameserverIPMatcherSet   = abool.New()