diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000..a5648e2
Binary files /dev/null and b/.DS_Store differ
diff --git a/test/data_frame_integration_test.go b/test/data_frame_integration_test.go
index b5a927c..c200ea9 100644
--- a/test/data_frame_integration_test.go
+++ b/test/data_frame_integration_test.go
@@ -35,7 +35,7 @@ func TestDataFrame(t *testing.T) {
 		prefix:      prefix,
 	}
 
-	applyTestArgs(a, onlyError(insertDefault), onlyError(saveSignalDefault), onlyError(publishSignalDefault))
+	applyTestArgs(a, onlyError(insertDefault), onlyError(saveSignalsDefault), onlyError(publishSignalsDefault))
 
 	t0, t1 := getDefaultTimeRange()
 
diff --git a/test/evaluate_integration_test.go b/test/evaluate_integration_test.go
index 145e67f..a589620 100644
--- a/test/evaluate_integration_test.go
+++ b/test/evaluate_integration_test.go
@@ -37,10 +37,10 @@ func TestEvaluate(t *testing.T) {
 		prefix:      prefix,
 	}
 
-	applyTestArgs(a, onlyError(insertDefault), onlyError(saveSignalDefault), onlyError(publishSignalDefault))
+	applyTestArgs(a, onlyError(insertDefault), onlyError(saveSignalsDefault), onlyError(publishSignalsDefault))
 
 	t0, t1 := getDefaultTimeRange()
-	ir, err := selectItemDefault(a)
+	ir, err := selectItemsDefault(a)
 	if err != nil {
 		t.Errorf("%v", err)
 	}
@@ -171,7 +171,7 @@ func getListFromResponse(sir *clarify.SelectItemsResult) []string {
 //lint:ignore U1000 Ignore unused function temporarily for debugging
 func evaluateDefault(a TestArgs) (*clarify.EvaluateResult, error) {
 	query := createAnnotationQuery(a.prefix)
-	ir, err := selectItemDefault(a)
+	ir, err := selectItemsDefault(a)
 	if err != nil {
 		panic(err)
 	}
diff --git a/test/publish_signal_integration_test.go b/test/publish_signals_integration_test.go
similarity index 83%
rename from test/publish_signal_integration_test.go
rename to test/publish_signals_integration_test.go
index 195d43c..a8e5b84 100644
--- a/test/publish_signal_integration_test.go
+++ b/test/publish_signals_integration_test.go
@@ -27,7 +27,7 @@ import (
 	"golang.org/x/text/language"
 )
 
-func TestPublishSignal(t *testing.T) {
+func TestPublishSignals(t *testing.T) {
 	ctx := context.Background()
 	creds := getCredentials(t)
 	client := creds.Client(ctx)
@@ -40,7 +40,7 @@ func TestPublishSignal(t *testing.T) {
 		prefix:      prefix,
 	}
 
-	applyTestArgs(a, onlyError(insertDefault), onlyError(saveSignalDefault))
+	applyTestArgs(a, onlyError(insertDefault), onlyError(saveSignalsDefault))
 
 	type testCase struct {
 		testArgs       TestArgs
@@ -52,7 +52,7 @@ func TestPublishSignal(t *testing.T) {
 		return func(t *testing.T) {
 			t.Helper()
 
-			result, err := publishSignal(tc.testArgs.ctx, tc.testArgs.integration, tc.testArgs.prefix, tc.config)
+			result, err := publishSignals(tc.testArgs.ctx, tc.testArgs.integration, tc.testArgs.prefix, tc.config)
 			if err != nil {
 				t.Errorf("Unexpected error: %v", err)
 			} else if !tc.expectedFields(result) {
@@ -73,7 +73,7 @@ func TestPublishSignal(t *testing.T) {
 	}))
 }
 
-func publishSignal(ctx context.Context, integration string, prefix string, cfg *automation.Config) (*clarify.PublishSignalsResult, error) {
+func publishSignals(ctx context.Context, integration string, prefix string, cfg *automation.Config) (*clarify.PublishSignalsResult, error) {
 	keyExamplePublish := "clarify/clarify-go/example/publish"
 	annotationTrue := "true"
 	transformVersion := "v2"
@@ -85,7 +85,7 @@ func publishSignal(ctx context.Context, integration string, prefix string, cfg *
 		},
 		TransformVersion: transformVersion,
 		Transforms: []func(item *views.ItemSave){
-			transformEnumValuesToFireEmoji,
+			transformEnumValuesToEmoji,
 			transformLabelValuesToTitle,
 			createTransform(prefix),
 		},
@@ -95,9 +95,7 @@ func publishSignal(ctx context.Context, integration string, prefix string, cfg *
 	return nil, err
 }
 
-// transformEnumValuesToFireEmoji is an example transform that replaces the enum
-// values "on fire" and "not on fire" with appropriate emoji.
-func transformEnumValuesToFireEmoji(item *views.ItemSave) {
+func transformEnumValuesToEmoji(item *views.ItemSave) {
 	for i := range item.EnumValues {
 		item.EnumValues[i] = getRandom(emojiList)
 	}
@@ -135,6 +133,6 @@ func defaultCfg(client *clarify.Client) *automation.Config {
 	return cfg
 }
 
-func publishSignalDefault(a TestArgs) (*clarify.PublishSignalsResult, error) {
-	return publishSignal(a.ctx, a.integration, a.prefix, defaultCfg(a.client))
+func publishSignalsDefault(a TestArgs) (*clarify.PublishSignalsResult, error) {
+	return publishSignals(a.ctx, a.integration, a.prefix, defaultCfg(a.client))
 }
diff --git a/test/save_signal_integration_test.go b/test/save_signals_integration_test.go
similarity index 97%
rename from test/save_signal_integration_test.go
rename to test/save_signals_integration_test.go
index a01aa1d..dc34dd7 100644
--- a/test/save_signal_integration_test.go
+++ b/test/save_signals_integration_test.go
@@ -124,6 +124,6 @@ func createEnumValues() fields.EnumValues {
 	return ev
 }
 
-func saveSignalDefault(a TestArgs) (*clarify.SaveSignalsResult, error) {
+func saveSignalsDefault(a TestArgs) (*clarify.SaveSignalsResult, error) {
 	return saveSignal(a.ctx, a.client, a.prefix)
 }
diff --git a/test/select_items_integration_test.go b/test/select_items_integration_test.go
index 83f9744..c5402e8 100644
--- a/test/select_items_integration_test.go
+++ b/test/select_items_integration_test.go
@@ -35,7 +35,7 @@ func TestSelectItems(t *testing.T) {
 		prefix:      prefix,
 	}
 
-	applyTestArgs(a, onlyError(insertDefault), onlyError(saveSignalDefault), onlyError(publishSignalDefault))
+	applyTestArgs(a, onlyError(insertDefault), onlyError(saveSignalsDefault), onlyError(publishSignalsDefault))
 
 	type testCase struct {
 		testArgs       TestArgs
@@ -47,7 +47,7 @@ func TestSelectItems(t *testing.T) {
 		return func(t *testing.T) {
 			t.Helper()
 
-			result, err := selectItem(tc.testArgs.ctx, tc.testArgs.client, tc.items)
+			result, err := selectItems(tc.testArgs.ctx, tc.testArgs.client, tc.items)
 			if err != nil {
 				t.Errorf("Unexpected error: %v", err)
 			} else if !tc.expectedFields(result) {
@@ -67,14 +67,14 @@ func TestSelectItems(t *testing.T) {
 	}))
 }
 
-func selectItem(ctx context.Context, client *clarify.Client, items fields.ResourceQuery) (*clarify.SelectItemsResult, error) {
+func selectItems(ctx context.Context, client *clarify.Client, items fields.ResourceQuery) (*clarify.SelectItemsResult, error) {
 	result, err := client.Clarify().SelectItems(items).Do(ctx)
 
 	return result, err
 }
 
-func selectItemDefault(a TestArgs) (*clarify.SelectItemsResult, error) {
+func selectItemsDefault(a TestArgs) (*clarify.SelectItemsResult, error) {
 	items := createAnnotationQuery(a.prefix)
 
-	return selectItem(a.ctx, a.client, items)
+	return selectItems(a.ctx, a.client, items)
 }
diff --git a/test/select_signal_integration_test.go b/test/select_signals_integration_test.go
similarity index 81%
rename from test/select_signal_integration_test.go
rename to test/select_signals_integration_test.go
index ebdc71e..b249668 100644
--- a/test/select_signal_integration_test.go
+++ b/test/select_signals_integration_test.go
@@ -34,7 +34,7 @@ func TestSelectSignal(t *testing.T) {
 		prefix:      prefix,
 	}
 
-	applyTestArgs(a, onlyError(insertDefault), onlyError(saveSignalDefault))
+	applyTestArgs(a, onlyError(insertDefault), onlyError(saveSignalsDefault))
 
 	type testCase struct {
 		testArgs       TestArgs
@@ -46,7 +46,7 @@ func TestSelectSignal(t *testing.T) {
 		return func(t *testing.T) {
 			t.Helper()
 
-			result, err := selectSignal(tc.testArgs.ctx, tc.testArgs.client, tc.testArgs.integration, tc.signals)
+			result, err := selectSignals(tc.testArgs.ctx, tc.testArgs.client, tc.testArgs.integration, tc.signals)
 			if err != nil {
 				t.Errorf("Unexpected error: %v", err)
 			} else if !tc.expectedFields(result) {
@@ -66,15 +66,15 @@ func TestSelectSignal(t *testing.T) {
 	}))
 }
 
-func selectSignal(ctx context.Context, client *clarify.Client, integration string, signals fields.ResourceQuery) (*clarify.SelectSignalsResult, error) {
+func selectSignals(ctx context.Context, client *clarify.Client, integration string, signals fields.ResourceQuery) (*clarify.SelectSignalsResult, error) {
 	result, err := client.Admin().SelectSignals(integration, signals).Do(ctx)
 
 	return result, err
 }
 
 //lint:ignore U1000 Ignore unused function temporarily for debugging
-func selectSignalDefault(a TestArgs) (*clarify.SelectSignalsResult, error) {
+func selectSignalsDefault(a TestArgs) (*clarify.SelectSignalsResult, error) {
 	signals := createAnnotationQuery(a.prefix)
 
-	return selectSignal(a.ctx, a.client, a.integration, signals)
+	return selectSignals(a.ctx, a.client, a.integration, signals)
 }