diff --git a/handler/api/card/create_test.go b/handler/api/card/create_test.go
index f987ec829..0fb31c1e8 100644
--- a/handler/api/card/create_test.go
+++ b/handler/api/card/create_test.go
@@ -78,7 +78,7 @@ func TestHandleCreate(t *testing.T) {
 	step.EXPECT().FindNumber(gomock.Any(), dummyStage.ID, gomock.Any()).Return(dummyStep, nil)
 
 	card := mock.NewMockCardStore(controller)
-	card.EXPECT().CreateCard(gomock.Any(), gomock.Any(), gomock.Any()).Return(nil)
+	card.EXPECT().Create(gomock.Any(), gomock.Any(), gomock.Any()).Return(nil)
 
 	c := new(chi.Context)
 	c.URLParams.Add("owner", "octocat")
@@ -144,7 +144,7 @@ func TestHandleCreate_CreateError(t *testing.T) {
 	step.EXPECT().FindNumber(gomock.Any(), dummyStage.ID, gomock.Any()).Return(dummyStep, nil)
 
 	card := mock.NewMockCardStore(controller)
-	card.EXPECT().CreateCard(gomock.Any(), gomock.Any(), gomock.Any()).Return(errors.ErrNotFound)
+	card.EXPECT().Create(gomock.Any(), gomock.Any(), gomock.Any()).Return(errors.ErrNotFound)
 
 	c := new(chi.Context)
 	c.URLParams.Add("owner", "octocat")
diff --git a/handler/api/card/delete_test.go b/handler/api/card/delete_test.go
index 0194816d2..21999c1ec 100644
--- a/handler/api/card/delete_test.go
+++ b/handler/api/card/delete_test.go
@@ -38,8 +38,8 @@ func TestHandleDelete(t *testing.T) {
 	step.EXPECT().FindNumber(gomock.Any(), dummyStage.ID, gomock.Any()).Return(dummyStep, nil)
 
 	card := mock.NewMockCardStore(controller)
-	card.EXPECT().FindCard(gomock.Any(), dummyStep.ID).Return(dummyCard, nil)
-	card.EXPECT().DeleteCard(gomock.Any(), dummyCard.Id).Return(nil)
+	card.EXPECT().Find(gomock.Any(), dummyStep.ID).Return(dummyCard, nil)
+	card.EXPECT().Delete(gomock.Any(), dummyCard.Id).Return(nil)
 
 	c := new(chi.Context)
 	c.URLParams.Add("owner", "octocat")
@@ -77,7 +77,7 @@ func TestHandleDelete_CardNotFound(t *testing.T) {
 	step.EXPECT().FindNumber(gomock.Any(), dummyStage.ID, gomock.Any()).Return(dummyStep, nil)
 
 	card := mock.NewMockCardStore(controller)
-	card.EXPECT().FindCard(gomock.Any(), dummyStep.ID).Return(nil, errors.ErrNotFound)
+	card.EXPECT().Find(gomock.Any(), dummyStep.ID).Return(nil, errors.ErrNotFound)
 
 	c := new(chi.Context)
 	c.URLParams.Add("owner", "octocat")
@@ -121,8 +121,8 @@ func TestHandleDelete_DeleteError(t *testing.T) {
 	step.EXPECT().FindNumber(gomock.Any(), dummyStage.ID, gomock.Any()).Return(dummyStep, nil)
 
 	card := mock.NewMockCardStore(controller)
-	card.EXPECT().FindCard(gomock.Any(), dummyStep.ID).Return(dummyCard, nil)
-	card.EXPECT().DeleteCard(gomock.Any(), dummyCard.Id).Return(errors.ErrNotFound)
+	card.EXPECT().Find(gomock.Any(), dummyStep.ID).Return(dummyCard, nil)
+	card.EXPECT().Delete(gomock.Any(), dummyCard.Id).Return(errors.ErrNotFound)
 
 	c := new(chi.Context)
 	c.URLParams.Add("owner", "octocat")
diff --git a/handler/api/card/find_all_test.go b/handler/api/card/find_all_test.go
index b0bdf08be..22b191276 100644
--- a/handler/api/card/find_all_test.go
+++ b/handler/api/card/find_all_test.go
@@ -33,7 +33,7 @@ func TestHandleFindAll(t *testing.T) {
 	build.EXPECT().FindNumber(gomock.Any(), dummyBuild.ID, gomock.Any()).Return(dummyBuild, nil)
 
 	card := mock.NewMockCardStore(controller)
-	card.EXPECT().FindCardByBuild(gomock.Any(), dummyBuild.ID).Return(dummyCardList, nil)
+	card.EXPECT().FindByBuild(gomock.Any(), dummyBuild.ID).Return(dummyCardList, nil)
 
 	c := new(chi.Context)
 	c.URLParams.Add("owner", "octocat")
@@ -66,7 +66,7 @@ func TestHandleFindAll_CardsNotFound(t *testing.T) {
 	build.EXPECT().FindNumber(gomock.Any(), dummyBuild.ID, gomock.Any()).Return(dummyBuild, nil)
 
 	card := mock.NewMockCardStore(controller)
-	card.EXPECT().FindCardByBuild(gomock.Any(), dummyBuild.ID).Return(nil, errors.ErrNotFound)
+	card.EXPECT().FindByBuild(gomock.Any(), dummyBuild.ID).Return(nil, errors.ErrNotFound)
 
 	c := new(chi.Context)
 	c.URLParams.Add("owner", "octocat")
diff --git a/handler/api/card/find_data_test.go b/handler/api/card/find_data_test.go
index 2ea749b03..42789d17c 100644
--- a/handler/api/card/find_data_test.go
+++ b/handler/api/card/find_data_test.go
@@ -37,8 +37,8 @@ func TestHandleFindCardData(t *testing.T) {
 	step.EXPECT().FindNumber(gomock.Any(), dummyStage.ID, gomock.Any()).Return(dummyStep, nil)
 
 	card := mock.NewMockCardStore(controller)
-	card.EXPECT().FindCard(gomock.Any(), dummyStep.ID).Return(dummyCard, nil)
-	card.EXPECT().FindCardData(gomock.Any(), dummyCard.Id).Return(dummyCardData, nil)
+	card.EXPECT().Find(gomock.Any(), dummyStep.ID).Return(dummyCard, nil)
+	card.EXPECT().FindData(gomock.Any(), dummyCard.Id).Return(dummyCardData, nil)
 
 	c := new(chi.Context)
 	c.URLParams.Add("owner", "octocat")
diff --git a/handler/api/card/find_test.go b/handler/api/card/find_test.go
index 78b2c412c..c9dfc0a50 100644
--- a/handler/api/card/find_test.go
+++ b/handler/api/card/find_test.go
@@ -39,7 +39,7 @@ func TestHandleFind(t *testing.T) {
 	step.EXPECT().FindNumber(gomock.Any(), dummyStage.ID, gomock.Any()).Return(dummyStep, nil)
 
 	card := mock.NewMockCardStore(controller)
-	card.EXPECT().FindCard(gomock.Any(), dummyStep.ID).Return(dummyCard, nil)
+	card.EXPECT().Find(gomock.Any(), dummyStep.ID).Return(dummyCard, nil)
 
 	c := new(chi.Context)
 	c.URLParams.Add("owner", "octocat")
@@ -80,7 +80,7 @@ func TestHandleFind_CardNotFound(t *testing.T) {
 	step.EXPECT().FindNumber(gomock.Any(), dummyStage.ID, gomock.Any()).Return(dummyStep, nil)
 
 	card := mock.NewMockCardStore(controller)
-	card.EXPECT().FindCard(gomock.Any(), dummyStep.ID).Return(nil, errors.ErrNotFound)
+	card.EXPECT().Find(gomock.Any(), dummyStep.ID).Return(nil, errors.ErrNotFound)
 
 	c := new(chi.Context)
 	c.URLParams.Add("owner", "octocat")