diff --git a/log/tm_logger.go b/log/tm_logger.go
index 0d01a970e..f12442db1 100644
--- a/log/tm_logger.go
+++ b/log/tm_logger.go
@@ -17,10 +17,10 @@ type tmLogger struct {
 	srcLogger kitlog.Logger
 }
 
-// NewTmTermLogger returns a logger that encodes msg and keyvals to the Writer
+// NewTMTermLogger returns a logger that encodes msg and keyvals to the Writer
 // using go-kit's log as an underlying logger and our custom formatter. Note
 // that underlying logger could be swapped with something else.
-func NewTmLogger(w io.Writer) Logger {
+func NewTMLogger(w io.Writer) Logger {
 	// Color by level value
 	colorFn := func(keyvals ...interface{}) term.FgBgColor {
 		if keyvals[0] != level.Key() {
@@ -36,7 +36,7 @@ func NewTmLogger(w io.Writer) Logger {
 		}
 	}
 
-	srcLogger := term.NewLogger(w, NewTmfmtLogger, colorFn)
+	srcLogger := term.NewLogger(w, NewTMFmtLogger, colorFn)
 	srcLogger = level.NewFilter(srcLogger, level.AllowInfo())
 	return &tmLogger{srcLogger}
 }
diff --git a/log/tm_logger_test.go b/log/tm_logger_test.go
index f301c9fde..898316c42 100644
--- a/log/tm_logger_test.go
+++ b/log/tm_logger_test.go
@@ -7,9 +7,9 @@ import (
 	"github.com/tendermint/tmlibs/log"
 )
 
-func TestTmLogger(t *testing.T) {
+func TestTMLogger(t *testing.T) {
 	t.Parallel()
-	logger := log.NewTmLogger(ioutil.Discard)
+	logger := log.NewTMLogger(ioutil.Discard)
 	if err := logger.Info("Hello", "abc", 123); err != nil {
 		t.Error(err)
 	}
@@ -18,12 +18,12 @@ func TestTmLogger(t *testing.T) {
 	}
 }
 
-func BenchmarkTmLoggerSimple(b *testing.B) {
-	benchmarkRunner(b, log.NewTmLogger(ioutil.Discard), baseInfoMessage)
+func BenchmarkTMLoggerSimple(b *testing.B) {
+	benchmarkRunner(b, log.NewTMLogger(ioutil.Discard), baseInfoMessage)
 }
 
-func BenchmarkTmLoggerContextual(b *testing.B) {
-	benchmarkRunner(b, log.NewTmLogger(ioutil.Discard), withInfoMessage)
+func BenchmarkTMLoggerContextual(b *testing.B) {
+	benchmarkRunner(b, log.NewTMLogger(ioutil.Discard), withInfoMessage)
 }
 
 func benchmarkRunner(b *testing.B, logger log.Logger, f func(log.Logger)) {
diff --git a/log/tmfmt_logger.go b/log/tmfmt_logger.go
index db689c084..2f299e274 100644
--- a/log/tmfmt_logger.go
+++ b/log/tmfmt_logger.go
@@ -34,13 +34,13 @@ type tmfmtLogger struct {
 	w io.Writer
 }
 
-// NewTmFmtLogger returns a logger that encodes keyvals to the Writer in
+// NewTMFmtLogger returns a logger that encodes keyvals to the Writer in
 // Tendermint custom format.
 //
 // Each log event produces no more than one call to w.Write.
 // The passed Writer must be safe for concurrent use by multiple goroutines if
 // the returned Logger will be used concurrently.
-func NewTmfmtLogger(w io.Writer) kitlog.Logger {
+func NewTMFmtLogger(w io.Writer) kitlog.Logger {
 	return &tmfmtLogger{w}
 }
 
diff --git a/log/tmfmt_logger_test.go b/log/tmfmt_logger_test.go
index ca5ee55ea..c5ec41274 100644
--- a/log/tmfmt_logger_test.go
+++ b/log/tmfmt_logger_test.go
@@ -13,10 +13,10 @@ import (
 	"github.com/tendermint/tmlibs/log"
 )
 
-func TestTmfmtLogger(t *testing.T) {
+func TestTMFmtLogger(t *testing.T) {
 	t.Parallel()
 	buf := &bytes.Buffer{}
-	logger := log.NewTmfmtLogger(buf)
+	logger := log.NewTMFmtLogger(buf)
 
 	if err := logger.Log("hello", "world"); err != nil {
 		t.Fatal(err)
@@ -46,17 +46,17 @@ func TestTmfmtLogger(t *testing.T) {
 	assert.Regexp(t, regexp.MustCompile(`N\[.+\] Hello \s+\n$`), buf.String())
 }
 
-func BenchmarkTmfmtLoggerSimple(b *testing.B) {
-	benchmarkRunnerKitlog(b, log.NewTmfmtLogger(ioutil.Discard), baseMessage)
+func BenchmarkTMFmtLoggerSimple(b *testing.B) {
+	benchmarkRunnerKitlog(b, log.NewTMFmtLogger(ioutil.Discard), baseMessage)
 }
 
-func BenchmarkTmfmtLoggerContextual(b *testing.B) {
-	benchmarkRunnerKitlog(b, log.NewTmfmtLogger(ioutil.Discard), withMessage)
+func BenchmarkTMFmtLoggerContextual(b *testing.B) {
+	benchmarkRunnerKitlog(b, log.NewTMFmtLogger(ioutil.Discard), withMessage)
 }
 
-func TestTmfmtLoggerConcurrency(t *testing.T) {
+func TestTMFmtLoggerConcurrency(t *testing.T) {
 	t.Parallel()
-	testConcurrency(t, log.NewTmfmtLogger(ioutil.Discard), 10000)
+	testConcurrency(t, log.NewTMFmtLogger(ioutil.Discard), 10000)
 }
 
 func benchmarkRunnerKitlog(b *testing.B, logger kitlog.Logger, f func(kitlog.Logger)) {