diff --git a/cmd/propagation_simulator/main.go b/cmd/propagation_simulator/main.go
index 97a1ed5..499276b 100644
--- a/cmd/propagation_simulator/main.go
+++ b/cmd/propagation_simulator/main.go
@@ -38,7 +38,7 @@ func main() {
 	}
 	defer fd.Close()
 
-	var sim propagation.PropagationSimulator
+	var sim propagation.Simulator
 	switch *simType {
 	case "naivep2p":
 		sim = naivep2p.NewSimulator(data, *naiveP2PN, *naiveP2PDelay)
diff --git a/propagation/naivep2p/simulator.go b/propagation/naivep2p/simulator.go
index 83788da..f69a3e9 100644
--- a/propagation/naivep2p/simulator.go
+++ b/propagation/naivep2p/simulator.go
@@ -46,12 +46,12 @@ func NewSimulator(data *graph.Graph, N int, delay time.Duration) *Simulator {
 	return sim
 }
 
-// Stop stops simulator and frees all resources if any. Implements propagation.PropagationSimulator.
+// Stop stops simulator and frees all resources if any. Implements propagation.Simulator.
 func (s *Simulator) Stop() error {
 	return nil
 }
 
-// SendMessage sends single message and tracks propagation. Implements propagation.PropagationSimulator.
+// SendMessage sends single message and tracks propagation. Implements propagation.Simulator.
 func (s *Simulator) SendMessage(startNodeIdx, ttl int) *propagation.Log {
 	message := Message{
 		Content: "dummy",
diff --git a/propagation/propagation.go b/propagation/propagation.go
index 08b51fe..23b1450 100644
--- a/propagation/propagation.go
+++ b/propagation/propagation.go
@@ -1,7 +1,7 @@
 package propagation
 
-// PropagationSimulator defines the simulators for message propagation within the graph.
-type PropagationSimulator interface {
+// Simulator defines the simulators for message propagation within the graph.
+type Simulator interface {
 	SendMessage(idx, ttl int) *Log
 	Stop() error
 }
diff --git a/propagation/whisperv6/simulator.go b/propagation/whisperv6/simulator.go
index facde4d..a65df99 100644
--- a/propagation/whisperv6/simulator.go
+++ b/propagation/whisperv6/simulator.go
@@ -18,7 +18,7 @@ import (
 )
 
 // Simulator simulates WhisperV6 message propagation through the
-// given p2p network. Implements PropagationSimulator interface.
+// given p2p network. Implements Simulator interface.
 type Simulator struct {
 	data     *graph.Graph
 	network  *simulations.Network
@@ -120,7 +120,7 @@ func (s *Simulator) Stop() error {
 	return nil
 }
 
-// SendMessage sends single message and tracks propagation. Implements propagation.PropagationSimulator.
+// SendMessage sends single message and tracks propagation. Implements propagation.Simulator.
 func (s *Simulator) SendMessage(startNodeIdx, ttl int) *propagation.Log {
 	node := s.network.Nodes[startNodeIdx]