diff --git a/crm/repository/module.go b/crm/repository/module.go
index de7807e0d..007832f09 100644
--- a/crm/repository/module.go
+++ b/crm/repository/module.go
@@ -47,7 +47,7 @@ func (r *module) With(ctx context.Context, db *factory.DB) ModuleRepository {
 	}
 }
 
-// @todo: update to accepted DeletedAt column semantics from SAM
+// @todo: update to accepted DeletedAt column semantics from Messaging
 
 func (r *module) FindByID(id uint64) (mod *types.Module, err error) {
 	mod = &types.Module{}
diff --git a/crm/repository/record.go b/crm/repository/record.go
index 86e089218..4723b8314 100644
--- a/crm/repository/record.go
+++ b/crm/repository/record.go
@@ -72,7 +72,7 @@ func (r *record) With(ctx context.Context, db *factory.DB) RecordRepository {
 	}
 }
 
-// @todo: update to accepted DeletedAt column semantics from SAM
+// @todo: update to accepted DeletedAt column semantics from Messaging
 
 func (r *record) FindByID(id uint64) (*types.Record, error) {
 	mod := &types.Record{}
diff --git a/crm/service/main_test.go b/crm/service/main_test.go
index 577fa2abd..db3ec59f4 100644
--- a/crm/service/main_test.go
+++ b/crm/service/main_test.go
@@ -23,7 +23,7 @@ func TestMain(m *testing.M) {
 	// @todo this is a very optimistic initialization, make it more robust
 	godotenv.Load("../../.env")
 
-	prefix := "sam"
+	prefix := "crm"
 	dsn := ""
 
 	p := func(s string) string {