diff --git a/pkg/expr/expr.go b/pkg/expr/expr.go
index 6892206e66d2b460fbc3d7a19536651cebb43396..3f346889f52af08e87a431caecf1513768fc12c1 100644
--- a/pkg/expr/expr.go
+++ b/pkg/expr/expr.go
@@ -31,8 +31,8 @@ func Eval(ctx context.Context, input string, env map[string]interface{}) (interf
 	}
 
 	for k, v := range env {
-		if mapper, ok := v.(ExprMapper); ok {
-			e[k] = mapper.ToExprMap()
+		if mapper, ok := v.(Mapper); ok {
+			e[k] = mapper.ToMap()
 			continue
 		}
 
@@ -85,6 +85,6 @@ func IsExpression(input string) bool {
 	return false
 }
 
-type ExprMapper interface {
-    ToExprMap() map[string]interface{}
+type Mapper interface {
+    ToMap() map[string]interface{}
 }
\ No newline at end of file
diff --git a/pkg/files/file.go b/pkg/files/file.go
index 983e04289675a3f0ee4da1e26aa292ba674794b6..fc12151b69655ecef0a8f6309c54e02e65fc76f0 100644
--- a/pkg/files/file.go
+++ b/pkg/files/file.go
@@ -47,7 +47,7 @@ func (f *File) SetURLWithTemplate(t *template.Template) error {
 	return nil
 }
 
-func (f File) ToExprMap() map[string]interface{} {
+func (f File) ToMap() map[string]interface{} {
 	return map[string]interface{}{
 		"id":        f.ID,
 		"name":      f.Name,
diff --git a/pkg/references/reference.go b/pkg/references/reference.go
index 45c80dfdab89e57712cf670ba4cbd9bbc58d759a..b1b56953f98131dfebf69c41c3ff53299ff09384 100644
--- a/pkg/references/reference.go
+++ b/pkg/references/reference.go
@@ -25,7 +25,7 @@ func (r *Reference) MarshalBSON() ([]byte, error) {
 	return bson.Marshal(d)
 }
 
-func (r *Reference) ToExprMap() map[string]interface{} {
+func (r *Reference) ToMap() map[string]interface{} {
 	return map[string]interface{}{
 		"collection_id": r.CollectionID,
 		"id":            r.ID,