diff --git a/extendeddatasquare.go b/extendeddatasquare.go
index 5ff74ec..d2af8b1 100644
--- a/extendeddatasquare.go
+++ b/extendeddatasquare.go
@@ -60,7 +60,7 @@ func (eds *ExtendedDataSquare) UnmarshalJSON(b []byte) error {
 func ComputeExtendedDataSquare(
 	data [][]byte,
 	codec Codec,
-	treeConstructor TreeConstructorFn,
+	treeCreatorFn TreeConstructorFn,
 ) (*ExtendedDataSquare, error) {
 	if len(data) > codec.MaxChunks() {
 		return nil, errors.New("number of chunks exceeds the maximum")
@@ -72,12 +72,12 @@ func ComputeExtendedDataSquare(
 		return nil, err
 	}
 
-	ds, err := newDataSquare(data, treeConstructor, uint(chunkSize))
+	ds, err := newDataSquare(data, treeCreatorFn, uint(chunkSize))
 	if err != nil {
 		return nil, err
 	}
 
-	treeName := GetTreeNameFromConstructorFn(treeConstructor)
+	treeName := GetTreeNameFromConstructorFn(treeCreatorFn)
 	if treeName == "" {
 		return nil, errors.New("tree name not found")
 	}
@@ -95,7 +95,7 @@ func ComputeExtendedDataSquare(
 func ImportExtendedDataSquare(
 	data [][]byte,
 	codec Codec,
-	treeConstructor TreeConstructorFn,
+	treeCreatorFn TreeConstructorFn,
 ) (*ExtendedDataSquare, error) {
 	if len(data) > 4*codec.MaxChunks() {
 		return nil, errors.New("number of chunks exceeds the maximum")
@@ -107,7 +107,7 @@ func ImportExtendedDataSquare(
 		return nil, err
 	}
 
-	ds, err := newDataSquare(data, treeConstructor, uint(chunkSize))
+	ds, err := newDataSquare(data, treeCreatorFn, uint(chunkSize))
 	if err != nil {
 		return nil, err
 	}