diff --git a/README.md b/README.md
index 5c629da6..f6bb88fc 100644
--- a/README.md
+++ b/README.md
@@ -52,11 +52,11 @@ Simple password sniffer.
 # keep reading arp table for network mapping
 net.recon on
 # setup a regular expression for packet payloads
-set net.sniffer.regexp .*password=.+
+set net.sniff.regexp .*password=.+
 # set the sniffer output file
-set net.sniffer.output passwords.pcap
+set net.sniff.output passwords.pcap
 # start the sniffer
-net.sniffer on
+net.sniff on
 ```
 
 #### caplets/rest-api.cap
diff --git a/caplets/local-sniffer.cap b/caplets/local-sniffer.cap
index 79fb4d84..feb49537 100644
--- a/caplets/local-sniffer.cap
+++ b/caplets/local-sniffer.cap
@@ -3,9 +3,9 @@ events.clear
 set events.stream.filter net.sniff
 events.stream on
 
-set net.sniffer.verbose false
-set net.sniffer.local true
+set net.sniff.verbose false
+set net.sniff.local true
 # http://biot.com/capstats/bpf.html
-# set net.sniffer.filter not arp and not udp port 53
+# set net.sniff.filter not arp and not udp port 53
 
-net.sniffer on
+net.sniff on
diff --git a/caplets/simple-passwords-sniffer.cap b/caplets/simple-passwords-sniffer.cap
index 847e7c46..30260ed0 100644
--- a/caplets/simple-passwords-sniffer.cap
+++ b/caplets/simple-passwords-sniffer.cap
@@ -1,12 +1,12 @@
 # keep reading arp table for network mapping
 net.recon on
 
-set net.sniffer.regexp .*password=.+
-set net.sniffer.output passwords.cap
+set net.sniff.regexp .*password=.+
+set net.sniff.output passwords.cap
 
 # start arp spoofing attack
 # arp.spoof on
-net.sniffer on
+net.sniff on
 
 
 
diff --git a/modules/net_sniff.go b/modules/net_sniff.go
index 0378b2ee..6157680b 100644
--- a/modules/net_sniff.go
+++ b/modules/net_sniff.go
@@ -19,34 +19,34 @@ type Sniffer struct {
 
 func NewSniffer(s *session.Session) *Sniffer {
 	sniff := &Sniffer{
-		SessionModule: session.NewSessionModule("net.sniffer", s),
+		SessionModule: session.NewSessionModule("net.sniff", s),
 		Stats:         nil,
 	}
 
-	sniff.AddParam(session.NewBoolParameter("net.sniffer.verbose",
+	sniff.AddParam(session.NewBoolParameter("net.sniff.verbose",
 		"true",
 		"If true, will print every captured packet, otherwise only selected ones."))
 
-	sniff.AddParam(session.NewBoolParameter("net.sniffer.local",
+	sniff.AddParam(session.NewBoolParameter("net.sniff.local",
 		"false",
 		"If true it will consider packets from/to this computer, otherwise it will skip them."))
 
-	sniff.AddParam(session.NewStringParameter("net.sniffer.filter",
+	sniff.AddParam(session.NewStringParameter("net.sniff.filter",
 		"not arp",
 		"",
 		"BPF filter for the sniffer."))
 
-	sniff.AddParam(session.NewStringParameter("net.sniffer.regexp",
+	sniff.AddParam(session.NewStringParameter("net.sniff.regexp",
 		"",
 		"",
 		"If filled, only packets matching this regular expression will be considered."))
 
-	sniff.AddParam(session.NewStringParameter("net.sniffer.output",
+	sniff.AddParam(session.NewStringParameter("net.sniff.output",
 		"",
 		"",
 		"If set, the sniffer will write captured packets to this file."))
 
-	sniff.AddHandler(session.NewModuleHandler("net.sniffer stats", "",
+	sniff.AddHandler(session.NewModuleHandler("net.sniff stats", "",
 		"Print sniffer session configuration and statistics.",
 		func(args []string) error {
 			sniff.Ctx.Log(sniff.Session)
@@ -57,13 +57,13 @@ func NewSniffer(s *session.Session) *Sniffer {
 			return sniff.Stats.Print()
 		}))
 
-	sniff.AddHandler(session.NewModuleHandler("net.sniffer on", "",
+	sniff.AddHandler(session.NewModuleHandler("net.sniff on", "",
 		"Start network sniffer in background.",
 		func(args []string) error {
 			return sniff.Start()
 		}))
 
-	sniff.AddHandler(session.NewModuleHandler("net.sniffer off", "",
+	sniff.AddHandler(session.NewModuleHandler("net.sniff off", "",
 		"Stop network sniffer in background.",
 		func(args []string) error {
 			return sniff.Stop()
diff --git a/modules/net_sniff_context.go b/modules/net_sniff_context.go
index 37235b80..40257d99 100644
--- a/modules/net_sniff_context.go
+++ b/modules/net_sniff_context.go
@@ -34,19 +34,19 @@ func (s *Sniffer) GetContext() (error, *SnifferContext) {
 		return err, ctx
 	}
 
-	if err, v := s.Param("net.sniffer.verbose").Get(s.Session); err != nil {
+	if err, v := s.Param("net.sniff.verbose").Get(s.Session); err != nil {
 		return err, ctx
 	} else {
 		ctx.Verbose = v.(bool)
 	}
 
-	if err, v := s.Param("net.sniffer.local").Get(s.Session); err != nil {
+	if err, v := s.Param("net.sniff.local").Get(s.Session); err != nil {
 		return err, ctx
 	} else {
 		ctx.DumpLocal = v.(bool)
 	}
 
-	if err, v := s.Param("net.sniffer.filter").Get(s.Session); err != nil {
+	if err, v := s.Param("net.sniff.filter").Get(s.Session); err != nil {
 		return err, ctx
 	} else {
 		if ctx.Filter = v.(string); ctx.Filter != "" {
@@ -57,7 +57,7 @@ func (s *Sniffer) GetContext() (error, *SnifferContext) {
 		}
 	}
 
-	if err, v := s.Param("net.sniffer.regexp").Get(s.Session); err != nil {
+	if err, v := s.Param("net.sniff.regexp").Get(s.Session); err != nil {
 		return err, ctx
 	} else {
 		if ctx.Expression = v.(string); ctx.Expression != "" {
@@ -67,7 +67,7 @@ func (s *Sniffer) GetContext() (error, *SnifferContext) {
 		}
 	}
 
-	if err, v := s.Param("net.sniffer.output").Get(s.Session); err != nil {
+	if err, v := s.Param("net.sniff.output").Get(s.Session); err != nil {
 		return err, ctx
 	} else {
 		if ctx.Output = v.(string); ctx.Output != "" {