diff --git a/pkg/notes/fakes/historic_kilnfile.go b/pkg/notes/fakes/internal/historic_kilnfile.go
similarity index 99%
rename from pkg/notes/fakes/historic_kilnfile.go
rename to pkg/notes/fakes/internal/historic_kilnfile.go
index 8a05a0452..be77383d7 100644
--- a/pkg/notes/fakes/historic_kilnfile.go
+++ b/pkg/notes/fakes/internal/historic_kilnfile.go
@@ -1,5 +1,5 @@
 // Code generated by counterfeiter. DO NOT EDIT.
-package fakes
+package internal
 
 import (
 	"sync"
diff --git a/pkg/notes/fakes/historic_version.go b/pkg/notes/fakes/internal/historic_version.go
similarity index 99%
rename from pkg/notes/fakes/historic_version.go
rename to pkg/notes/fakes/internal/historic_version.go
index b3d47fb2e..030abb630 100644
--- a/pkg/notes/fakes/historic_version.go
+++ b/pkg/notes/fakes/internal/historic_version.go
@@ -1,5 +1,5 @@
 // Code generated by counterfeiter. DO NOT EDIT.
-package fakes
+package internal
 
 import (
 	"sync"
diff --git a/pkg/notes/fakes/issue_getter.go b/pkg/notes/fakes/internal/issue_getter.go
similarity index 99%
rename from pkg/notes/fakes/issue_getter.go
rename to pkg/notes/fakes/internal/issue_getter.go
index 3dbaa90cc..adf03e3c3 100644
--- a/pkg/notes/fakes/issue_getter.go
+++ b/pkg/notes/fakes/internal/issue_getter.go
@@ -1,5 +1,5 @@
 // Code generated by counterfeiter. DO NOT EDIT.
-package fakes
+package internal
 
 import (
 	"context"
diff --git a/pkg/notes/fakes/issues_by_repo_lister.go b/pkg/notes/fakes/internal/issues_by_repo_lister.go
similarity index 99%
rename from pkg/notes/fakes/issues_by_repo_lister.go
rename to pkg/notes/fakes/internal/issues_by_repo_lister.go
index f63c2368d..2d1e69d27 100644
--- a/pkg/notes/fakes/issues_by_repo_lister.go
+++ b/pkg/notes/fakes/internal/issues_by_repo_lister.go
@@ -1,5 +1,5 @@
 // Code generated by counterfeiter. DO NOT EDIT.
-package fakes
+package internal
 
 import (
 	"context"
diff --git a/pkg/notes/fakes/issues_service.go b/pkg/notes/fakes/internal/issues_service.go
similarity index 99%
rename from pkg/notes/fakes/issues_service.go
rename to pkg/notes/fakes/internal/issues_service.go
index fb4af88f0..a27671607 100644
--- a/pkg/notes/fakes/issues_service.go
+++ b/pkg/notes/fakes/internal/issues_service.go
@@ -1,5 +1,5 @@
 // Code generated by counterfeiter. DO NOT EDIT.
-package fakes
+package internal
 
 import (
 	"context"
diff --git a/pkg/notes/fakes/milestone_lister.go b/pkg/notes/fakes/internal/milestone_lister.go
similarity index 99%
rename from pkg/notes/fakes/milestone_lister.go
rename to pkg/notes/fakes/internal/milestone_lister.go
index 02d2c029d..cacc9d5f6 100644
--- a/pkg/notes/fakes/milestone_lister.go
+++ b/pkg/notes/fakes/internal/milestone_lister.go
@@ -1,5 +1,5 @@
 // Code generated by counterfeiter. DO NOT EDIT.
-package fakes
+package internal
 
 import (
 	"context"
diff --git a/pkg/notes/fakes/releases_service.go b/pkg/notes/fakes/internal/releases_service.go
similarity index 99%
rename from pkg/notes/fakes/releases_service.go
rename to pkg/notes/fakes/internal/releases_service.go
index 0d89fd752..957c970fa 100644
--- a/pkg/notes/fakes/releases_service.go
+++ b/pkg/notes/fakes/internal/releases_service.go
@@ -1,5 +1,5 @@
 // Code generated by counterfeiter. DO NOT EDIT.
-package fakes
+package internal
 
 import (
 	"context"
diff --git a/pkg/notes/fakes/revision_resolver.go b/pkg/notes/fakes/internal/revision_resolver.go
similarity index 99%
rename from pkg/notes/fakes/revision_resolver.go
rename to pkg/notes/fakes/internal/revision_resolver.go
index 68269f21a..c496d18c3 100644
--- a/pkg/notes/fakes/revision_resolver.go
+++ b/pkg/notes/fakes/internal/revision_resolver.go
@@ -1,5 +1,5 @@
 // Code generated by counterfeiter. DO NOT EDIT.
-package fakes
+package internal
 
 import (
 	"sync"
diff --git a/pkg/notes/notes_data.go b/pkg/notes/notes_data.go
index cdadf6215..37f4656ef 100644
--- a/pkg/notes/notes_data.go
+++ b/pkg/notes/notes_data.go
@@ -269,15 +269,15 @@ func (r fetchNotesData) kilnfileFromWorktree(kilnfilePath string) (cargo.Kilnfil
 	return wtKf, nil
 }
 
-//counterfeiter:generate -o ./fakes/historic_version.go --fake-name HistoricVersion . historicVersion
+//counterfeiter:generate -o ./fakes/internal/historic_version.go --fake-name HistoricVersion . historicVersion
 
 type historicVersion func(repo storer.EncodedObjectStorer, commitHash plumbing.Hash, kilnfilePath string) (string, error)
 
-//counterfeiter:generate -o ./fakes/historic_kilnfile.go --fake-name HistoricKilnfile . historicKilnfile
+//counterfeiter:generate -o ./fakes/internal/historic_kilnfile.go --fake-name HistoricKilnfile . historicKilnfile
 
 type historicKilnfile func(repo storer.EncodedObjectStorer, commitHash plumbing.Hash, kilnfilePath string) (cargo.Kilnfile, cargo.KilnfileLock, error)
 
-//counterfeiter:generate -o ./fakes/revision_resolver.go --fake-name RevisionResolver . revisionResolver
+//counterfeiter:generate -o ./fakes/internal/revision_resolver.go --fake-name RevisionResolver . revisionResolver
 
 type revisionResolver interface {
 	ResolveRevision(rev plumbing.Revision) (*plumbing.Hash, error)
@@ -314,8 +314,8 @@ func (r fetchNotesData) fetchHistoricFiles(kilnfilePath, start, end string) (klI
 	return klInitial, klFinal, kfFinal, v, nil
 }
 
-//counterfeiter:generate -o ./fakes/releases_service.go --fake-name ReleaseService github.com/pivotal-cf/kiln/pkg/cargo.RepositoryReleaseLister
-//counterfeiter:generate -o ./fakes/issues_service.go --fake-name IssuesService . issuesService
+//counterfeiter:generate -o ./fakes/internal/releases_service.go --fake-name ReleaseService github.com/pivotal-cf/kiln/pkg/cargo.RepositoryReleaseLister
+//counterfeiter:generate -o ./fakes/internal/issues_service.go --fake-name IssuesService . issuesService
 
 type issuesService interface {
 	issueGetter
@@ -355,7 +355,7 @@ func (r fetchNotesData) fetchIssuesAndReleaseNotes(ctx context.Context, finalKF,
 	return appendFilterAndSortIssues(issues, additionalIssues, issuesQuery.IssueTitleExp), bumpList, nil
 }
 
-//counterfeiter:generate -o ./fakes/issue_getter.go --fake-name IssueGetter . issueGetter
+//counterfeiter:generate -o ./fakes/internal/issue_getter.go --fake-name IssueGetter . issueGetter
 
 type issueGetter interface {
 	Get(ctx context.Context, owner string, repo string, number int) (*github.Issue, *github.Response, error)
@@ -380,7 +380,7 @@ func issuesFromIssueIDs(ctx context.Context, issuesService issueGetter, repoOwne
 	return issues, nil
 }
 
-//counterfeiter:generate -o ./fakes/milestone_lister.go --fake-name MilestoneLister . milestoneLister
+//counterfeiter:generate -o ./fakes/internal/milestone_lister.go --fake-name MilestoneLister . milestoneLister
 
 type milestoneLister interface {
 	ListMilestones(ctx context.Context, owner string, repo string, opts *github.MilestoneListOptions) ([]*github.Milestone, *github.Response, error)
@@ -418,7 +418,7 @@ func resolveMilestoneNumber(ctx context.Context, issuesService milestoneLister,
 	}
 }
 
-//counterfeiter:generate -o ./fakes/issues_by_repo_lister.go --fake-name IssuesByRepoLister . issuesByRepoLister
+//counterfeiter:generate -o ./fakes/internal/issues_by_repo_lister.go --fake-name IssuesByRepoLister . issuesByRepoLister
 
 type issuesByRepoLister interface {
 	ListByRepo(ctx context.Context, owner string, repo string, opts *github.IssueListByRepoOptions) ([]*github.Issue, *github.Response, error)