diff --git a/internal/http/vault_handler_upload.go b/internal/http/vault_handler_upload.go
index 8026f9d3..c2d7af5e 100644
--- a/internal/http/vault_handler_upload.go
+++ b/internal/http/vault_handler_upload.go
@@ -43,7 +43,7 @@ func (h *VaultHandler) handleUpload(w http.ResponseWriter, r *http.Request) {
 
 	// Boundary UUID validation — Fix B (Phase 1, H9 mitigation).
 	// validateTeamMembership short-circuits on owner role + lite edition (nil teamAccess),
-	// leaving downstream `mustParseUUID(*doc.TeamID)` as a silent-nil trap. Validate at
+	// leaving downstream `parseUUIDOrNil(*doc.TeamID)` as a silent-nil trap. Validate at
 	// the HTTP boundary so bad form input is rejected before any store call or event publish.
 	// See docs/agent-identity-conventions.md.
 	if agentIDStr != "" {
diff --git a/internal/store/pg/agents_export_queries.go b/internal/store/pg/agents_export_queries.go
index 6e62bfd7..c8b56d6f 100644
--- a/internal/store/pg/agents_export_queries.go
+++ b/internal/store/pg/agents_export_queries.go
@@ -309,7 +309,7 @@ func ExportKGEntities(ctx context.Context, db *sql.DB, agentID uuid.UUID) ([]sto
 			break
 		}
 		// Advance cursor: last entity ID
-		lastID := mustParseUUID(batch[len(batch)-1].ID)
+		lastID := parseUUIDOrNil(batch[len(batch)-1].ID)
 		cursor = lastID
 	}
 	return result, nil
@@ -351,7 +351,7 @@ func ExportKGRelations(ctx context.Context, db *sql.DB, agentID uuid.UUID) ([]st
 		if len(batch) < exportBatchSize {
 			break
 		}
-		lastID := mustParseUUID(batch[len(batch)-1].ID)
+		lastID := parseUUIDOrNil(batch[len(batch)-1].ID)
 		cursor = lastID
 	}
 	return result, nil
diff --git a/internal/store/pg/knowledge_graph_embedding.go b/internal/store/pg/knowledge_graph_embedding.go
index 7355012c..72f56824 100644
--- a/internal/store/pg/knowledge_graph_embedding.go
+++ b/internal/store/pg/knowledge_graph_embedding.go
@@ -121,7 +121,7 @@ func (s *PGKnowledgeGraphStore) EmbedEntity(ctx context.Context, entityID, name,
 	vecStr := vectorToString(embeddings[0])
 	if _, err := s.db.ExecContext(ctx,
 		`UPDATE kg_entities SET embedding = $1::vector WHERE id = $2`,
-		vecStr, mustParseUUID(entityID),
+		vecStr, parseUUIDOrNil(entityID),
 	); err != nil {
 		slog.Warn("kg entity embedding failed", "entity_id", entityID, "error", err)
 	}
diff --git a/internal/store/pg/knowledge_graph_temporal.go b/internal/store/pg/knowledge_graph_temporal.go
index 020cab98..e3d456df 100644
--- a/internal/store/pg/knowledge_graph_temporal.go
+++ b/internal/store/pg/knowledge_graph_temporal.go
@@ -12,7 +12,7 @@ import (
 // ListEntitiesTemporal queries entities with temporal awareness.
 // AsOf=nil: current facts only (valid_until IS NULL). AsOf set: facts valid at that time.
 func (s *PGKnowledgeGraphStore) ListEntitiesTemporal(ctx context.Context, agentID, userID string, opts store.EntityListOptions, temporal store.TemporalQueryOptions) ([]store.Entity, error) {
-	aid := mustParseUUID(agentID)
+	aid := parseUUIDOrNil(agentID)
 	limit := opts.Limit
 	if limit <= 0 {
 		limit = 100
diff --git a/internal/store/pg/memory_docs.go b/internal/store/pg/memory_docs.go
index 80207b8e..cdf25db4 100644
--- a/internal/store/pg/memory_docs.go
+++ b/internal/store/pg/memory_docs.go
@@ -505,13 +505,6 @@ func parseUUIDOrNil(s string) uuid.UUID {
 	return id
 }
 
-// mustParseUUID is an alias for parseUUIDOrNil kept during the Phase 4
-// migration window. Will be removed in sub-step 4d (single-commit rename).
-// TODO(Phase 4 4d): remove after all call sites migrate.
-func mustParseUUID(s string) uuid.UUID {
-	return parseUUIDOrNil(s)
-}
-
 func vectorToString(v []float32) string {
 	if len(v) == 0 {
 		return ""
diff --git a/internal/store/pg/parseuuid_test.go b/internal/store/pg/parseuuid_test.go
index 0f6ab5da..290d2da9 100644
--- a/internal/store/pg/parseuuid_test.go
+++ b/internal/store/pg/parseuuid_test.go
@@ -70,15 +70,3 @@ func TestParseUUID_ErrorIsUnwrappable(t *testing.T) {
 	}
 }
 
-// TestMustParseUUID_AliasToParseUUIDOrNil verifies the transitional alias
-// during Phase 4 migration — mustParseUUID must behave identically to
-// parseUUIDOrNil so existing call sites are untouched until rename (4d).
-func TestMustParseUUID_AliasToParseUUIDOrNil(t *testing.T) {
-	u := uuid.New()
-	if mustParseUUID(u.String()) != u {
-		t.Error("mustParseUUID should equal parseUUIDOrNil on valid input")
-	}
-	if mustParseUUID("garbage") != uuid.Nil {
-		t.Error("mustParseUUID should return uuid.Nil on invalid input (parseUUIDOrNil semantics)")
-	}
-}
diff --git a/internal/store/pg/vault_documents.go b/internal/store/pg/vault_documents.go
index fcc13818..86e5d851 100644
--- a/internal/store/pg/vault_documents.go
+++ b/internal/store/pg/vault_documents.go
@@ -21,14 +21,14 @@ func appendTeamFilter(q string, args []any, p int, teamID *string, teamIDs []str
 		ph := make([]string, len(teamIDs))
 		for i, id := range teamIDs {
 			ph[i] = fmt.Sprintf("$%d", p)
-			args = append(args, mustParseUUID(id))
+			args = append(args, parseUUIDOrNil(id))
 			p++
 		}
 		q += " AND (team_id IS NULL OR team_id IN (" + strings.Join(ph, ",") + "))"
 	} else if teamID != nil {
 		if *teamID != "" {
 			q += fmt.Sprintf(" AND team_id = $%d", p)
-			args = append(args, mustParseUUID(*teamID))
+			args = append(args, parseUUIDOrNil(*teamID))
 			p++
 		} else {
 			q += " AND team_id IS NULL"
@@ -495,13 +495,13 @@ func buildSearchTeamFilter(teamID *string, teamIDs []string) searchTeamFilter {
 	if len(teamIDs) > 0 {
 		uuids := make([]uuid.UUID, len(teamIDs))
 		for i, id := range teamIDs {
-			uuids[i] = mustParseUUID(id)
+			uuids[i] = parseUUIDOrNil(id)
 		}
 		return searchTeamFilter{teamIDs: uuids, active: true}
 	}
 	if teamID != nil {
 		if *teamID != "" {
-			t := mustParseUUID(*teamID)
+			t := parseUUIDOrNil(*teamID)
 			return searchTeamFilter{teamID: &t, active: true}
 		}
 		return searchTeamFilter{active: true} // personal-only