diff --git a/pkg/api/datasources.go b/pkg/api/datasources.go
index 0142cd8878d..40026eeba17 100644
--- a/pkg/api/datasources.go
+++ b/pkg/api/datasources.go
@@ -24,7 +24,7 @@ import (
 )
 
 var datasourcesLogger = log.New("datasources")
-var secretsPluginError *models.ErrDatasourceSecretsPlugin
+var secretsPluginError *models.ErrDatasourceSecretsPluginUserFriendly
 
 func (hs *HTTPServer) GetDataSources(c *models.ReqContext) response.Response {
 	query := models.GetDataSourcesQuery{OrgId: c.OrgId, DataSourceLimit: hs.Cfg.DataSourceLimit}
diff --git a/pkg/models/datasource.go b/pkg/models/datasource.go
index 655dfab09e7..75e2f334516 100644
--- a/pkg/models/datasource.go
+++ b/pkg/models/datasource.go
@@ -82,11 +82,11 @@ func (ds DataSource) AllowedCookies() []string {
 }
 
 // Specific error type for grpc secrets management so that we can show more detailed plugin errors to users
-type ErrDatasourceSecretsPlugin struct {
+type ErrDatasourceSecretsPluginUserFriendly struct {
 	Err error
 }
 
-func (e ErrDatasourceSecretsPlugin) Error() string {
+func (e ErrDatasourceSecretsPluginUserFriendly) Error() string {
 	return e.Err.Error()
 }
 
diff --git a/pkg/services/secrets/kvstore/remote_plugin.go b/pkg/services/secrets/kvstore/remote_plugin.go
index 2e00635a6c1..e5e4fec8f83 100644
--- a/pkg/services/secrets/kvstore/remote_plugin.go
+++ b/pkg/services/secrets/kvstore/remote_plugin.go
@@ -125,6 +125,6 @@ func parseKeys(keys []*smp.Key) []Key {
 	return newKeys
 }
 
-func wrapUserFriendlySecretError(ufe string) models.ErrDatasourceSecretsPlugin {
-	return models.ErrDatasourceSecretsPlugin{Err: errors.New(ufe)}
+func wrapUserFriendlySecretError(ufe string) models.ErrDatasourceSecretsPluginUserFriendly {
+	return models.ErrDatasourceSecretsPluginUserFriendly{Err: errors.New(ufe)}
 }