diff --git a/codecov.yml b/codecov.yml
index 041fbf497..df8694f03 100644
--- a/codecov.yml
+++ b/codecov.yml
@@ -31,7 +31,6 @@ codecov:
 ignore:
   - "**/*_generated.go"
   - "**/*_mock.go"
-  - "**/mock_*.go"
   - "**/testdata/**"
   - "**/*_test.go"
   - "**/*_testsuite.go"
diff --git a/internal/internal_public.go b/internal/internal_public.go
index d51b65e7d..822c5c8dd 100644
--- a/internal/internal_public.go
+++ b/internal/internal_public.go
@@ -33,7 +33,7 @@ import (
 	s "go.uber.org/cadence/.gen/go/shared"
 )
 
-//go:generate mockery --name WorkflowTaskHandler --inpackage --with-expecter --case snake --boilerplate-file ../LICENSE
+//go:generate mockery --name WorkflowTaskHandler --inpackage --with-expecter --case snake --filename internal_workflow_task_handler_mock.go --boilerplate-file ../LICENSE
 
 type (
 	decisionHeartbeatFunc func(response interface{}, startTime time.Time) (*workflowTask, error)
diff --git a/internal/internal_task_pollers.go b/internal/internal_task_pollers.go
index 8b6aa80ab..49abaede5 100644
--- a/internal/internal_task_pollers.go
+++ b/internal/internal_task_pollers.go
@@ -45,7 +45,7 @@ import (
 	"go.uber.org/cadence/internal/common/serializer"
 )
 
-//go:generate mockery --name localDispatcher --inpackage --with-expecter --case snake --boilerplate-file ../LICENSE
+//go:generate mockery --name localDispatcher --inpackage --with-expecter --case snake --filename local_dispatcher_mock.go --boilerplate-file ../LICENSE
 
 const (
 	pollTaskServiceTimeOut = 150 * time.Second // Server long poll is 2 * Minutes + delta
diff --git a/internal/mock_workflow_task_handler.go b/internal/internal_workflow_task_handler_mock.go
similarity index 100%
rename from internal/mock_workflow_task_handler.go
rename to internal/internal_workflow_task_handler_mock.go
diff --git a/internal/mock_local_dispatcher.go b/internal/local_dispatcher_mock.go
similarity index 100%
rename from internal/mock_local_dispatcher.go
rename to internal/local_dispatcher_mock.go