diff --git a/cmix/client.go b/cmix/client.go
index 2beb6873d434e4572f577aa0ebca00825d4ed697..0db561b23ab3fd5a787f479e53bdeb57ef82b7c9 100644
--- a/cmix/client.go
+++ b/cmix/client.go
@@ -15,11 +15,11 @@ import (
 	"gitlab.com/elixxir/client/cmix/address"
 	"gitlab.com/elixxir/client/cmix/gateway"
 	"gitlab.com/elixxir/client/cmix/health"
-	"gitlab.com/elixxir/client/cmix/rounds"
 	"gitlab.com/elixxir/client/cmix/identity"
 	"gitlab.com/elixxir/client/cmix/message"
 	"gitlab.com/elixxir/client/cmix/nodes"
 	"gitlab.com/elixxir/client/cmix/pickup"
+	"gitlab.com/elixxir/client/cmix/rounds"
 	"gitlab.com/elixxir/client/event"
 	"gitlab.com/elixxir/client/stoppable"
 	"gitlab.com/elixxir/client/storage"
@@ -65,7 +65,7 @@ type client struct {
 	message.Handler
 	nodes.Registrar
 	rounds.Retriever
-	rounds.Pickup
+	pickup.Pickup
 	address.Space
 	identity.Tracker
 	health.Monitor
@@ -158,8 +158,8 @@ func NewManager(params Params, comms *commClient.Comms, session storage.Session,
 		c.session.GetReceptionID())
 
 	// Set up round handler
-	c.Pickup = rounds.NewPickup(
-		params.Rounds, c.Handler.GetMessageReceptionChannel(), c.Sender,
+	c.Pickup = pickup.NewPickup(
+		params.Pickup, c.Handler.GetMessageReceptionChannel(), c.Sender,
 		c.Retriever, c.rng, c.instance, c.session)
 
 	// Add the identity system
diff --git a/cmix/params.go b/cmix/params.go
index e334217c5b7dd3e7588ea83c44223275dfd5ef0d..23ce735e8df136fe064ea05fae43114bbdbf9a73 100644
--- a/cmix/params.go
+++ b/cmix/params.go
@@ -3,9 +3,9 @@ package cmix
 import (
 	"encoding/base64"
 	"encoding/json"
-	"gitlab.com/elixxir/client/cmix/rounds"
 	"gitlab.com/elixxir/client/cmix/message"
 	"gitlab.com/elixxir/client/cmix/pickup"
+	"gitlab.com/elixxir/client/cmix/rounds"
 	"gitlab.com/elixxir/client/stoppable"
 	"gitlab.com/elixxir/primitives/excludedRounds"
 	"gitlab.com/xx_network/primitives/id"
@@ -51,6 +51,7 @@ type Params struct {
 	ReplayRequests bool
 
 	Rounds     rounds.Params
+	Pickup     pickup.Params
 	Message    message.Params
 	Historical rounds.Params
 }
@@ -69,6 +70,7 @@ func GetDefaultParams() Params {
 		ReplayRequests:            true,
 	}
 	n.Rounds = rounds.GetDefaultParams()
+	n.Pickup = pickup.GetDefaultParams()
 	n.Message = message.GetDefaultParams()
 	n.Historical = rounds.GetDefaultParams()
 
@@ -81,7 +83,7 @@ func (n Params) Marshal() ([]byte, error) {
 
 func (n Params) SetRealtimeOnlyAll() Params {
 	n.RealtimeOnly = true
-	n.Rounds.RealtimeOnly = true
+	n.Pickup.RealtimeOnly = true
 	n.Message.RealtimeOnly = true
 	return n
 }
diff --git a/cmix/pickup/get.go b/cmix/pickup/get.go
index 9ecee34cb33a1c0ad491cb09beef3be1c4b8ae44..f7a503b1d9fbc360a547f56a877372800db3a545 100644
--- a/cmix/pickup/get.go
+++ b/cmix/pickup/get.go
@@ -5,12 +5,12 @@
 // LICENSE file                                                              //
 ///////////////////////////////////////////////////////////////////////////////
 
-package rounds
+package pickup
 
 import (
 	jww "github.com/spf13/jwalterweatherman"
-	"gitlab.com/elixxir/client/cmix/rounds"
 	"gitlab.com/elixxir/client/cmix/identity/receptionID"
+	"gitlab.com/elixxir/client/cmix/rounds"
 	"gitlab.com/xx_network/primitives/id"
 )
 
diff --git a/cmix/pickup/params.go b/cmix/pickup/params.go
index ab7f956c91fdf7933a20b417e55cb20c82bca456..95200674d0e0e8a791a0236e1a5dc019b4b59225 100644
--- a/cmix/pickup/params.go
+++ b/cmix/pickup/params.go
@@ -1,4 +1,4 @@
-package rounds
+package pickup
 
 import "time"
 
diff --git a/cmix/pickup/pickup.go b/cmix/pickup/pickup.go
index f7653e44d29413084b4d48f598ce8661507cc38a..73706f1fb0a2fcb68b3da0b07c82a9ffa621d0cc 100644
--- a/cmix/pickup/pickup.go
+++ b/cmix/pickup/pickup.go
@@ -5,14 +5,14 @@
 // LICENSE file                                                              //
 ///////////////////////////////////////////////////////////////////////////////
 
-package rounds
+package pickup
 
 import (
 	"gitlab.com/elixxir/client/cmix/gateway"
-	"gitlab.com/elixxir/client/cmix/rounds"
 	"gitlab.com/elixxir/client/cmix/identity/receptionID"
 	"gitlab.com/elixxir/client/cmix/message"
 	"gitlab.com/elixxir/client/cmix/pickup/store"
+	"gitlab.com/elixxir/client/cmix/rounds"
 	"gitlab.com/elixxir/client/stoppable"
 	"gitlab.com/elixxir/client/storage"
 	"gitlab.com/elixxir/crypto/fastRNG"
@@ -66,7 +66,7 @@ func NewPickup(params Params, bundles chan<- message.Bundle,
 
 func (m *pickup) StartProcessors() stoppable.Stoppable {
 
-	multi := stoppable.NewMulti("Rounds")
+	multi := stoppable.NewMulti("Pickup")
 
 	// Start the message retrieval worker pool
 	for i := uint(0); i < m.params.NumMessageRetrievalWorkers; i++ {
diff --git a/cmix/pickup/retrieve.go b/cmix/pickup/retrieve.go
index d6d5889c676c29ff1a9491762014b4ee51c7458b..c66b52092f4951eebe83824b9776678e7a6103b0 100644
--- a/cmix/pickup/retrieve.go
+++ b/cmix/pickup/retrieve.go
@@ -5,16 +5,16 @@
 // LICENSE file                                                              //
 ///////////////////////////////////////////////////////////////////////////////
 
-package rounds
+package pickup
 
 import (
 	"encoding/binary"
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
 	"gitlab.com/elixxir/client/cmix/gateway"
-	"gitlab.com/elixxir/client/cmix/rounds"
 	"gitlab.com/elixxir/client/cmix/identity/receptionID"
 	"gitlab.com/elixxir/client/cmix/message"
+	"gitlab.com/elixxir/client/cmix/rounds"
 	"gitlab.com/elixxir/client/stoppable"
 	pb "gitlab.com/elixxir/comms/mixmessages"
 	"gitlab.com/elixxir/crypto/shuffle"
diff --git a/cmix/pickup/retrieve_test.go b/cmix/pickup/retrieve_test.go
index baacbe18a1cb6c364513064247bc655fa256970c..cf580ec420dfb8d0e3f6a2c62b774f7e5f637479 100644
--- a/cmix/pickup/retrieve_test.go
+++ b/cmix/pickup/retrieve_test.go
@@ -4,14 +4,14 @@
 // Use of this source code is governed by a license that can be found in the //
 // LICENSE file                                                              //
 ///////////////////////////////////////////////////////////////////////////////
-package rounds
+package pickup
 
 import (
 	"bytes"
 	"gitlab.com/elixxir/client/cmix/gateway"
-	"gitlab.com/elixxir/client/cmix/rounds"
 	ephemeral2 "gitlab.com/elixxir/client/cmix/identity/receptionID"
 	"gitlab.com/elixxir/client/cmix/message"
+	"gitlab.com/elixxir/client/cmix/rounds"
 	"gitlab.com/elixxir/client/stoppable"
 	"gitlab.com/elixxir/crypto/fastRNG"
 	"gitlab.com/xx_network/comms/connect"
diff --git a/cmix/pickup/roundGetter.go b/cmix/pickup/roundGetter.go
index a319562a3dbbd2aeafdce1e243139782bb6e7eb9..9f01fa4971fb7a02fa9176bed730c47fa66e2d2f 100644
--- a/cmix/pickup/roundGetter.go
+++ b/cmix/pickup/roundGetter.go
@@ -1,4 +1,4 @@
-package rounds
+package pickup
 
 import (
 	pb "gitlab.com/elixxir/comms/mixmessages"
diff --git a/cmix/pickup/unchecked.go b/cmix/pickup/unchecked.go
index a09909074a62c0ac6b0f5d66a99feca16086f2bf..22afaa5658b79604b1feebadf2a73312b41d952a 100644
--- a/cmix/pickup/unchecked.go
+++ b/cmix/pickup/unchecked.go
@@ -5,7 +5,7 @@
 // LICENSE file                                                              //
 ///////////////////////////////////////////////////////////////////////////////
 
-package rounds
+package pickup
 
 import (
 	jww "github.com/spf13/jwalterweatherman"
diff --git a/cmix/pickup/unchecked_test.go b/cmix/pickup/unchecked_test.go
index 213952c8da85dc8ace613e3d6ce83a0685a95129..339826469fc28b0797788db62e63e4a7f110cb5a 100644
--- a/cmix/pickup/unchecked_test.go
+++ b/cmix/pickup/unchecked_test.go
@@ -5,7 +5,7 @@
 // LICENSE file                                                              //
 ///////////////////////////////////////////////////////////////////////////////
 
-package rounds
+package pickup
 
 import (
 	"gitlab.com/elixxir/client/cmix/gateway"
diff --git a/cmix/pickup/utils_test.go b/cmix/pickup/utils_test.go
index c2c11db7119d7e8e14d10bcbecead29f5a648fd9..d25491d283b2ec59fc17834d8101f193e9f6ff53 100644
--- a/cmix/pickup/utils_test.go
+++ b/cmix/pickup/utils_test.go
@@ -4,7 +4,7 @@
 // Use of this source code is governed by a license that can be found in the //
 // LICENSE file                                                              //
 ///////////////////////////////////////////////////////////////////////////////
-package rounds
+package pickup
 
 import (
 	"github.com/pkg/errors"