diff --git a/plugin/bind/bind.go b/plugin/bind/bind.go
index bd3c32b51..c4a1306db 100644
--- a/plugin/bind/bind.go
+++ b/plugin/bind/bind.go
@@ -6,6 +6,6 @@ import "github.com/mholt/caddy"
 func init() {
 	caddy.RegisterPlugin("bind", caddy.Plugin{
 		ServerType: "dns",
-		Action:     setupBind,
+		Action:     setup,
 	})
 }
diff --git a/plugin/bind/bind_test.go b/plugin/bind/bind_test.go
index 9b1dc54aa..9e278418b 100644
--- a/plugin/bind/bind_test.go
+++ b/plugin/bind/bind_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/mholt/caddy"
 )
 
-func TestSetupBind(t *testing.T) {
+func TestSetup(t *testing.T) {
 	for i, test := range []struct {
 		config   string
 		expected []string
@@ -22,7 +22,7 @@ func TestSetupBind(t *testing.T) {
 		{`bind ::1 1.2.3.4 ::5 127.9.9.0 noone`, nil, true},
 	} {
 		c := caddy.NewTestController("dns", test.config)
-		err := setupBind(c)
+		err := setup(c)
 		if err != nil {
 			if !test.failing {
 				t.Fatalf("test %d, expected no errors, but got: %v", i, err)
diff --git a/plugin/bind/setup.go b/plugin/bind/setup.go
index a57e8ffce..e487855c9 100644
--- a/plugin/bind/setup.go
+++ b/plugin/bind/setup.go
@@ -10,7 +10,7 @@ import (
 	"github.com/mholt/caddy"
 )
 
-func setupBind(c *caddy.Controller) error {
+func setup(c *caddy.Controller) error {
 	config := dnsserver.GetConfig(c)
 
 	// addresses will be consolidated over all BIND directives available in that BlocServer
diff --git a/plugin/erratic/setup.go b/plugin/erratic/setup.go
index b0a56927d..52c4d245c 100644
--- a/plugin/erratic/setup.go
+++ b/plugin/erratic/setup.go
@@ -14,11 +14,11 @@ import (
 func init() {
 	caddy.RegisterPlugin("erratic", caddy.Plugin{
 		ServerType: "dns",
-		Action:     setupErratic,
+		Action:     setup,
 	})
 }
 
-func setupErratic(c *caddy.Controller) error {
+func setup(c *caddy.Controller) error {
 	e, err := parseErratic(c)
 	if err != nil {
 		return plugin.Error("erratic", err)
diff --git a/plugin/erratic/setup_test.go b/plugin/erratic/setup_test.go
index 759845f7a..4ff9bacd2 100644
--- a/plugin/erratic/setup_test.go
+++ b/plugin/erratic/setup_test.go
@@ -6,23 +6,23 @@ import (
 	"github.com/mholt/caddy"
 )
 
-func TestSetupErratic(t *testing.T) {
+func TestSetup(t *testing.T) {
 	c := caddy.NewTestController("dns", `erratic {
 		drop
 	}`)
-	if err := setupErratic(c); err != nil {
+	if err := setup(c); err != nil {
 		t.Fatalf("Test 1, expected no errors, but got: %q", err)
 	}
 
 	c = caddy.NewTestController("dns", `erratic`)
-	if err := setupErratic(c); err != nil {
+	if err := setup(c); err != nil {
 		t.Fatalf("Test 2, expected no errors, but got: %q", err)
 	}
 
 	c = caddy.NewTestController("dns", `erratic {
 		drop -1
 	}`)
-	if err := setupErratic(c); err == nil {
+	if err := setup(c); err == nil {
 		t.Fatalf("Test 4, expected errors, but got: %q", err)
 	}
 }
diff --git a/plugin/reverse/setup.go b/plugin/reverse/setup.go
index db7ddd665..d6fc841ad 100644
--- a/plugin/reverse/setup.go
+++ b/plugin/reverse/setup.go
@@ -17,11 +17,11 @@ import (
 func init() {
 	caddy.RegisterPlugin("reverse", caddy.Plugin{
 		ServerType: "dns",
-		Action:     setupReverse,
+		Action:     setup,
 	})
 }
 
-func setupReverse(c *caddy.Controller) error {
+func setup(c *caddy.Controller) error {
 	networks, fall, err := reverseParse(c)
 	if err != nil {
 		return plugin.Error("reverse", err)
diff --git a/plugin/reverse/setup_test.go b/plugin/reverse/setup_test.go
index 5b4c04e82..3c88bc8e1 100644
--- a/plugin/reverse/setup_test.go
+++ b/plugin/reverse/setup_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/mholt/caddy"
 )
 
-func TestSetupParse(t *testing.T) {
+func TestSetup(t *testing.T) {
 
 	_, net4, _ := net.ParseCIDR("10.1.1.0/24")
 	_, net6, _ := net.ParseCIDR("fd01::/64")
diff --git a/plugin/whoami/setup.go b/plugin/whoami/setup.go
index 9797c8bbf..bd4971ae9 100644
--- a/plugin/whoami/setup.go
+++ b/plugin/whoami/setup.go
@@ -10,11 +10,11 @@ import (
 func init() {
 	caddy.RegisterPlugin("whoami", caddy.Plugin{
 		ServerType: "dns",
-		Action:     setupWhoami,
+		Action:     setup,
 	})
 }
 
-func setupWhoami(c *caddy.Controller) error {
+func setup(c *caddy.Controller) error {
 	c.Next() // 'whoami'
 	if c.NextArg() {
 		return plugin.Error("whoami", c.ArgErr())
diff --git a/plugin/whoami/setup_test.go b/plugin/whoami/setup_test.go
index 73db67d88..c4fa58fe2 100644
--- a/plugin/whoami/setup_test.go
+++ b/plugin/whoami/setup_test.go
@@ -6,14 +6,14 @@ import (
 	"github.com/mholt/caddy"
 )
 
-func TestSetupWhoami(t *testing.T) {
+func TestSetup(t *testing.T) {
 	c := caddy.NewTestController("dns", `whoami`)
-	if err := setupWhoami(c); err != nil {
+	if err := setup(c); err != nil {
 		t.Fatalf("Expected no errors, but got: %v", err)
 	}
 
 	c = caddy.NewTestController("dns", `whoami example.org`)
-	if err := setupWhoami(c); err == nil {
+	if err := setup(c); err == nil {
 		t.Fatalf("Expected errors, but got: %v", err)
 	}
 }