diff --git a/grade/internal/domain/artifact/artifact.go b/grade/internal/domain/artifact/artifact.go
index ccc53e6d..392a5bfd 100644
--- a/grade/internal/domain/artifact/artifact.go
+++ b/grade/internal/domain/artifact/artifact.go
@@ -17,8 +17,8 @@ func NewArtifact(
 	description values.Description,
 	url values.Url,
 	competenceIds []competence.TenantCompetenceId,
-	authorIds []member.TenantMemberId,
-	ownerId member.TenantMemberId,
+	authorIds []member.MemberId,
+	ownerId member.MemberId,
 	createdAt time.Time,
 ) (*Artifact, error) {
 	e := events.NewArtifactProposed(
@@ -52,8 +52,8 @@ type Artifact struct {
 	description   values.Description
 	url           values.Url
 	competenceIds []competence.TenantCompetenceId
-	authorIds     []member.TenantMemberId
-	ownerId       member.TenantMemberId
+	authorIds     []member.MemberId
+	ownerId       member.MemberId
 	createdAt     time.Time
 	eventSourced  aggregate.EventSourcedAggregate[aggregate.PersistentDomainEvent]
 }
@@ -65,7 +65,7 @@ func (a Artifact) Id() values.TenantArtifactId {
 // TODO: Use Specification pattern instead?
 // https://enterprisecraftsmanship.com/posts/specification-pattern-always-valid-domain-model/
 
-func (a Artifact) HasAuthor(authorId member.TenantMemberId) bool {
+func (a Artifact) HasAuthor(authorId member.MemberId) bool {
 	for i := range a.authorIds {
 		if a.authorIds[i].Equal(authorId) {
 			return true
@@ -128,8 +128,8 @@ type ArtifactExporterSetter interface {
 	SetDescription(values.Description)
 	SetUrl(values.Url)
 	AddCompetenceId(competence.TenantCompetenceId)
-	AddAuthorId(member.TenantMemberId)
-	SetOwnerId(member.TenantMemberId)
+	AddAuthorId(member.MemberId)
+	SetOwnerId(member.MemberId)
 	SetCreatedAt(time.Time)
 	SetVersion(uint)
 }
diff --git a/grade/internal/domain/artifact/artifact_exporter.go b/grade/internal/domain/artifact/artifact_exporter.go
index fb315e7e..0ef5087f 100644
--- a/grade/internal/domain/artifact/artifact_exporter.go
+++ b/grade/internal/domain/artifact/artifact_exporter.go
@@ -16,8 +16,8 @@ type ArtifactExporter struct {
 	Description   exporters.StringExporter
 	Url           exporters.StringExporter
 	CompetenceIds []competence.TenantCompetenceIdExporter
-	AuthorIds     []member.TenantMemberIdExporter
-	OwnerId       member.TenantMemberIdExporter
+	AuthorIds     []member.MemberIdExporter
+	OwnerId       member.MemberIdExporter
 	CreatedAt     time.Time
 	Version       uint
 }
@@ -48,13 +48,13 @@ func (ex *ArtifactExporter) AddCompetenceId(val competence.TenantCompetenceId) {
 	ex.CompetenceIds = append(ex.CompetenceIds, competenceExporter)
 }
 
-func (ex *ArtifactExporter) AddAuthorId(val member.TenantMemberId) {
-	var authorExporter member.TenantMemberIdExporter
+func (ex *ArtifactExporter) AddAuthorId(val member.MemberId) {
+	var authorExporter member.MemberIdExporter
 	val.Export(&authorExporter)
 	ex.AuthorIds = append(ex.AuthorIds, authorExporter)
 }
 
-func (ex *ArtifactExporter) SetOwnerId(val member.TenantMemberId) {
+func (ex *ArtifactExporter) SetOwnerId(val member.MemberId) {
 	val.Export(&ex.OwnerId)
 }
 
diff --git a/grade/internal/domain/artifact/artifact_faker.go b/grade/internal/domain/artifact/artifact_faker.go
index 6033615f..a5b97da0 100644
--- a/grade/internal/domain/artifact/artifact_faker.go
+++ b/grade/internal/domain/artifact/artifact_faker.go
@@ -57,8 +57,8 @@ func NewArtifactFaker(opts ...ArtifactFakerOption) *ArtifactFaker {
 	f := &ArtifactFaker{
 		Id:              values.NewTenantArtifactIdFaker(),
 		CompetenceIds:   []competenceVal.TenantCompetenceIdFaker{competenceVal.NewTenantCompetenceIdFaker()},
-		AuthorIds:       []memberVal.TenantMemberIdFaker{},
-		OwnerId:         memberVal.NewTenantMemberIdFaker(),
+		AuthorIds:       []memberVal.MemberIdFaker{},
+		OwnerId:         memberVal.NewMemberIdFaker(),
 		MemberFaker:     member.NewMemberFaker(),
 		CompetenceFaker: competence.NewCompetenceFaker(),
 	}
@@ -80,8 +80,8 @@ type ArtifactFaker struct {
 	Description     string
 	Url             string
 	CompetenceIds   []competenceVal.TenantCompetenceIdFaker
-	AuthorIds       []memberVal.TenantMemberIdFaker
-	OwnerId         memberVal.TenantMemberIdFaker
+	AuthorIds       []memberVal.MemberIdFaker
+	OwnerId         memberVal.MemberIdFaker
 	CreatedAt       time.Time
 	Repository      ArtifactRepository
 	MemberFaker     *member.MemberFaker
@@ -100,7 +100,7 @@ func (f *ArtifactFaker) fake() {
 
 func (f *ArtifactFaker) Next() error {
 	f.fake()
-	f.AuthorIds = []memberVal.TenantMemberIdFaker{}
+	f.AuthorIds = []memberVal.MemberIdFaker{}
 	err := f.advanceId()
 	if err != nil {
 		return err
@@ -124,7 +124,7 @@ func (f *ArtifactFaker) advanceId() error {
 	return nil
 }
 
-func (f *ArtifactFaker) AddAuthorId(authorId memberVal.TenantMemberIdFaker) {
+func (f *ArtifactFaker) AddAuthorId(authorId memberVal.MemberIdFaker) {
 	f.AuthorIds = append(f.AuthorIds, authorId)
 }
 
@@ -166,7 +166,7 @@ func (f *ArtifactFaker) Create() (*Artifact, error) {
 		}
 		competenceIds = append(competenceIds, competenceId)
 	}
-	var authorIds []memberVal.TenantMemberId
+	var authorIds []memberVal.MemberId
 	for i := range f.AuthorIds {
 		authorId, err := f.AuthorIds[i].Create()
 		if err != nil {
@@ -202,7 +202,7 @@ func (f *ArtifactFaker) SetMemberId(val uint) {
 	f.CompetenceFaker.SetMemberId(val)
 }
 
-func (f *ArtifactFaker) SetId(id memberVal.TenantMemberIdFaker) {
+func (f *ArtifactFaker) SetId(id memberVal.MemberIdFaker) {
 	f.SetTenantId(id.TenantId)
 	f.SetMemberId(id.MemberId)
 }
diff --git a/grade/internal/domain/artifact/artifact_reconstitutor.go b/grade/internal/domain/artifact/artifact_reconstitutor.go
index 3357b12b..2cb80c4f 100644
--- a/grade/internal/domain/artifact/artifact_reconstitutor.go
+++ b/grade/internal/domain/artifact/artifact_reconstitutor.go
@@ -37,8 +37,8 @@ type ArtifactSnapshotReconstitutor struct {
 	Description   string
 	Url           string
 	CompetenceIds []competenceVal.TenantCompetenceIdReconstitutor
-	AuthorIds     []memberVal.TenantMemberIdReconstitutor
-	OwnerId       memberVal.TenantMemberIdReconstitutor
+	AuthorIds     []memberVal.MemberIdReconstitutor
+	OwnerId       memberVal.MemberIdReconstitutor
 	CreatedAt     time.Time
 	Version       uint
 }
@@ -72,7 +72,7 @@ func (r ArtifactSnapshotReconstitutor) Reconstitute() (*Artifact, error) {
 		}
 		competenceIds = append(competenceIds, competenceId)
 	}
-	authorIds := []memberVal.TenantMemberId{}
+	authorIds := []memberVal.MemberId{}
 	for i := range r.AuthorIds {
 		authorId, err := r.AuthorIds[i].Reconstitute()
 		if err != nil {
diff --git a/grade/internal/domain/artifact/artifact_test.go b/grade/internal/domain/artifact/artifact_test.go
index 039667c3..1455ae70 100644
--- a/grade/internal/domain/artifact/artifact_test.go
+++ b/grade/internal/domain/artifact/artifact_test.go
@@ -32,7 +32,7 @@ func TestArtifactExport(t *testing.T) {
 				f.CompetenceIds[0].CompetenceId,
 			),
 		},
-		OwnerId:   member.NewTenantMemberIdExporter(f.OwnerId.TenantId, f.OwnerId.MemberId),
+		OwnerId:   member.NewMemberIdExporter(f.OwnerId.TenantId, f.OwnerId.MemberId),
 		CreatedAt: f.CreatedAt,
 		Version:   1,
 	}, actualExporter)
diff --git a/grade/internal/domain/artifact/events/artifact_proposed.go b/grade/internal/domain/artifact/events/artifact_proposed.go
index 4d52bb91..f83c7468 100644
--- a/grade/internal/domain/artifact/events/artifact_proposed.go
+++ b/grade/internal/domain/artifact/events/artifact_proposed.go
@@ -16,8 +16,8 @@ func NewArtifactProposed(
 	description values.Description,
 	url values.Url,
 	competenceIds []competence.TenantCompetenceId,
-	authorIds []member.TenantMemberId,
-	ownerId member.TenantMemberId,
+	authorIds []member.MemberId,
+	ownerId member.MemberId,
 	createdAt time.Time,
 ) *ArtifactProposed {
 	return &ArtifactProposed{
@@ -40,8 +40,8 @@ type ArtifactProposed struct {
 	description      values.Description
 	url              values.Url
 	competenceIds    []competence.TenantCompetenceId
-	authorIds        []member.TenantMemberId
-	ownerId          member.TenantMemberId
+	authorIds        []member.MemberId
+	ownerId          member.MemberId
 	createdAt        time.Time
 	aggregateVersion uint
 	eventMeta        aggregate.EventMeta
@@ -71,11 +71,11 @@ func (e ArtifactProposed) CompetenceIds() []competence.TenantCompetenceId {
 	return e.competenceIds
 }
 
-func (e ArtifactProposed) AuthorIds() []member.TenantMemberId {
+func (e ArtifactProposed) AuthorIds() []member.MemberId {
 	return e.authorIds
 }
 
-func (e ArtifactProposed) OwnerId() member.TenantMemberId {
+func (e ArtifactProposed) OwnerId() member.MemberId {
 	return e.ownerId
 }
 
@@ -137,7 +137,7 @@ type ArtifactProposedExporterSetter interface {
 	SetDescription(values.Description)
 	SetUrl(values.Url)
 	AddCompetenceId(competence.TenantCompetenceId)
-	AddAuthorId(member.TenantMemberId)
-	SetOwnerId(member.TenantMemberId)
+	AddAuthorId(member.MemberId)
+	SetOwnerId(member.MemberId)
 	SetCreatedAt(time.Time)
 }
diff --git a/grade/internal/domain/artifact/events/artifact_proposed_reconstitutor.go b/grade/internal/domain/artifact/events/artifact_proposed_reconstitutor.go
index 65c9f21d..56e1212f 100644
--- a/grade/internal/domain/artifact/events/artifact_proposed_reconstitutor.go
+++ b/grade/internal/domain/artifact/events/artifact_proposed_reconstitutor.go
@@ -16,8 +16,8 @@ type ArtifactProposedReconstitutor struct {
 	Description      string
 	Url              string
 	CompetenceIds    []competenceVal.TenantCompetenceIdReconstitutor
-	AuthorIds        []memberVal.TenantMemberIdReconstitutor
-	OwnerId          memberVal.TenantMemberIdReconstitutor
+	AuthorIds        []memberVal.MemberIdReconstitutor
+	OwnerId          memberVal.MemberIdReconstitutor
 	CreatedAt        time.Time
 	AggregateVersion uint
 	EventMeta        aggregate.EventMetaReconstitutor
@@ -52,7 +52,7 @@ func (r ArtifactProposedReconstitutor) Reconstitute() (*ArtifactProposed, error)
 		}
 		competenceIds = append(competenceIds, competenceId)
 	}
-	authorIds := []memberVal.TenantMemberId{}
+	authorIds := []memberVal.MemberId{}
 	for i := range r.AuthorIds {
 		authorId, err := r.AuthorIds[i].Reconstitute()
 		if err != nil {
diff --git a/grade/internal/domain/competence/competence.go b/grade/internal/domain/competence/competence.go
index d6a94227..18867066 100644
--- a/grade/internal/domain/competence/competence.go
+++ b/grade/internal/domain/competence/competence.go
@@ -12,7 +12,7 @@ import (
 func NewCompetence(
 	id values.TenantCompetenceId,
 	name values.Name,
-	ownerId member.TenantMemberId,
+	ownerId member.MemberId,
 	createdAt time.Time,
 ) (*Competence, error) {
 	agg := &Competence{
@@ -35,7 +35,7 @@ func NewCompetence(
 type Competence struct {
 	id        values.TenantCompetenceId
 	name      values.Name
-	ownerId   member.TenantMemberId
+	ownerId   member.MemberId
 	createdAt time.Time
 	eventive  aggregate.EventiveEntity[aggregate.DomainEvent]
 	aggregate.VersionedAggregate
@@ -71,7 +71,7 @@ func (c Competence) Export(ex CompetenceExporterSetter) {
 type CompetenceExporterSetter interface {
 	SetId(id values.TenantCompetenceId)
 	SetName(values.Name)
-	SetOwnerId(member.TenantMemberId)
+	SetOwnerId(member.MemberId)
 	SetCreatedAt(time.Time)
 	SetVersion(uint)
 }
diff --git a/grade/internal/domain/competence/competence_exporter.go b/grade/internal/domain/competence/competence_exporter.go
index 5ce4e773..c785e044 100644
--- a/grade/internal/domain/competence/competence_exporter.go
+++ b/grade/internal/domain/competence/competence_exporter.go
@@ -11,7 +11,7 @@ import (
 type CompetenceExporter struct {
 	Id        values.TenantCompetenceIdExporter
 	Name      exporters.StringExporter
-	OwnerId   member.TenantMemberIdExporter
+	OwnerId   member.MemberIdExporter
 	CreatedAt time.Time
 	Version   uint
 }
@@ -24,7 +24,7 @@ func (ex *CompetenceExporter) SetName(val values.Name) {
 	val.Export(&ex.Name)
 }
 
-func (ex *CompetenceExporter) SetOwnerId(val member.TenantMemberId) {
+func (ex *CompetenceExporter) SetOwnerId(val member.MemberId) {
 	val.Export(&ex.OwnerId)
 }
 
diff --git a/grade/internal/domain/competence/competence_faker.go b/grade/internal/domain/competence/competence_faker.go
index 371d8979..053b4257 100644
--- a/grade/internal/domain/competence/competence_faker.go
+++ b/grade/internal/domain/competence/competence_faker.go
@@ -39,7 +39,7 @@ func WithMemberFaker(memberFaker *member.MemberFaker) CompetenceFakerOption {
 func NewCompetenceFaker(opts ...CompetenceFakerOption) *CompetenceFaker {
 	f := &CompetenceFaker{
 		Id:          values.NewTenantCompetenceIdFaker(),
-		OwnerId:     memberVal.NewTenantMemberIdFaker(),
+		OwnerId:     memberVal.NewMemberIdFaker(),
 		Repository:  CompetenceDummyRepository{},
 		MemberFaker: member.NewMemberFaker(),
 	}
@@ -53,7 +53,7 @@ func NewCompetenceFaker(opts ...CompetenceFakerOption) *CompetenceFaker {
 type CompetenceFaker struct {
 	Id          values.TenantCompetenceIdFaker
 	Name        string
-	OwnerId     memberVal.TenantMemberIdFaker
+	OwnerId     memberVal.MemberIdFaker
 	CreatedAt   time.Time
 	Repository  CompetenceRepository
 	MemberFaker *member.MemberFaker
@@ -116,7 +116,7 @@ func (f *CompetenceFaker) SetMemberId(val uint) {
 	f.MemberFaker.SetMemberId(val)
 }
 
-func (f *CompetenceFaker) SetId(id memberVal.TenantMemberIdFaker) {
+func (f *CompetenceFaker) SetId(id memberVal.MemberIdFaker) {
 	f.SetTenantId(id.TenantId)
 	f.SetMemberId(id.MemberId)
 }
diff --git a/grade/internal/domain/competence/competence_reconstitutor.go b/grade/internal/domain/competence/competence_reconstitutor.go
index bcb8057c..9c11229b 100644
--- a/grade/internal/domain/competence/competence_reconstitutor.go
+++ b/grade/internal/domain/competence/competence_reconstitutor.go
@@ -11,7 +11,7 @@ import (
 type CompetenceReconstitutor struct {
 	Id        values.TenantCompetenceIdReconstitutor
 	Name      string
-	OwnerId   member.TenantMemberIdReconstitutor
+	OwnerId   member.MemberIdReconstitutor
 	CreatedAt time.Time
 	Version   uint
 }
diff --git a/grade/internal/domain/competence/competence_test.go b/grade/internal/domain/competence/competence_test.go
index a9873226..a6d0a4a6 100644
--- a/grade/internal/domain/competence/competence_test.go
+++ b/grade/internal/domain/competence/competence_test.go
@@ -22,7 +22,7 @@ func TestCompetenceExport(t *testing.T) {
 	assert.Equal(t, CompetenceExporter{
 		Id:        values.NewTenantCompetenceIdExporter(f.Id.TenantId, f.Id.CompetenceId),
 		Name:      exporters.StringExporter(f.Name),
-		OwnerId:   member.NewTenantMemberIdExporter(f.OwnerId.TenantId, f.OwnerId.MemberId),
+		OwnerId:   member.NewMemberIdExporter(f.OwnerId.TenantId, f.OwnerId.MemberId),
 		CreatedAt: f.CreatedAt,
 		Version:   1,
 	}, actualExporter)
diff --git a/grade/internal/domain/competence/events/competence_created.go b/grade/internal/domain/competence/events/competence_created.go
index 5919a032..1f1a2f16 100644
--- a/grade/internal/domain/competence/events/competence_created.go
+++ b/grade/internal/domain/competence/events/competence_created.go
@@ -10,7 +10,7 @@ import (
 func NewCompetenceCreated(
 	id values.TenantCompetenceId,
 	name values.Name,
-	ownerId memberVal.TenantMemberId,
+	ownerId memberVal.MemberId,
 	createdAt time.Time,
 ) *CompetenceCreated {
 	return &CompetenceCreated{
@@ -24,7 +24,7 @@ func NewCompetenceCreated(
 type CompetenceCreated struct {
 	id               values.TenantCompetenceId
 	name             values.Name
-	ownerId          memberVal.TenantMemberId
+	ownerId          memberVal.MemberId
 	createdAt        time.Time
 	aggregateVersion uint
 }
@@ -57,7 +57,7 @@ func (e CompetenceCreated) Export(ex CompetenceCreatedExporterSetter) {
 type CompetenceCreatedExporterSetter interface {
 	SetId(id values.TenantCompetenceId)
 	SetName(values.Name)
-	SetOwnerId(memberVal.TenantMemberId)
+	SetOwnerId(memberVal.MemberId)
 	SetCreatedAt(time.Time)
 	SetEventType(string)
 	SetAggregateVersion(uint)
diff --git a/grade/internal/domain/endorser/endorser.go b/grade/internal/domain/endorser/endorser.go
index 5198c4ee..bb87e680 100644
--- a/grade/internal/domain/endorser/endorser.go
+++ b/grade/internal/domain/endorser/endorser.go
@@ -19,7 +19,7 @@ var (
 // FIXME: Move this constructor to tenant aggregate
 
 func NewEndorser(
-	id member.TenantMemberId,
+	id member.MemberId,
 	createdAt time.Time,
 ) (*Endorser, error) {
 	availableCount, err := values.NewEndorsementCount(values.YearlyEndorsementCount)
@@ -49,7 +49,7 @@ func NewEndorser(
 // to track grade by version?
 
 type Endorser struct { // TODO: rename to Recognitory | Endorser | Originator | Sender (to Receiver)
-	id                        member.TenantMemberId
+	id                        member.MemberId
 	grade                     grade.Grade
 	availableEndorsementCount values.EndorsementCount
 	pendingEndorsementCount   values.EndorsementCount
@@ -58,7 +58,7 @@ type Endorser struct { // TODO: rename to Recognitory | Endorser | Originator |
 	aggregate.VersionedAggregate
 }
 
-func (e Endorser) Id() member.TenantMemberId {
+func (e Endorser) Id() member.MemberId {
 	return e.id
 }
 
@@ -139,7 +139,7 @@ func (e Endorser) Export(ex EndorserExporterSetter) {
 }
 
 type EndorserExporterSetter interface {
-	SetId(member.TenantMemberId)
+	SetId(member.MemberId)
 	SetGrade(grade.Grade)
 	SetAvailableEndorsementCount(values.EndorsementCount)
 	SetPendingEndorsementCount(values.EndorsementCount)
diff --git a/grade/internal/domain/endorser/endorser_exporter.go b/grade/internal/domain/endorser/endorser_exporter.go
index b4b83862..bb4fda13 100644
--- a/grade/internal/domain/endorser/endorser_exporter.go
+++ b/grade/internal/domain/endorser/endorser_exporter.go
@@ -10,7 +10,7 @@ import (
 )
 
 type EndorserExporter struct {
-	Id                        member.TenantMemberIdExporter
+	Id                        member.MemberIdExporter
 	Grade                     exporters.Uint8Exporter
 	AvailableEndorsementCount exporters.UintExporter
 	PendingEndorsementCount   exporters.UintExporter
@@ -18,7 +18,7 @@ type EndorserExporter struct {
 	Version                   uint
 }
 
-func (ex *EndorserExporter) SetId(val member.TenantMemberId) {
+func (ex *EndorserExporter) SetId(val member.MemberId) {
 	val.Export(&ex.Id)
 }
 
diff --git a/grade/internal/domain/endorser/endorser_faker.go b/grade/internal/domain/endorser/endorser_faker.go
index 3170462c..1d543193 100644
--- a/grade/internal/domain/endorser/endorser_faker.go
+++ b/grade/internal/domain/endorser/endorser_faker.go
@@ -38,7 +38,7 @@ func WithMemberFaker(memberFaker *member.MemberFaker) EndorserFakerOption {
 
 func NewEndorserFaker(opts ...EndorserFakerOption) *EndorserFaker {
 	f := &EndorserFaker{
-		Id:          memberVal.NewTenantMemberIdFaker(),
+		Id:          memberVal.NewMemberIdFaker(),
 		Repository:  EndorserDummyRepository{},
 		MemberFaker: member.NewMemberFaker(),
 	}
@@ -51,7 +51,7 @@ func NewEndorserFaker(opts ...EndorserFakerOption) *EndorserFaker {
 }
 
 type EndorserFaker struct {
-	Id          memberVal.TenantMemberIdFaker
+	Id          memberVal.MemberIdFaker
 	Grade       uint8
 	CreatedAt   time.Time
 	Repository  EndorserRepository
@@ -113,7 +113,7 @@ func (f *EndorserFaker) SetMemberId(val uint) {
 	f.MemberFaker.SetMemberId(val)
 }
 
-func (f *EndorserFaker) SetId(id memberVal.TenantMemberIdFaker) {
+func (f *EndorserFaker) SetId(id memberVal.MemberIdFaker) {
 	f.SetTenantId(id.TenantId)
 	f.SetMemberId(id.MemberId)
 }
diff --git a/grade/internal/domain/endorser/endorser_reconstitutor.go b/grade/internal/domain/endorser/endorser_reconstitutor.go
index 78734fce..65624c41 100644
--- a/grade/internal/domain/endorser/endorser_reconstitutor.go
+++ b/grade/internal/domain/endorser/endorser_reconstitutor.go
@@ -10,7 +10,7 @@ import (
 )
 
 type EndorserReconstitutor struct {
-	Id                        member.TenantMemberIdReconstitutor
+	Id                        member.MemberIdReconstitutor
 	Grade                     uint8
 	AvailableEndorsementCount uint
 	PendingEndorsementCount   uint
diff --git a/grade/internal/domain/endorser/endorser_test.go b/grade/internal/domain/endorser/endorser_test.go
index 2b3fe2cb..9b9d7581 100644
--- a/grade/internal/domain/endorser/endorser_test.go
+++ b/grade/internal/domain/endorser/endorser_test.go
@@ -76,7 +76,7 @@ func TestEndorserExport(t *testing.T) {
 	}
 	agg.Export(&actualExporter)
 	assert.Equal(t, EndorserExporter{
-		Id:                        member.NewTenantMemberIdExporter(f.Id.TenantId, f.Id.MemberId),
+		Id:                        member.NewMemberIdExporter(f.Id.TenantId, f.Id.MemberId),
 		Grade:                     exporters.Uint8Exporter(f.Grade),
 		AvailableEndorsementCount: exporters.UintExporter(values.YearlyEndorsementCount),
 		PendingEndorsementCount:   exporters.UintExporter(0),
diff --git a/grade/internal/domain/member/member.go b/grade/internal/domain/member/member.go
index 36d05dbb..2c2ceb5b 100644
--- a/grade/internal/domain/member/member.go
+++ b/grade/internal/domain/member/member.go
@@ -8,7 +8,7 @@ import (
 )
 
 func NewMember(
-	id values.TenantMemberId,
+	id values.MemberId,
 	status values.Status,
 	fullName values.FullName,
 	createdAt time.Time,
@@ -22,7 +22,7 @@ func NewMember(
 }
 
 type Member struct {
-	id        values.TenantMemberId
+	id        values.MemberId
 	status    values.Status
 	fullName  values.FullName
 	createdAt time.Time
@@ -30,7 +30,7 @@ type Member struct {
 	aggregate.VersionedAggregate
 }
 
-func (m Member) Id() values.TenantMemberId {
+func (m Member) Id() values.MemberId {
 	return m.id
 }
 
@@ -51,7 +51,7 @@ func (m Member) Export(ex MemberExporterSetter) {
 }
 
 type MemberExporterSetter interface {
-	SetId(id values.TenantMemberId)
+	SetId(id values.MemberId)
 	SetStatus(values.Status)
 	SetFullName(values.FullName)
 	SetCreatedAt(time.Time)
diff --git a/grade/internal/domain/member/member_exporter.go b/grade/internal/domain/member/member_exporter.go
index d71130f8..ac224133 100644
--- a/grade/internal/domain/member/member_exporter.go
+++ b/grade/internal/domain/member/member_exporter.go
@@ -8,14 +8,14 @@ import (
 )
 
 type MemberExporter struct {
-	Id        values.TenantMemberIdExporter
+	Id        values.MemberIdExporter
 	Status    exporters.Uint8Exporter
 	FullName  values.FullNameExporter
 	CreatedAt time.Time
 	Version   uint
 }
 
-func (ex *MemberExporter) SetId(val values.TenantMemberId) {
+func (ex *MemberExporter) SetId(val values.MemberId) {
 	val.Export(&ex.Id)
 }
 
diff --git a/grade/internal/domain/member/member_faker.go b/grade/internal/domain/member/member_faker.go
index 93d5905e..5ff34d00 100644
--- a/grade/internal/domain/member/member_faker.go
+++ b/grade/internal/domain/member/member_faker.go
@@ -35,7 +35,7 @@ func WithTenantFaker(tenantFaker *tenant.TenantFaker) MemberFakerOption {
 
 func NewMemberFaker(opts ...MemberFakerOption) *MemberFaker {
 	f := &MemberFaker{
-		Id:          values.NewTenantMemberIdFaker(),
+		Id:          values.NewMemberIdFaker(),
 		Repository:  &MemberDummyRepository{},
 		TenantFaker: tenant.NewTenantFaker(),
 	}
@@ -47,7 +47,7 @@ func NewMemberFaker(opts ...MemberFakerOption) *MemberFaker {
 }
 
 type MemberFaker struct {
-	Id        values.TenantMemberIdFaker
+	Id        values.MemberIdFaker
 	Status    values.Status
 	FullName  values.FullNameFaker
 	CreatedAt time.Time
@@ -108,7 +108,7 @@ func (f *MemberFaker) SetMemberId(val uint) {
 	f.Id.MemberId = val
 }
 
-func (f *MemberFaker) SetId(id values.TenantMemberIdFaker) {
+func (f *MemberFaker) SetId(id values.MemberIdFaker) {
 	f.SetTenantId(id.TenantId)
 	f.SetMemberId(id.MemberId)
 }
diff --git a/grade/internal/domain/member/member_reconstitutor.go b/grade/internal/domain/member/member_reconstitutor.go
index 6d887c48..3d80738e 100644
--- a/grade/internal/domain/member/member_reconstitutor.go
+++ b/grade/internal/domain/member/member_reconstitutor.go
@@ -8,7 +8,7 @@ import (
 )
 
 type MemberReconstitutor struct {
-	Id        values.TenantMemberIdReconstitutor
+	Id        values.MemberIdReconstitutor
 	Status    uint8
 	FullName  values.FullNameReconstitutor
 	CreatedAt time.Time
diff --git a/grade/internal/domain/member/member_test.go b/grade/internal/domain/member/member_test.go
index 7e2454f8..07c028c2 100644
--- a/grade/internal/domain/member/member_test.go
+++ b/grade/internal/domain/member/member_test.go
@@ -17,7 +17,7 @@ func TestMemberExport(t *testing.T) {
 	require.NoError(t, err)
 	agg.Export(&actualExporter)
 	assert.Equal(t, MemberExporter{
-		Id:     values.NewTenantMemberIdExporter(f.Id.TenantId, f.Id.MemberId),
+		Id:     values.NewMemberIdExporter(f.Id.TenantId, f.Id.MemberId),
 		Status: exporters.Uint8Exporter(f.Status),
 		FullName: values.FullNameExporter{
 			FirstName: exporters.StringExporter(f.FullName.FirstName),
diff --git a/grade/internal/domain/member/values/internal_member_id.go b/grade/internal/domain/member/values/internal_member_id.go
new file mode 100644
index 00000000..be30eea0
--- /dev/null
+++ b/grade/internal/domain/member/values/internal_member_id.go
@@ -0,0 +1,21 @@
+package values
+
+import (
+	"github.com/emacsway/grade/grade/internal/domain/seedwork/identity"
+)
+
+func NewInternalMemberId(value uint) (InternalMemberId, error) {
+	id, err := identity.NewIntIdentity(value)
+	if err != nil {
+		return InternalMemberId{}, err
+	}
+	return InternalMemberId{&id}, nil
+}
+
+func NewTransientInternalMemberId() InternalMemberId {
+	return InternalMemberId{}
+}
+
+type InternalMemberId struct {
+	*identity.IntIdentity
+}
diff --git a/grade/internal/domain/member/values/internal_member_id_test.go b/grade/internal/domain/member/values/internal_member_id_test.go
new file mode 100644
index 00000000..0168170b
--- /dev/null
+++ b/grade/internal/domain/member/values/internal_member_id_test.go
@@ -0,0 +1,17 @@
+package values
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestInternalMemberIdConstructor(t *testing.T) {
+	val := uint(3)
+	id, err := NewInternalMemberId(val)
+	if err != nil {
+		t.Error(err)
+		t.FailNow()
+	}
+	assert.Equal(t, val, id.Value())
+}
diff --git a/grade/internal/domain/member/values/member_id.go b/grade/internal/domain/member/values/member_id.go
index 898e4ec7..2ae5a9d6 100644
--- a/grade/internal/domain/member/values/member_id.go
+++ b/grade/internal/domain/member/values/member_id.go
@@ -1,21 +1,64 @@
 package values
 
 import (
-	"github.com/emacsway/grade/grade/internal/domain/seedwork/identity"
+	"github.com/emacsway/grade/grade/internal/domain/seedwork/specification"
+	tenant "github.com/emacsway/grade/grade/internal/domain/tenant/values"
 )
 
-func NewMemberId(value uint) (MemberId, error) {
-	id, err := identity.NewIntIdentity(value)
+func NewMemberId(tenantId, memberId uint) (MemberId, error) {
+	tId, err := tenant.NewTenantId(tenantId)
 	if err != nil {
 		return MemberId{}, err
 	}
-	return MemberId{&id}, nil
+	mId, err := NewInternalMemberId(memberId)
+	if err != nil {
+		return MemberId{}, err
+	}
+	return MemberId{
+		tenantId: tId,
+		memberId: mId,
+	}, nil
 }
 
-func NewTransientMemberId() MemberId {
-	return MemberId{}
+func NewTransientMemberId(tenantId uint) (MemberId, error) {
+	tId, err := tenant.NewTenantId(tenantId)
+	if err != nil {
+		return MemberId{}, err
+	}
+	mId := NewTransientInternalMemberId()
+	return MemberId{
+		tenantId: tId,
+		memberId: mId,
+	}, nil
 }
 
 type MemberId struct {
-	*identity.IntIdentity
+	tenantId tenant.TenantId
+	memberId InternalMemberId
+}
+
+func (cid MemberId) TenantId() tenant.TenantId {
+	return cid.tenantId
+}
+
+func (cid MemberId) MemberId() InternalMemberId {
+	return cid.memberId
+}
+
+func (cid MemberId) Equal(other specification.EqualOperand) bool {
+	otherTyped, ok := other.(MemberId)
+	if !ok {
+		return false
+	}
+	return cid.tenantId.Equal(otherTyped.TenantId()) && cid.memberId.Equal(otherTyped.MemberId())
+}
+
+func (cid MemberId) Export(ex TenantMemberIdExporterSetter) {
+	ex.SetTenantId(cid.tenantId)
+	ex.SetMemberId(cid.memberId)
+}
+
+type TenantMemberIdExporterSetter interface {
+	SetTenantId(tenant.TenantId)
+	SetMemberId(InternalMemberId)
 }
diff --git a/grade/internal/domain/member/values/tenant_member_id_exporter.go b/grade/internal/domain/member/values/member_id_exporter.go
similarity index 58%
rename from grade/internal/domain/member/values/tenant_member_id_exporter.go
rename to grade/internal/domain/member/values/member_id_exporter.go
index 1bf19d40..dcc5fc17 100644
--- a/grade/internal/domain/member/values/tenant_member_id_exporter.go
+++ b/grade/internal/domain/member/values/member_id_exporter.go
@@ -5,22 +5,22 @@ import (
 	tenant "github.com/emacsway/grade/grade/internal/domain/tenant/values"
 )
 
-func NewTenantMemberIdExporter(tenantId, memberId uint) TenantMemberIdExporter {
-	return TenantMemberIdExporter{
+func NewMemberIdExporter(tenantId, memberId uint) MemberIdExporter {
+	return MemberIdExporter{
 		TenantId: exporters.UintExporter(tenantId),
 		MemberId: exporters.UintExporter(memberId),
 	}
 }
 
-type TenantMemberIdExporter struct {
+type MemberIdExporter struct {
 	TenantId exporters.UintExporter
 	MemberId exporters.UintExporter
 }
 
-func (ex *TenantMemberIdExporter) SetTenantId(val tenant.TenantId) {
+func (ex *MemberIdExporter) SetTenantId(val tenant.TenantId) {
 	val.Export(&ex.TenantId)
 }
 
-func (ex *TenantMemberIdExporter) SetMemberId(val MemberId) {
+func (ex *MemberIdExporter) SetMemberId(val InternalMemberId) {
 	val.Export(&ex.MemberId)
 }
diff --git a/grade/internal/domain/member/values/member_id_faker.go b/grade/internal/domain/member/values/member_id_faker.go
new file mode 100644
index 00000000..cad2ee99
--- /dev/null
+++ b/grade/internal/domain/member/values/member_id_faker.go
@@ -0,0 +1,45 @@
+package values
+
+import (
+	tenant "github.com/emacsway/grade/grade/internal/domain/tenant/values"
+)
+
+type MemberIdFakerOption func(*MemberIdFaker)
+
+func WithTenantId(tenantId uint) MemberIdFakerOption {
+	return func(f *MemberIdFaker) {
+		f.TenantId = tenantId
+	}
+}
+
+func WithTransientId() MemberIdFakerOption {
+	return func(f *MemberIdFaker) {
+		f.MemberId = 0
+	}
+}
+
+var MemberIdFakeValue = uint(3)
+
+func NewMemberIdFaker(opts ...MemberIdFakerOption) MemberIdFaker {
+	f := MemberIdFaker{
+		TenantId: tenant.TenantIdFakeValue,
+		MemberId: MemberIdFakeValue,
+	}
+	for _, opt := range opts {
+		opt(&f)
+	}
+	return f
+}
+
+type MemberIdFaker struct {
+	TenantId uint
+	MemberId uint
+}
+
+func (f *MemberIdFaker) NextMemberId() {
+	f.MemberId += 1
+}
+
+func (f MemberIdFaker) Create() (MemberId, error) {
+	return NewMemberId(f.TenantId, f.MemberId)
+}
diff --git a/grade/internal/domain/member/values/member_id_reconstitutor.go b/grade/internal/domain/member/values/member_id_reconstitutor.go
new file mode 100644
index 00000000..c860efcd
--- /dev/null
+++ b/grade/internal/domain/member/values/member_id_reconstitutor.go
@@ -0,0 +1,10 @@
+package values
+
+type MemberIdReconstitutor struct {
+	TenantId uint
+	MemberId uint
+}
+
+func (r MemberIdReconstitutor) Reconstitute() (MemberId, error) {
+	return NewMemberId(r.TenantId, r.MemberId)
+}
diff --git a/grade/internal/domain/member/values/member_id_test.go b/grade/internal/domain/member/values/member_id_test.go
index bfd5cf66..f2603580 100644
--- a/grade/internal/domain/member/values/member_id_test.go
+++ b/grade/internal/domain/member/values/member_id_test.go
@@ -1,17 +1,61 @@
 package values
 
 import (
+	"fmt"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+
+	"github.com/emacsway/grade/grade/internal/domain/seedwork/exporters"
 )
 
-func TestMemberIdConstructor(t *testing.T) {
-	val := uint(3)
-	id, err := NewMemberId(val)
+func TestMemberIdEqual(t *testing.T) {
+	t1 := uint(10)
+	m1 := uint(3)
+	t2 := uint(11)
+	m2 := uint(4)
+	cases := []struct {
+		TenantId       uint
+		MemberId       uint
+		OtherTenantId  uint
+		OtherMemberId  uint
+		ExpectedResult bool
+	}{
+		{t1, m2, t1, m2, true},
+		{t1, m1, t1, m2, false},
+		{t2, m2, t1, m2, false},
+		{t1, m2, t1, m1, false},
+		{t1, m2, t2, m2, false},
+	}
+	for i, c := range cases {
+		t.Run(fmt.Sprintf("Case %d", i), func(t *testing.T) {
+			id, err := NewMemberId(c.TenantId, c.MemberId)
+			if err != nil {
+				t.Error(err)
+				t.FailNow()
+			}
+			otherId, err := NewMemberId(c.OtherTenantId, c.OtherMemberId)
+			if err != nil {
+				t.Error(err)
+				t.FailNow()
+			}
+			r := id.Equal(otherId)
+			assert.Equal(t, c.ExpectedResult, r)
+		})
+	}
+}
+
+func TestMemberIdExport(t *testing.T) {
+	var actualExporter MemberIdExporter
+	f := NewMemberIdFaker()
+	cid, err := f.Create()
 	if err != nil {
 		t.Error(err)
 		t.FailNow()
 	}
-	assert.Equal(t, val, id.Value())
+	cid.Export(&actualExporter)
+	assert.Equal(t, MemberIdExporter{
+		TenantId: exporters.UintExporter(f.TenantId),
+		MemberId: exporters.UintExporter(f.MemberId),
+	}, actualExporter)
 }
diff --git a/grade/internal/domain/member/values/tenant_member_id.go b/grade/internal/domain/member/values/tenant_member_id.go
deleted file mode 100644
index 5dde8998..00000000
--- a/grade/internal/domain/member/values/tenant_member_id.go
+++ /dev/null
@@ -1,64 +0,0 @@
-package values
-
-import (
-	"github.com/emacsway/grade/grade/internal/domain/seedwork/specification"
-	tenant "github.com/emacsway/grade/grade/internal/domain/tenant/values"
-)
-
-func NewTenantMemberId(tenantId, memberId uint) (TenantMemberId, error) {
-	tId, err := tenant.NewTenantId(tenantId)
-	if err != nil {
-		return TenantMemberId{}, err
-	}
-	mId, err := NewMemberId(memberId)
-	if err != nil {
-		return TenantMemberId{}, err
-	}
-	return TenantMemberId{
-		tenantId: tId,
-		memberId: mId,
-	}, nil
-}
-
-func NewTransientTenantMemberId(tenantId uint) (TenantMemberId, error) {
-	tId, err := tenant.NewTenantId(tenantId)
-	if err != nil {
-		return TenantMemberId{}, err
-	}
-	mId := NewTransientMemberId()
-	return TenantMemberId{
-		tenantId: tId,
-		memberId: mId,
-	}, nil
-}
-
-type TenantMemberId struct {
-	tenantId tenant.TenantId
-	memberId MemberId
-}
-
-func (cid TenantMemberId) TenantId() tenant.TenantId {
-	return cid.tenantId
-}
-
-func (cid TenantMemberId) MemberId() MemberId {
-	return cid.memberId
-}
-
-func (cid TenantMemberId) Equal(other specification.EqualOperand) bool {
-	otherTyped, ok := other.(TenantMemberId)
-	if !ok {
-		return false
-	}
-	return cid.tenantId.Equal(otherTyped.TenantId()) && cid.memberId.Equal(otherTyped.MemberId())
-}
-
-func (cid TenantMemberId) Export(ex TenantMemberIdExporterSetter) {
-	ex.SetTenantId(cid.tenantId)
-	ex.SetMemberId(cid.memberId)
-}
-
-type TenantMemberIdExporterSetter interface {
-	SetTenantId(tenant.TenantId)
-	SetMemberId(MemberId)
-}
diff --git a/grade/internal/domain/member/values/tenant_member_id_faker.go b/grade/internal/domain/member/values/tenant_member_id_faker.go
deleted file mode 100644
index 5b561e06..00000000
--- a/grade/internal/domain/member/values/tenant_member_id_faker.go
+++ /dev/null
@@ -1,45 +0,0 @@
-package values
-
-import (
-	tenant "github.com/emacsway/grade/grade/internal/domain/tenant/values"
-)
-
-type TenantMemberIdFakerOption func(*TenantMemberIdFaker)
-
-func WithTenantId(tenantId uint) TenantMemberIdFakerOption {
-	return func(f *TenantMemberIdFaker) {
-		f.TenantId = tenantId
-	}
-}
-
-func WithTransientId() TenantMemberIdFakerOption {
-	return func(f *TenantMemberIdFaker) {
-		f.MemberId = 0
-	}
-}
-
-var MemberIdFakeValue = uint(3)
-
-func NewTenantMemberIdFaker(opts ...TenantMemberIdFakerOption) TenantMemberIdFaker {
-	f := TenantMemberIdFaker{
-		TenantId: tenant.TenantIdFakeValue,
-		MemberId: MemberIdFakeValue,
-	}
-	for _, opt := range opts {
-		opt(&f)
-	}
-	return f
-}
-
-type TenantMemberIdFaker struct {
-	TenantId uint
-	MemberId uint
-}
-
-func (f *TenantMemberIdFaker) NextMemberId() {
-	f.MemberId += 1
-}
-
-func (f TenantMemberIdFaker) Create() (TenantMemberId, error) {
-	return NewTenantMemberId(f.TenantId, f.MemberId)
-}
diff --git a/grade/internal/domain/member/values/tenant_member_id_reconstitutor.go b/grade/internal/domain/member/values/tenant_member_id_reconstitutor.go
deleted file mode 100644
index 8d5cb57b..00000000
--- a/grade/internal/domain/member/values/tenant_member_id_reconstitutor.go
+++ /dev/null
@@ -1,10 +0,0 @@
-package values
-
-type TenantMemberIdReconstitutor struct {
-	TenantId uint
-	MemberId uint
-}
-
-func (r TenantMemberIdReconstitutor) Reconstitute() (TenantMemberId, error) {
-	return NewTenantMemberId(r.TenantId, r.MemberId)
-}
diff --git a/grade/internal/domain/member/values/tenant_member_id_test.go b/grade/internal/domain/member/values/tenant_member_id_test.go
deleted file mode 100644
index 53f3ea4a..00000000
--- a/grade/internal/domain/member/values/tenant_member_id_test.go
+++ /dev/null
@@ -1,61 +0,0 @@
-package values
-
-import (
-	"fmt"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-
-	"github.com/emacsway/grade/grade/internal/domain/seedwork/exporters"
-)
-
-func TestTenantMemberIdEqual(t *testing.T) {
-	t1 := uint(10)
-	m1 := uint(3)
-	t2 := uint(11)
-	m2 := uint(4)
-	cases := []struct {
-		TenantId       uint
-		MemberId       uint
-		OtherTenantId  uint
-		OtherMemberId  uint
-		ExpectedResult bool
-	}{
-		{t1, m2, t1, m2, true},
-		{t1, m1, t1, m2, false},
-		{t2, m2, t1, m2, false},
-		{t1, m2, t1, m1, false},
-		{t1, m2, t2, m2, false},
-	}
-	for i, c := range cases {
-		t.Run(fmt.Sprintf("Case %d", i), func(t *testing.T) {
-			id, err := NewTenantMemberId(c.TenantId, c.MemberId)
-			if err != nil {
-				t.Error(err)
-				t.FailNow()
-			}
-			otherId, err := NewTenantMemberId(c.OtherTenantId, c.OtherMemberId)
-			if err != nil {
-				t.Error(err)
-				t.FailNow()
-			}
-			r := id.Equal(otherId)
-			assert.Equal(t, c.ExpectedResult, r)
-		})
-	}
-}
-
-func TestMemberIdExport(t *testing.T) {
-	var actualExporter TenantMemberIdExporter
-	f := NewTenantMemberIdFaker()
-	cid, err := f.Create()
-	if err != nil {
-		t.Error(err)
-		t.FailNow()
-	}
-	cid.Export(&actualExporter)
-	assert.Equal(t, TenantMemberIdExporter{
-		TenantId: exporters.UintExporter(f.TenantId),
-		MemberId: exporters.UintExporter(f.MemberId),
-	}, actualExporter)
-}
diff --git a/grade/internal/domain/specialist/assignment/assignment.go b/grade/internal/domain/specialist/assignment/assignment.go
index b456b528..845e49ca 100644
--- a/grade/internal/domain/specialist/assignment/assignment.go
+++ b/grade/internal/domain/specialist/assignment/assignment.go
@@ -9,7 +9,7 @@ import (
 )
 
 func NewAssignment(
-	specialistId member.TenantMemberId,
+	specialistId member.MemberId,
 	specialistVersion uint,
 	assignedGrade grade.Grade,
 	reason values.Reason,
@@ -25,7 +25,7 @@ func NewAssignment(
 }
 
 type Assignment struct {
-	specialistId      member.TenantMemberId
+	specialistId      member.MemberId
 	specialistVersion uint
 	assignedGrade     grade.Grade
 	reason            values.Reason
@@ -41,7 +41,7 @@ func (a Assignment) Export(ex AssignmentExporterSetter) {
 }
 
 type AssignmentExporterSetter interface {
-	SetSpecialistId(member.TenantMemberId)
+	SetSpecialistId(member.MemberId)
 	SetSpecialistVersion(uint)
 	SetAssignedGrade(grade.Grade)
 	SetReason(values.Reason)
diff --git a/grade/internal/domain/specialist/assignment/assignment_exporter.go b/grade/internal/domain/specialist/assignment/assignment_exporter.go
index 753ac592..8eeb0961 100644
--- a/grade/internal/domain/specialist/assignment/assignment_exporter.go
+++ b/grade/internal/domain/specialist/assignment/assignment_exporter.go
@@ -10,14 +10,14 @@ import (
 )
 
 type AssignmentExporter struct {
-	SpecialistId      member.TenantMemberIdExporter
+	SpecialistId      member.MemberIdExporter
 	SpecialistVersion uint
 	AssignedGrade     exporters.Uint8Exporter
 	Reason            exporters.StringExporter
 	CreatedAt         time.Time
 }
 
-func (ex *AssignmentExporter) SetSpecialistId(val member.TenantMemberId) {
+func (ex *AssignmentExporter) SetSpecialistId(val member.MemberId) {
 	val.Export(&ex.SpecialistId)
 }
 
diff --git a/grade/internal/domain/specialist/assignment/assignment_faker.go b/grade/internal/domain/specialist/assignment/assignment_faker.go
index e35b3ffc..d9b8690d 100644
--- a/grade/internal/domain/specialist/assignment/assignment_faker.go
+++ b/grade/internal/domain/specialist/assignment/assignment_faker.go
@@ -10,7 +10,7 @@ import (
 
 func NewAssignmentFaker() AssignmentFaker {
 	return AssignmentFaker{
-		SpecialistId:      member.NewTenantMemberIdFaker(),
+		SpecialistId:      member.NewMemberIdFaker(),
 		SpecialistVersion: 2,
 		AssignedGrade:     1,
 		Reason:            "Any",
@@ -19,7 +19,7 @@ func NewAssignmentFaker() AssignmentFaker {
 }
 
 type AssignmentFaker struct {
-	SpecialistId      member.TenantMemberIdFaker
+	SpecialistId      member.MemberIdFaker
 	SpecialistVersion uint
 	AssignedGrade     uint8
 	Reason            string
diff --git a/grade/internal/domain/specialist/assignment/assignment_reconstitutor.go b/grade/internal/domain/specialist/assignment/assignment_reconstitutor.go
index 0970e764..d60591cd 100644
--- a/grade/internal/domain/specialist/assignment/assignment_reconstitutor.go
+++ b/grade/internal/domain/specialist/assignment/assignment_reconstitutor.go
@@ -9,7 +9,7 @@ import (
 )
 
 type AssignmentReconstitutor struct {
-	SpecialistId      member.TenantMemberIdReconstitutor
+	SpecialistId      member.MemberIdReconstitutor
 	SpecialistVersion uint
 	AssignedGrade     uint8
 	Reason            string
diff --git a/grade/internal/domain/specialist/assignment/assignment_test.go b/grade/internal/domain/specialist/assignment/assignment_test.go
index 8f5befc9..ce5dca93 100644
--- a/grade/internal/domain/specialist/assignment/assignment_test.go
+++ b/grade/internal/domain/specialist/assignment/assignment_test.go
@@ -15,7 +15,7 @@ func TestAssignmentExport(t *testing.T) {
 	agg, _ := f.Create()
 	agg.Export(&actualExporter)
 	assert.Equal(t, AssignmentExporter{
-		SpecialistId:      member.NewTenantMemberIdExporter(f.SpecialistId.TenantId, f.SpecialistId.MemberId),
+		SpecialistId:      member.NewMemberIdExporter(f.SpecialistId.TenantId, f.SpecialistId.MemberId),
 		SpecialistVersion: f.SpecialistVersion,
 		AssignedGrade:     exporters.Uint8Exporter(f.AssignedGrade),
 		Reason:            exporters.StringExporter(f.Reason),
diff --git a/grade/internal/domain/specialist/endorsement/endorsement.go b/grade/internal/domain/specialist/endorsement/endorsement.go
index f144d7ff..04d15153 100644
--- a/grade/internal/domain/specialist/endorsement/endorsement.go
+++ b/grade/internal/domain/specialist/endorsement/endorsement.go
@@ -17,11 +17,11 @@ const (
 )
 
 func NewEndorsement(
-	specialistId member.TenantMemberId,
+	specialistId member.MemberId,
 	specialistGrade grade.Grade,
 	specialistVersion uint,
 	artifactId artifact.TenantArtifactId,
-	endorserId member.TenantMemberId,
+	endorserId member.MemberId,
 	endorserGrade grade.Grade,
 	endorserVersion uint,
 	createdAt time.Time,
@@ -39,17 +39,17 @@ func NewEndorsement(
 }
 
 type Endorsement struct {
-	specialistId      member.TenantMemberId
+	specialistId      member.MemberId
 	specialistGrade   grade.Grade
 	specialistVersion uint
 	artifactId        artifact.TenantArtifactId
-	endorserId        member.TenantMemberId
+	endorserId        member.MemberId
 	endorserGrade     grade.Grade
 	endorserVersion   uint
 	createdAt         time.Time
 }
 
-func (e Endorsement) IsEndorsedBy(endorserId member.TenantMemberId, artifactId artifact.TenantArtifactId) bool {
+func (e Endorsement) IsEndorsedBy(endorserId member.MemberId, artifactId artifact.TenantArtifactId) bool {
 	return e.endorserId.Equal(endorserId) && e.artifactId.Equal(artifactId)
 }
 
@@ -78,11 +78,11 @@ func (e Endorsement) Export(ex EndorsementExporterSetter) {
 }
 
 type EndorsementExporterSetter interface {
-	SetSpecialistId(member.TenantMemberId)
+	SetSpecialistId(member.MemberId)
 	SetSpecialistGrade(grade.Grade)
 	SetSpecialistVersion(uint)
 	SetArtifactId(artifact.TenantArtifactId)
-	SetEndorserId(member.TenantMemberId)
+	SetEndorserId(member.MemberId)
 	SetEndorserGrade(grade.Grade)
 	SetEndorserVersion(uint)
 	SetCreatedAt(time.Time)
diff --git a/grade/internal/domain/specialist/endorsement/endorsement_exporter.go b/grade/internal/domain/specialist/endorsement/endorsement_exporter.go
index 0faa4150..17be1587 100644
--- a/grade/internal/domain/specialist/endorsement/endorsement_exporter.go
+++ b/grade/internal/domain/specialist/endorsement/endorsement_exporter.go
@@ -10,17 +10,17 @@ import (
 )
 
 type EndorsementExporter struct {
-	EndorserId        member.TenantMemberIdExporter
+	EndorserId        member.MemberIdExporter
 	EndorserGrade     exporters.Uint8Exporter
 	EndorserVersion   uint
-	SpecialistId      member.TenantMemberIdExporter
+	SpecialistId      member.MemberIdExporter
 	SpecialistGrade   exporters.Uint8Exporter
 	SpecialistVersion uint
 	ArtifactId        artifact.TenantArtifactIdExporter
 	CreatedAt         time.Time
 }
 
-func (ex *EndorsementExporter) SetSpecialistId(val member.TenantMemberId) {
+func (ex *EndorsementExporter) SetSpecialistId(val member.MemberId) {
 	val.Export(&ex.SpecialistId)
 }
 
@@ -36,7 +36,7 @@ func (ex *EndorsementExporter) SetArtifactId(val artifact.TenantArtifactId) {
 	val.Export(&ex.ArtifactId)
 }
 
-func (ex *EndorsementExporter) SetEndorserId(val member.TenantMemberId) {
+func (ex *EndorsementExporter) SetEndorserId(val member.MemberId) {
 	val.Export(&ex.EndorserId)
 }
 
diff --git a/grade/internal/domain/specialist/endorsement/endorsement_faker.go b/grade/internal/domain/specialist/endorsement/endorsement_faker.go
index b81197a9..1fee937d 100644
--- a/grade/internal/domain/specialist/endorsement/endorsement_faker.go
+++ b/grade/internal/domain/specialist/endorsement/endorsement_faker.go
@@ -10,10 +10,10 @@ import (
 )
 
 func NewEndorsementFaker() EndorsementFaker {
-	endorserIdFactory := member.NewTenantMemberIdFaker()
+	endorserIdFactory := member.NewMemberIdFaker()
 	endorserIdFactory.MemberId = endorser.EndorserMemberIdFakeValue
 	return EndorsementFaker{
-		SpecialistId:      member.NewTenantMemberIdFaker(),
+		SpecialistId:      member.NewMemberIdFaker(),
 		SpecialistGrade:   1,
 		SpecialistVersion: 5,
 		ArtifactId:        artifact.NewTenantArtifactIdFaker(),
@@ -25,11 +25,11 @@ func NewEndorsementFaker() EndorsementFaker {
 }
 
 type EndorsementFaker struct {
-	SpecialistId      member.TenantMemberIdFaker
+	SpecialistId      member.MemberIdFaker
 	SpecialistGrade   uint8
 	SpecialistVersion uint
 	ArtifactId        artifact.TenantArtifactIdFaker
-	EndorserId        member.TenantMemberIdFaker
+	EndorserId        member.MemberIdFaker
 	EndorserGrade     uint8
 	EndorserVersion   uint
 	CreatedAt         time.Time
diff --git a/grade/internal/domain/specialist/endorsement/endorsement_reconstitutor.go b/grade/internal/domain/specialist/endorsement/endorsement_reconstitutor.go
index ecd46a72..8a69f74c 100644
--- a/grade/internal/domain/specialist/endorsement/endorsement_reconstitutor.go
+++ b/grade/internal/domain/specialist/endorsement/endorsement_reconstitutor.go
@@ -9,11 +9,11 @@ import (
 )
 
 type EndorsementReconstitutor struct {
-	SpecialistId      member.TenantMemberIdReconstitutor
+	SpecialistId      member.MemberIdReconstitutor
 	SpecialistGrade   uint8
 	SpecialistVersion uint
 	ArtifactId        artifact.TenantArtifactIdReconstitutor
-	EndorserId        member.TenantMemberIdReconstitutor
+	EndorserId        member.MemberIdReconstitutor
 	EndorserGrade     uint8
 	EndorserVersion   uint
 	CreatedAt         time.Time
diff --git a/grade/internal/domain/specialist/endorsement/endorsement_test.go b/grade/internal/domain/specialist/endorsement/endorsement_test.go
index 4de88fe7..d6ffa58e 100644
--- a/grade/internal/domain/specialist/endorsement/endorsement_test.go
+++ b/grade/internal/domain/specialist/endorsement/endorsement_test.go
@@ -32,7 +32,7 @@ func TestEndorsementIsEndorsedBy(t *testing.T) {
 	for i, c := range cases {
 		t.Run(fmt.Sprintf("Case %d", i), func(t *testing.T) {
 			f.EndorserId.MemberId = c.RecogniserId
-			rId, err := member.NewTenantMemberId(f.EndorserId.TenantId, c.TestRecogniserId)
+			rId, err := member.NewMemberId(f.EndorserId.TenantId, c.TestRecogniserId)
 			if err != nil {
 				t.Error(err)
 				t.FailNow()
@@ -81,11 +81,11 @@ func TestEndorsementExport(t *testing.T) {
 	agg, _ := f.Create()
 	agg.Export(&actualExporter)
 	assert.Equal(t, EndorsementExporter{
-		SpecialistId:      member.NewTenantMemberIdExporter(f.SpecialistId.TenantId, f.SpecialistId.MemberId),
+		SpecialistId:      member.NewMemberIdExporter(f.SpecialistId.TenantId, f.SpecialistId.MemberId),
 		SpecialistGrade:   exporters.Uint8Exporter(f.SpecialistGrade),
 		SpecialistVersion: f.SpecialistVersion,
 		ArtifactId:        artifact.NewTenantArtifactIdExporter(f.ArtifactId.TenantId, f.ArtifactId.ArtifactId),
-		EndorserId:        member.NewTenantMemberIdExporter(f.EndorserId.TenantId, f.EndorserId.MemberId),
+		EndorserId:        member.NewMemberIdExporter(f.EndorserId.TenantId, f.EndorserId.MemberId),
 		EndorserGrade:     exporters.Uint8Exporter(f.EndorserGrade),
 		EndorserVersion:   f.EndorserVersion,
 		CreatedAt:         f.CreatedAt,
diff --git a/grade/internal/domain/specialist/events/endorsement_reserved.go b/grade/internal/domain/specialist/events/endorsement_reserved.go
index a112208c..c6ad9253 100644
--- a/grade/internal/domain/specialist/events/endorsement_reserved.go
+++ b/grade/internal/domain/specialist/events/endorsement_reserved.go
@@ -9,10 +9,10 @@ import (
 )
 
 func NewEndorsementReceived(
-	endorserId member.TenantMemberId,
+	endorserId member.MemberId,
 	endorserGrade grade.Grade,
 	endorserVersion uint,
-	specialistId member.TenantMemberId,
+	specialistId member.MemberId,
 	specialistGrade grade.Grade,
 	specialistVersion uint,
 	artifactId artifact.TenantArtifactId,
@@ -31,17 +31,17 @@ func NewEndorsementReceived(
 }
 
 type EndorsementReceived struct {
-	endorserId        member.TenantMemberId
+	endorserId        member.MemberId
 	endorserGrade     grade.Grade
 	endorserVersion   uint
-	specialistId      member.TenantMemberId
+	specialistId      member.MemberId
 	specialistGrade   grade.Grade
 	specialistVersion uint
 	artifactId        artifact.TenantArtifactId
 	createdAt         time.Time
 }
 
-func (e EndorsementReceived) EndorserId() member.TenantMemberId {
+func (e EndorsementReceived) EndorserId() member.MemberId {
 	return e.endorserId
 }
 
@@ -53,7 +53,7 @@ func (e EndorsementReceived) EndorserVersion() uint {
 	return e.endorserVersion
 }
 
-func (e EndorsementReceived) SpecialistId() member.TenantMemberId {
+func (e EndorsementReceived) SpecialistId() member.MemberId {
 	return e.specialistId
 }
 
diff --git a/grade/internal/domain/specialist/events/grade_assigned.go b/grade/internal/domain/specialist/events/grade_assigned.go
index 6bcd24be..aad00164 100644
--- a/grade/internal/domain/specialist/events/grade_assigned.go
+++ b/grade/internal/domain/specialist/events/grade_assigned.go
@@ -9,7 +9,7 @@ import (
 )
 
 func NewGradeAssigned(
-	specialistId member.TenantMemberId,
+	specialistId member.MemberId,
 	specialistVersion uint,
 	assignedGrade grade.Grade,
 	reason assignment.Reason,
@@ -25,14 +25,14 @@ func NewGradeAssigned(
 }
 
 type GradeAssigned struct {
-	specialistId      member.TenantMemberId
+	specialistId      member.MemberId
 	specialistVersion uint
 	assignedGrade     grade.Grade
 	reason            assignment.Reason
 	createdAt         time.Time
 }
 
-func (e GradeAssigned) SpecialistId() member.TenantMemberId {
+func (e GradeAssigned) SpecialistId() member.MemberId {
 	return e.specialistId
 }
 
diff --git a/grade/internal/domain/specialist/specialist.go b/grade/internal/domain/specialist/specialist.go
index ad5e0b75..fe8b5269 100644
--- a/grade/internal/domain/specialist/specialist.go
+++ b/grade/internal/domain/specialist/specialist.go
@@ -40,7 +40,7 @@ var (
 
 // FIXME: Move this constructor to tenant aggregate
 func NewSpecialist(
-	id member.TenantMemberId,
+	id member.MemberId,
 	createdAt time.Time,
 ) (*Specialist, error) {
 	zeroGrade, _ := grade.DefaultConstructor(0)
@@ -52,7 +52,7 @@ func NewSpecialist(
 }
 
 type Specialist struct {
-	id                   member.TenantMemberId
+	id                   member.MemberId
 	grade                grade.Grade
 	receivedEndorsements []endorsement.Endorsement
 	assignments          []assignment.Assignment
@@ -191,7 +191,7 @@ func (s Specialist) Export(ex SpecialistExporterSetter) {
 }
 
 type SpecialistExporterSetter interface {
-	SetId(member.TenantMemberId)
+	SetId(member.MemberId)
 	SetGrade(grade.Grade)
 	AddEndorsement(endorsement.Endorsement)
 	AddAssignment(assignment.Assignment)
diff --git a/grade/internal/domain/specialist/specialist_exporter.go b/grade/internal/domain/specialist/specialist_exporter.go
index 00719b23..48d8be7a 100644
--- a/grade/internal/domain/specialist/specialist_exporter.go
+++ b/grade/internal/domain/specialist/specialist_exporter.go
@@ -11,7 +11,7 @@ import (
 )
 
 type SpecialistExporter struct {
-	Id                   member.TenantMemberIdExporter
+	Id                   member.MemberIdExporter
 	Grade                exporters.Uint8Exporter
 	ReceivedEndorsements []endorsement.EndorsementExporter
 	Assignments          []assignment.AssignmentExporter
@@ -19,7 +19,7 @@ type SpecialistExporter struct {
 	Version              uint
 }
 
-func (ex *SpecialistExporter) SetId(val member.TenantMemberId) {
+func (ex *SpecialistExporter) SetId(val member.MemberId) {
 	val.Export(&ex.Id)
 }
 
diff --git a/grade/internal/domain/specialist/specialist_faker.go b/grade/internal/domain/specialist/specialist_faker.go
index 8426f67b..503ac5d2 100644
--- a/grade/internal/domain/specialist/specialist_faker.go
+++ b/grade/internal/domain/specialist/specialist_faker.go
@@ -46,7 +46,7 @@ func WithMemberFaker(memberFaker *member.MemberFaker) SpecialistFakerOption {
 }
 
 func NewSpecialistFaker(opts ...SpecialistFakerOption) *SpecialistFaker {
-	idFactory := memberVal.NewTenantMemberIdFaker()
+	idFactory := memberVal.NewMemberIdFaker()
 	idFactory.MemberId = SpecialistMemberIdFakeValue
 	f := &SpecialistFaker{
 		Id:            idFactory,
@@ -63,7 +63,7 @@ func NewSpecialistFaker(opts ...SpecialistFakerOption) *SpecialistFaker {
 }
 
 type SpecialistFaker struct {
-	Id                   memberVal.TenantMemberIdFaker
+	Id                   memberVal.MemberIdFaker
 	Grade                uint8
 	ReceivedEndorsements []ReceivedEndorsementFakeItem
 	CreatedAt            time.Time
@@ -205,7 +205,7 @@ func (f *SpecialistFaker) SetMemberId(val uint) {
 	f.ArtifactFaker.SetMemberId(val)
 }
 
-func (f *SpecialistFaker) SetId(id memberVal.TenantMemberIdFaker) {
+func (f *SpecialistFaker) SetId(id memberVal.MemberIdFaker) {
 	f.SetTenantId(id.TenantId)
 	f.SetMemberId(id.MemberId)
 }
diff --git a/grade/internal/domain/specialist/specialist_reconstitutor.go b/grade/internal/domain/specialist/specialist_reconstitutor.go
index 811758e3..2ec041d4 100644
--- a/grade/internal/domain/specialist/specialist_reconstitutor.go
+++ b/grade/internal/domain/specialist/specialist_reconstitutor.go
@@ -11,7 +11,7 @@ import (
 )
 
 type SpecialistReconstitutor struct {
-	Id                   member.TenantMemberIdReconstitutor
+	Id                   member.MemberIdReconstitutor
 	Grade                uint8
 	ReceivedEndorsements []endorsement.EndorsementReconstitutor
 	Assignments          []assignment.AssignmentReconstitutor
diff --git a/grade/internal/domain/specialist/specialist_test.go b/grade/internal/domain/specialist/specialist_test.go
index bf8fce79..9ccca975 100644
--- a/grade/internal/domain/specialist/specialist_test.go
+++ b/grade/internal/domain/specialist/specialist_test.go
@@ -34,57 +34,57 @@ func TestSpecialistExport(t *testing.T) {
 	}
 	s.Export(&actualExporter)
 	assert.Equal(t, SpecialistExporter{
-		Id:    member.NewTenantMemberIdExporter(sf.Id.TenantId, sf.Id.MemberId),
+		Id:    member.NewMemberIdExporter(sf.Id.TenantId, sf.Id.MemberId),
 		Grade: exporters.Uint8Exporter(sf.Grade + 1),
 		ReceivedEndorsements: []endorsement.EndorsementExporter{
 			{
-				SpecialistId:      member.NewTenantMemberIdExporter(sf.Id.TenantId, sf.Id.MemberId),
+				SpecialistId:      member.NewMemberIdExporter(sf.Id.TenantId, sf.Id.MemberId),
 				SpecialistGrade:   exporters.Uint8Exporter(sf.Grade),
 				SpecialistVersion: 0,
 				ArtifactId: artifact.NewTenantArtifactIdExporter(
 					sf.ReceivedEndorsements[0].Artifact.Id.TenantId,
 					sf.ReceivedEndorsements[0].Artifact.Id.ArtifactId,
 				),
-				EndorserId:      member.NewTenantMemberIdExporter(ef.Id.TenantId, ef.Id.MemberId),
+				EndorserId:      member.NewMemberIdExporter(ef.Id.TenantId, ef.Id.MemberId),
 				EndorserGrade:   exporters.Uint8Exporter(ef.Grade),
 				EndorserVersion: 0,
 				CreatedAt:       sf.ReceivedEndorsements[0].CreatedAt,
 			},
 			{
-				SpecialistId:      member.NewTenantMemberIdExporter(sf.Id.TenantId, sf.Id.MemberId),
+				SpecialistId:      member.NewMemberIdExporter(sf.Id.TenantId, sf.Id.MemberId),
 				SpecialistGrade:   exporters.Uint8Exporter(sf.Grade),
 				SpecialistVersion: 1,
 				ArtifactId: artifact.NewTenantArtifactIdExporter(
 					sf.ReceivedEndorsements[1].Artifact.Id.TenantId,
 					sf.ReceivedEndorsements[1].Artifact.Id.ArtifactId,
 				),
-				EndorserId:      member.NewTenantMemberIdExporter(ef.Id.TenantId, ef.Id.MemberId),
+				EndorserId:      member.NewMemberIdExporter(ef.Id.TenantId, ef.Id.MemberId),
 				EndorserGrade:   exporters.Uint8Exporter(ef.Grade),
 				EndorserVersion: 0,
 				CreatedAt:       sf.ReceivedEndorsements[1].CreatedAt,
 			},
 			{
-				SpecialistId:      member.NewTenantMemberIdExporter(sf.Id.TenantId, sf.Id.MemberId),
+				SpecialistId:      member.NewMemberIdExporter(sf.Id.TenantId, sf.Id.MemberId),
 				SpecialistGrade:   exporters.Uint8Exporter(sf.Grade),
 				SpecialistVersion: 2,
 				ArtifactId: artifact.NewTenantArtifactIdExporter(
 					sf.ReceivedEndorsements[2].Artifact.Id.TenantId,
 					sf.ReceivedEndorsements[2].Artifact.Id.ArtifactId,
 				),
-				EndorserId:      member.NewTenantMemberIdExporter(ef.Id.TenantId, ef.Id.MemberId),
+				EndorserId:      member.NewMemberIdExporter(ef.Id.TenantId, ef.Id.MemberId),
 				EndorserGrade:   exporters.Uint8Exporter(ef.Grade),
 				EndorserVersion: 0,
 				CreatedAt:       sf.ReceivedEndorsements[2].CreatedAt,
 			},
 			{
-				SpecialistId:      member.NewTenantMemberIdExporter(sf.Id.TenantId, sf.Id.MemberId),
+				SpecialistId:      member.NewMemberIdExporter(sf.Id.TenantId, sf.Id.MemberId),
 				SpecialistGrade:   exporters.Uint8Exporter(sf.Grade + 1),
 				SpecialistVersion: 3,
 				ArtifactId: artifact.NewTenantArtifactIdExporter(
 					sf.ReceivedEndorsements[3].Artifact.Id.TenantId,
 					sf.ReceivedEndorsements[3].Artifact.Id.ArtifactId,
 				),
-				EndorserId:      member.NewTenantMemberIdExporter(ef.Id.TenantId, ef.Id.MemberId),
+				EndorserId:      member.NewMemberIdExporter(ef.Id.TenantId, ef.Id.MemberId),
 				EndorserGrade:   exporters.Uint8Exporter(ef.Grade),
 				EndorserVersion: 0,
 				CreatedAt:       sf.ReceivedEndorsements[3].CreatedAt,
@@ -92,7 +92,7 @@ func TestSpecialistExport(t *testing.T) {
 		},
 		Assignments: []assignment.AssignmentExporter{
 			{
-				SpecialistId:      member.NewTenantMemberIdExporter(sf.Id.TenantId, sf.Id.MemberId),
+				SpecialistId:      member.NewMemberIdExporter(sf.Id.TenantId, sf.Id.MemberId),
 				SpecialistVersion: 2,
 				AssignedGrade:     exporters.Uint8Exporter(sf.Grade + 1),
 				Reason:            exporters.StringExporter("Achieved"),
diff --git a/grade/internal/infrastructure/repositories/artifact/queries/artifact_proposed_query.go b/grade/internal/infrastructure/repositories/artifact/queries/artifact_proposed_query.go
index fc78096d..3e0abf21 100644
--- a/grade/internal/infrastructure/repositories/artifact/queries/artifact_proposed_query.go
+++ b/grade/internal/infrastructure/repositories/artifact/queries/artifact_proposed_query.go
@@ -44,12 +44,12 @@ func (q *ArtifactProposedQuery) AddCompetenceId(val competenceVal.TenantCompeten
 	val.Export(&competenceExporter)
 	q.payload.CompetenceIds = append(q.payload.CompetenceIds, competenceExporter)
 }
-func (q *ArtifactProposedQuery) AddAuthorId(val memberVal.TenantMemberId) {
-	var authorExporter memberVal.TenantMemberIdExporter
+func (q *ArtifactProposedQuery) AddAuthorId(val memberVal.MemberId) {
+	var authorExporter memberVal.MemberIdExporter
 	val.Export(&authorExporter)
 	q.payload.AuthorIds = append(q.payload.AuthorIds, authorExporter)
 }
-func (q *ArtifactProposedQuery) SetOwnerId(val memberVal.TenantMemberId) {
+func (q *ArtifactProposedQuery) SetOwnerId(val memberVal.MemberId) {
 	val.Export(&q.payload.OwnerId)
 }
 func (q *ArtifactProposedQuery) SetCreatedAt(val time.Time) {
@@ -68,7 +68,7 @@ type ArtifactProposedPayload struct {
 	Description   exporters.StringExporter
 	Url           exporters.StringExporter
 	CompetenceIds []competenceVal.TenantCompetenceIdExporter
-	AuthorIds     []memberVal.TenantMemberIdExporter
-	OwnerId       memberVal.TenantMemberIdExporter
+	AuthorIds     []memberVal.MemberIdExporter
+	OwnerId       memberVal.MemberIdExporter
 	CreatedAt     time.Time
 }
diff --git a/grade/internal/infrastructure/repositories/competence/queries/competence_created_query.go b/grade/internal/infrastructure/repositories/competence/queries/competence_created_query.go
index bd579b82..04ae5d9f 100644
--- a/grade/internal/infrastructure/repositories/competence/queries/competence_created_query.go
+++ b/grade/internal/infrastructure/repositories/competence/queries/competence_created_query.go
@@ -44,8 +44,8 @@ func (q *CompetenceCreatedQuery) SetName(val values.Name) {
 	q.params[1] = v
 }
 
-func (q *CompetenceCreatedQuery) SetOwnerId(val memberVal.TenantMemberId) {
-	var v memberVal.TenantMemberIdExporter
+func (q *CompetenceCreatedQuery) SetOwnerId(val memberVal.MemberId) {
+	var v memberVal.MemberIdExporter
 	val.Export(&v)
 	q.params[2] = v.MemberId
 }
diff --git a/grade/internal/infrastructure/repositories/competence/queries/optimistic_offline_lock_query.go b/grade/internal/infrastructure/repositories/competence/queries/optimistic_offline_lock_query.go
index 5b6339dd..eafad81b 100644
--- a/grade/internal/infrastructure/repositories/competence/queries/optimistic_offline_lock_query.go
+++ b/grade/internal/infrastructure/repositories/competence/queries/optimistic_offline_lock_query.go
@@ -42,7 +42,7 @@ func (q *OptimisticOfflineLockLockQuery) SetCompetenceId(val values.CompetenceId
 func (q *OptimisticOfflineLockLockQuery) SetName(val values.Name) {
 }
 
-func (q *OptimisticOfflineLockLockQuery) SetOwnerId(val memberVal.TenantMemberId) {
+func (q *OptimisticOfflineLockLockQuery) SetOwnerId(val memberVal.MemberId) {
 }
 
 func (q *OptimisticOfflineLockLockQuery) SetCreatedAt(val time.Time) {
diff --git a/grade/internal/infrastructure/repositories/endorser/endorser_repository.go b/grade/internal/infrastructure/repositories/endorser/endorser_repository.go
index 4506538a..b0b2f98e 100644
--- a/grade/internal/infrastructure/repositories/endorser/endorser_repository.go
+++ b/grade/internal/infrastructure/repositories/endorser/endorser_repository.go
@@ -36,7 +36,7 @@ func (r EndorserRepository) Insert(agg *endorser.Endorser) error {
 	return nil
 }
 
-func (r *EndorserRepository) Get(id memberVal.TenantMemberId) (*endorser.Endorser, error) {
+func (r *EndorserRepository) Get(id memberVal.MemberId) (*endorser.Endorser, error) {
 	q := queries.EndorserGetQuery{Id: id}
 	return q.Get(r.session)
 }
diff --git a/grade/internal/infrastructure/repositories/endorser/endorser_repository_test.go b/grade/internal/infrastructure/repositories/endorser/endorser_repository_test.go
index 7ca5d86c..89d6ad72 100644
--- a/grade/internal/infrastructure/repositories/endorser/endorser_repository_test.go
+++ b/grade/internal/infrastructure/repositories/endorser/endorser_repository_test.go
@@ -64,7 +64,7 @@ func testInsert(t *testing.T, repositoryOption RepositoryOption) {
 	require.NoError(t, err)
 	agg.Export(&exporterActual)
 
-	id, err := memberVal.NewTenantMemberId(
+	id, err := memberVal.NewMemberId(
 		uint(exporterActual.Id.TenantId),
 		uint(exporterActual.Id.MemberId),
 	)
diff --git a/grade/internal/infrastructure/repositories/endorser/endorser_specifications.go b/grade/internal/infrastructure/repositories/endorser/endorser_specifications.go
index 6db5b9d3..dbe761ee 100644
--- a/grade/internal/infrastructure/repositories/endorser/endorser_specifications.go
+++ b/grade/internal/infrastructure/repositories/endorser/endorser_specifications.go
@@ -70,7 +70,7 @@ func (c Context) Extract(val any) (driver.Valuer, error) {
 		var ex exporters.UintExporter
 		valTyped.Export(&ex)
 		return ex, nil
-	case member.MemberId:
+	case member.InternalMemberId:
 		var ex exporters.UintExporter
 		valTyped.Export(&ex)
 		return nil, nil
@@ -78,7 +78,7 @@ func (c Context) Extract(val any) (driver.Valuer, error) {
 		var ex exporters.UintExporter
 		valTyped.Export(&ex)
 		return nil, nil
-	case member.TenantMemberId:
+	case member.MemberId:
 		var ex TenantMemberIdExporter
 		valTyped.Export(&ex)
 		return nil, s.NewMissingValuesError(ex.Values()...)
@@ -99,6 +99,6 @@ func (ex *TenantMemberIdExporter) SetTenantId(val tenant.TenantId) {
 	ex.values[0] = val
 }
 
-func (ex *TenantMemberIdExporter) SetMemberId(val member.MemberId) {
+func (ex *TenantMemberIdExporter) SetMemberId(val member.InternalMemberId) {
 	ex.values[1] = val
 }
diff --git a/grade/internal/infrastructure/repositories/endorser/queries/endorser_delete_query.go b/grade/internal/infrastructure/repositories/endorser/queries/endorser_delete_query.go
index 646414b1..c16cb838 100644
--- a/grade/internal/infrastructure/repositories/endorser/queries/endorser_delete_query.go
+++ b/grade/internal/infrastructure/repositories/endorser/queries/endorser_delete_query.go
@@ -23,7 +23,7 @@ func (q *EndorserDeleteQuery) SetTenantId(val tenant.TenantId) {
 	q.params[0] = v
 }
 
-func (q *EndorserDeleteQuery) SetMemberId(val member.MemberId) {
+func (q *EndorserDeleteQuery) SetMemberId(val member.InternalMemberId) {
 	var v exporters.UintExporter
 	val.Export(&v)
 	q.params[1] = v
diff --git a/grade/internal/infrastructure/repositories/endorser/queries/endorser_get_query.go b/grade/internal/infrastructure/repositories/endorser/queries/endorser_get_query.go
index 9ffaee38..0b24af11 100644
--- a/grade/internal/infrastructure/repositories/endorser/queries/endorser_get_query.go
+++ b/grade/internal/infrastructure/repositories/endorser/queries/endorser_get_query.go
@@ -7,7 +7,7 @@ import (
 )
 
 type EndorserGetQuery struct {
-	Id memberVal.TenantMemberId
+	Id memberVal.MemberId
 }
 
 func (q EndorserGetQuery) sql() string {
@@ -20,7 +20,7 @@ func (q EndorserGetQuery) sql() string {
 }
 
 func (q EndorserGetQuery) params() []any {
-	var idExp memberVal.TenantMemberIdExporter
+	var idExp memberVal.MemberIdExporter
 	q.Id.Export(&idExp)
 	return []any{idExp.TenantId, idExp.MemberId}
 }
diff --git a/grade/internal/infrastructure/repositories/endorser/queries/endorser_insert_query.go b/grade/internal/infrastructure/repositories/endorser/queries/endorser_insert_query.go
index f608b512..e03dfd18 100644
--- a/grade/internal/infrastructure/repositories/endorser/queries/endorser_insert_query.go
+++ b/grade/internal/infrastructure/repositories/endorser/queries/endorser_insert_query.go
@@ -23,7 +23,7 @@ func (q EndorserInsertQuery) sql() string {
 		($1, $2, $3, $4, $5, $6, $7)`
 }
 
-func (q *EndorserInsertQuery) SetId(val memberVal.TenantMemberId) {
+func (q *EndorserInsertQuery) SetId(val memberVal.MemberId) {
 	val.Export(q)
 }
 
@@ -33,7 +33,7 @@ func (q *EndorserInsertQuery) SetTenantId(val tenantVal.TenantId) {
 	q.params[0] = v
 }
 
-func (q *EndorserInsertQuery) SetMemberId(val memberVal.MemberId) {
+func (q *EndorserInsertQuery) SetMemberId(val memberVal.InternalMemberId) {
 	var v exporters.UintExporter
 	val.Export(&v)
 	q.params[1] = v
diff --git a/grade/internal/infrastructure/repositories/endorser/queries/endorser_update_query.go b/grade/internal/infrastructure/repositories/endorser/queries/endorser_update_query.go
index c7d2797f..91d5ad41 100644
--- a/grade/internal/infrastructure/repositories/endorser/queries/endorser_update_query.go
+++ b/grade/internal/infrastructure/repositories/endorser/queries/endorser_update_query.go
@@ -26,7 +26,7 @@ func (q EndorserUpdateQuery) sql() string {
 			tenant_id = $1 AND member_id = $2 AND version = $3`
 }
 
-func (q *EndorserUpdateQuery) SetId(val member.TenantMemberId) {
+func (q *EndorserUpdateQuery) SetId(val member.MemberId) {
 	val.Export(q)
 }
 
@@ -36,7 +36,7 @@ func (q *EndorserUpdateQuery) SetTenantId(val tenant.TenantId) {
 	q.params[0] = v
 }
 
-func (q *EndorserUpdateQuery) SetMemberId(val member.MemberId) {
+func (q *EndorserUpdateQuery) SetMemberId(val member.InternalMemberId) {
 	var v exporters.UintExporter
 	val.Export(&v)
 	q.params[1] = v
diff --git a/grade/internal/infrastructure/repositories/member/member_repository.go b/grade/internal/infrastructure/repositories/member/member_repository.go
index ab57e3eb..8ccd1616 100644
--- a/grade/internal/infrastructure/repositories/member/member_repository.go
+++ b/grade/internal/infrastructure/repositories/member/member_repository.go
@@ -36,7 +36,7 @@ func (r *MemberRepository) Insert(agg *member.Member) error {
 	return nil
 }
 
-func (r *MemberRepository) Get(id memberVal.TenantMemberId) (*member.Member, error) {
+func (r *MemberRepository) Get(id memberVal.MemberId) (*member.Member, error) {
 	q := queries.MemberGetQuery{Id: id}
 	return q.Get(r.session)
 }
diff --git a/grade/internal/infrastructure/repositories/member/member_repository_test.go b/grade/internal/infrastructure/repositories/member/member_repository_test.go
index a114b032..24221d5a 100644
--- a/grade/internal/infrastructure/repositories/member/member_repository_test.go
+++ b/grade/internal/infrastructure/repositories/member/member_repository_test.go
@@ -86,7 +86,7 @@ func testGet(t *testing.T, repositoryOption RepositoryOption) {
 	agg.Export(&exporterActual)
 	assert.Greater(t, int(exporterActual.Id.MemberId), 0)
 
-	id, err := memberVal.NewTenantMemberId(
+	id, err := memberVal.NewMemberId(
 		uint(exporterActual.Id.TenantId),
 		uint(exporterActual.Id.MemberId),
 	)
diff --git a/grade/internal/infrastructure/repositories/member/queries/member_get_query.go b/grade/internal/infrastructure/repositories/member/queries/member_get_query.go
index 067baa9b..562d3af5 100644
--- a/grade/internal/infrastructure/repositories/member/queries/member_get_query.go
+++ b/grade/internal/infrastructure/repositories/member/queries/member_get_query.go
@@ -7,7 +7,7 @@ import (
 )
 
 type MemberGetQuery struct {
-	Id memberVal.TenantMemberId
+	Id memberVal.MemberId
 }
 
 func (q MemberGetQuery) sql() string {
@@ -19,7 +19,7 @@ func (q MemberGetQuery) sql() string {
 }
 
 func (q MemberGetQuery) params() []any {
-	var idExp memberVal.TenantMemberIdExporter
+	var idExp memberVal.MemberIdExporter
 	q.Id.Export(&idExp)
 	return []any{idExp.TenantId, idExp.MemberId}
 }
diff --git a/grade/internal/infrastructure/repositories/member/queries/member_insert_query.go b/grade/internal/infrastructure/repositories/member/queries/member_insert_query.go
index bc8deaf9..736810ca 100644
--- a/grade/internal/infrastructure/repositories/member/queries/member_insert_query.go
+++ b/grade/internal/infrastructure/repositories/member/queries/member_insert_query.go
@@ -23,7 +23,7 @@ func (q MemberInsertQuery) sql() string {
 		RETURNING member_id`
 }
 
-func (q *MemberInsertQuery) SetId(val memberVal.TenantMemberId) {
+func (q *MemberInsertQuery) SetId(val memberVal.MemberId) {
 	val.Export(q)
 }
 
@@ -33,7 +33,7 @@ func (q *MemberInsertQuery) SetTenantId(val tenant.TenantId) {
 	q.params[0] = v
 }
 
-func (q *MemberInsertQuery) SetMemberId(val memberVal.MemberId) {
+func (q *MemberInsertQuery) SetMemberId(val memberVal.InternalMemberId) {
 	q.pkSetter = val.Scan
 }
 
diff --git a/grade/internal/infrastructure/repositories/specialist/queries/assignment/assignment_insert_query.go b/grade/internal/infrastructure/repositories/specialist/queries/assignment/assignment_insert_query.go
index 49cba3e0..8c0f97d2 100644
--- a/grade/internal/infrastructure/repositories/specialist/queries/assignment/assignment_insert_query.go
+++ b/grade/internal/infrastructure/repositories/specialist/queries/assignment/assignment_insert_query.go
@@ -22,8 +22,8 @@ func (q AssignmentInsertQuery) sql() string {
 		ON CONFLICT DO NOTHING`
 }
 
-func (q *AssignmentInsertQuery) SetSpecialistId(val memberVal.TenantMemberId) {
-	var v memberVal.TenantMemberIdExporter
+func (q *AssignmentInsertQuery) SetSpecialistId(val memberVal.MemberId) {
+	var v memberVal.MemberIdExporter
 	val.Export(&v)
 	q.params[0] = v.TenantId
 	q.params[1] = v.MemberId
diff --git a/grade/internal/infrastructure/repositories/specialist/queries/endorsement/endorsement_insert_query.go b/grade/internal/infrastructure/repositories/specialist/queries/endorsement/endorsement_insert_query.go
index b590654d..58627147 100644
--- a/grade/internal/infrastructure/repositories/specialist/queries/endorsement/endorsement_insert_query.go
+++ b/grade/internal/infrastructure/repositories/specialist/queries/endorsement/endorsement_insert_query.go
@@ -23,8 +23,8 @@ func (q EndorsementInsertQuery) sql() string {
 		ON CONFLICT DO NOTHING`
 }
 
-func (q *EndorsementInsertQuery) SetSpecialistId(val memberVal.TenantMemberId) {
-	var v memberVal.TenantMemberIdExporter
+func (q *EndorsementInsertQuery) SetSpecialistId(val memberVal.MemberId) {
+	var v memberVal.MemberIdExporter
 	val.Export(&v)
 	q.params[0] = v.TenantId
 	q.params[1] = v.MemberId
@@ -46,8 +46,8 @@ func (q *EndorsementInsertQuery) SetArtifactId(val artifactVal.TenantArtifactId)
 	q.params[4] = v.ArtifactId
 }
 
-func (q *EndorsementInsertQuery) SetEndorserId(val memberVal.TenantMemberId) {
-	var v memberVal.TenantMemberIdExporter
+func (q *EndorsementInsertQuery) SetEndorserId(val memberVal.MemberId) {
+	var v memberVal.MemberIdExporter
 	val.Export(&v)
 	q.params[5] = v.MemberId
 }