diff --git a/baseapp/options.go b/baseapp/options.go
index 048a17d588f3..a6460248dfa0 100644
--- a/baseapp/options.go
+++ b/baseapp/options.go
@@ -1,9 +1,12 @@
+// nolint: golint
 package baseapp
 
 import (
 	"fmt"
 
+	"github.com/cosmos/cosmos-sdk/store"
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	dbm "github.com/tendermint/tendermint/libs/db"
 )
 
 // File for storing in-package BaseApp optional functions,
@@ -35,3 +38,85 @@ func SetMinimumFees(minFees string) func(*BaseApp) {
 	}
 	return func(bap *BaseApp) { bap.SetMinimumFees(fees) }
 }
+
+func (app *BaseApp) SetName(name string) {
+	if app.sealed {
+		panic("SetName() on sealed BaseApp")
+	}
+	app.name = name
+}
+
+func (app *BaseApp) SetDB(db dbm.DB) {
+	if app.sealed {
+		panic("SetDB() on sealed BaseApp")
+	}
+	app.db = db
+}
+
+func (app *BaseApp) SetCMS(cms store.CommitMultiStore) {
+	if app.sealed {
+		panic("SetEndBlocker() on sealed BaseApp")
+	}
+	app.cms = cms
+}
+
+func (app *BaseApp) SetInitChainer(initChainer sdk.InitChainer) {
+	if app.sealed {
+		panic("SetInitChainer() on sealed BaseApp")
+	}
+	app.initChainer = initChainer
+}
+
+func (app *BaseApp) SetBeginBlocker(beginBlocker sdk.BeginBlocker) {
+	if app.sealed {
+		panic("SetBeginBlocker() on sealed BaseApp")
+	}
+	app.beginBlocker = beginBlocker
+}
+
+func (app *BaseApp) SetEndBlocker(endBlocker sdk.EndBlocker) {
+	if app.sealed {
+		panic("SetEndBlocker() on sealed BaseApp")
+	}
+	app.endBlocker = endBlocker
+}
+
+func (app *BaseApp) SetAnteHandler(ah sdk.AnteHandler) {
+	if app.sealed {
+		panic("SetAnteHandler() on sealed BaseApp")
+	}
+	app.anteHandler = ah
+}
+
+func (app *BaseApp) SetAddrPeerFilter(pf sdk.PeerFilter) {
+	if app.sealed {
+		panic("SetAddrPeerFilter() on sealed BaseApp")
+	}
+	app.addrPeerFilter = pf
+}
+
+func (app *BaseApp) SetPubKeyPeerFilter(pf sdk.PeerFilter) {
+	if app.sealed {
+		panic("SetPubKeyPeerFilter() on sealed BaseApp")
+	}
+	app.pubkeyPeerFilter = pf
+}
+
+func (app *BaseApp) Router() Router {
+	if app.sealed {
+		panic("Router() on sealed BaseApp")
+	}
+	return app.router
+}
+
+func (app *BaseApp) QueryRouter() QueryRouter {
+	return app.queryRouter
+}
+
+func (app *BaseApp) Seal()          { app.sealed = true }
+func (app *BaseApp) IsSealed() bool { return app.sealed }
+func (app *BaseApp) enforceSeal() {
+	if !app.sealed {
+		panic("enforceSeal() on BaseApp but not sealed")
+	}
+}
diff --git a/baseapp/setters.go b/baseapp/setters.go
deleted file mode 100644
index 28782c96dec6..000000000000
--- a/baseapp/setters.go
+++ /dev/null
@@ -1,80 +0,0 @@
-package baseapp
-
-import (
-	dbm "github.com/tendermint/tendermint/libs/db"
-
-	"github.com/cosmos/cosmos-sdk/store"
-	sdk "github.com/cosmos/cosmos-sdk/types"
-)
-
-// nolint - Setter functions
-func (app *BaseApp) SetName(name string) {
-	if app.sealed {
-		panic("SetName() on sealed BaseApp")
-	}
-	app.name = name
-}
-func (app *BaseApp) SetDB(db dbm.DB) {
-	if app.sealed {
-		panic("SetDB() on sealed BaseApp")
-	}
-	app.db = db
-}
-func (app *BaseApp) SetCMS(cms store.CommitMultiStore) {
-	if app.sealed {
-		panic("SetEndBlocker() on sealed BaseApp")
-	}
-	app.cms = cms
-}
-func (app *BaseApp) SetInitChainer(initChainer sdk.InitChainer) {
-	if app.sealed {
-		panic("SetInitChainer() on sealed BaseApp")
-	}
-	app.initChainer = initChainer
-}
-func (app *BaseApp) SetBeginBlocker(beginBlocker sdk.BeginBlocker) {
-	if app.sealed {
-		panic("SetBeginBlocker() on sealed BaseApp")
-	}
-	app.beginBlocker = beginBlocker
-}
-func (app *BaseApp) SetEndBlocker(endBlocker sdk.EndBlocker) {
-	if app.sealed {
-		panic("SetEndBlocker() on sealed BaseApp")
-	}
-	app.endBlocker = endBlocker
-}
-func (app *BaseApp) SetAnteHandler(ah sdk.AnteHandler) {
-	if app.sealed {
-		panic("SetAnteHandler() on sealed BaseApp")
-	}
-	app.anteHandler = ah
-}
-func (app *BaseApp) SetAddrPeerFilter(pf sdk.PeerFilter) {
-	if app.sealed {
-		panic("SetAddrPeerFilter() on sealed BaseApp")
-	}
-	app.addrPeerFilter = pf
-}
-func (app *BaseApp) SetPubKeyPeerFilter(pf sdk.PeerFilter) {
-	if app.sealed {
-		panic("SetPubKeyPeerFilter() on sealed BaseApp")
-	}
-	app.pubkeyPeerFilter = pf
-}
-func (app *BaseApp) Router() Router {
-	if app.sealed {
-		panic("Router() on sealed BaseApp")
-	}
-	return app.router
-}
-func (app *BaseApp) QueryRouter() QueryRouter {
-	return app.queryRouter
-}
-func (app *BaseApp) Seal()          { app.sealed = true }
-func (app *BaseApp) IsSealed() bool { return app.sealed }
-func (app *BaseApp) enforceSeal() {
-	if !app.sealed {
-		panic("enforceSeal() on BaseApp but not sealed")
-	}
-}