diff --git a/core/module/module.go b/core/module/module.go
index 4641fcb..2a28e62 100644
--- a/core/module/module.go
+++ b/core/module/module.go
@@ -76,7 +76,7 @@ func addMiddleware(ctx context.Context, mgr handler.PluginManager, handler http.
 
 func moduleCtxMiddleware(moduleName string, next http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		ctx := context.WithValue(r.Context(), model.ContextKeyModuleId, moduleName)
+		ctx := context.WithValue(r.Context(), model.ContextKeyModuleID, moduleName)
 		next.ServeHTTP(w, r.WithContext(ctx))
 	})
 }
diff --git a/core/module/module_test.go b/core/module/module_test.go
index 6091fc1..ffeaafe 100644
--- a/core/module/module_test.go
+++ b/core/module/module_test.go
@@ -107,7 +107,7 @@ func TestRegisterSuccess(t *testing.T) {
 	// Create a handler that extracts context
 	var capturedModuleName any
 	testHandler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		capturedModuleName = r.Context().Value(model.ContextKeyModuleId)
+		capturedModuleName = r.Context().Value(model.ContextKeyModuleID)
 		w.WriteHeader(http.StatusOK)
 	})
 
diff --git a/pkg/model/model.go b/pkg/model/model.go
index 1193dee..a91e2a3 100644
--- a/pkg/model/model.go
+++ b/pkg/model/model.go
@@ -16,10 +16,6 @@ type Subscriber struct {
 	Domain       string `json:"domain"`
 }
 
-type ContextKey string
-
-const ContextKeyModuleId ContextKey = "module_id"
-
 // Subscription represents subscription details of a network participant.
 type Subscription struct {
 	Subscriber       `json:",inline"`