diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index dda981503..aaae1718a 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -16,7 +16,7 @@ jobs:
       - uses: rokroskar/workflow-run-cleanup-action@master
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-    if: "!startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/master'"
+    if: "!startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/main'"
 
   build-abci:
     name: Build
@@ -47,7 +47,7 @@ jobs:
       - uses: actions/cache@v2.1.4
         with:
           path: ~/go/bin
-          key: ${{ runner.os }}-${{ github.sha }}-tm-binary
+          key: ${{ runner.os }}-${{ github.sha }}-oc-binary
         if: env.GIT_DIFF
 
   test_abci_apps:
diff --git a/crypto/sr25519/privkey.go b/crypto/sr25519/privkey.go
index a534c3d1e..cab120824 100644
--- a/crypto/sr25519/privkey.go
+++ b/crypto/sr25519/privkey.go
@@ -80,7 +80,7 @@ func (privKey PrivKey) Type() string {
 
 // GenPrivKey generates a new sr25519 private key.
 // It uses OS randomness in conjunction with the current global random seed
-// in tendermint/libs/common to generate the private key.
+// in libs/common to generate the private key.
 func GenPrivKey() PrivKey {
 	return genPrivKey(crypto.CReader())
 }
diff --git a/libs/log/oc_logger_test.go b/libs/log/oc_logger_test.go
index 0498b9bd5..6535c34d1 100644
--- a/libs/log/oc_logger_test.go
+++ b/libs/log/oc_logger_test.go
@@ -89,11 +89,11 @@ func TestError(t *testing.T) {
 	}
 }
 
-func BenchmarkTMLoggerSimple(b *testing.B) {
+func BenchmarkOCLoggerSimple(b *testing.B) {
 	benchmarkRunner(b, log.NewOCLogger(ioutil.Discard), baseInfoMessage)
 }
 
-func BenchmarkTMLoggerContextual(b *testing.B) {
+func BenchmarkOCLoggerContextual(b *testing.B) {
 	benchmarkRunner(b, log.NewOCLogger(ioutil.Discard), withInfoMessage)
 }
 
diff --git a/libs/log/ocfmt_logger_test.go b/libs/log/ocfmt_logger_test.go
index 28b0e0a00..5605df6a6 100644
--- a/libs/log/ocfmt_logger_test.go
+++ b/libs/log/ocfmt_logger_test.go
@@ -14,7 +14,7 @@ import (
 	"github.com/line/ostracon/libs/log"
 )
 
-func TestTMFmtLogger(t *testing.T) {
+func TestOCFmtLogger(t *testing.T) {
 	t.Parallel()
 	buf := &bytes.Buffer{}
 	logger := log.NewOCFmtLogger(buf)
@@ -61,15 +61,15 @@ func TestTMFmtLogger(t *testing.T) {
 	assert.Regexp(t, regexp.MustCompile(`N\[.+\] unknown \s+ hash=74657374206D65\n$`), buf.String())
 }
 
-func BenchmarkTMFmtLoggerSimple(b *testing.B) {
+func BenchmarkOCFmtLoggerSimple(b *testing.B) {
 	benchmarkRunnerKitlog(b, log.NewOCFmtLogger(ioutil.Discard), baseMessage)
 }
 
-func BenchmarkTMFmtLoggerContextual(b *testing.B) {
+func BenchmarkOCFmtLoggerContextual(b *testing.B) {
 	benchmarkRunnerKitlog(b, log.NewOCFmtLogger(ioutil.Discard), withMessage)
 }
 
-func TestTMFmtLoggerConcurrency(t *testing.T) {
+func TestOCFmtLoggerConcurrency(t *testing.T) {
 	t.Parallel()
 	testConcurrency(t, log.NewOCFmtLogger(ioutil.Discard), 10000)
 }
diff --git a/libs/log/testing_logger.go b/libs/log/testing_logger.go
index ff97934bd..29ec552a5 100644
--- a/libs/log/testing_logger.go
+++ b/libs/log/testing_logger.go
@@ -13,7 +13,7 @@ var (
 	_testingLogger Logger
 )
 
-// TestingLogger returns a TMLogger which writes to STDOUT if testing being run
+// TestingLogger returns a OCLogger which writes to STDOUT if testing being run
 // with the verbose (-v) flag, NopLogger otherwise.
 //
 // Note that the call to TestingLogger() must be made
@@ -23,7 +23,7 @@ func TestingLogger() Logger {
 	return TestingLoggerWithOutput(os.Stdout)
 }
 
-// TestingLoggerWOutput returns a TMLogger which writes to (w io.Writer) if testing being run
+// TestingLoggerWOutput returns a OCLogger which writes to (w io.Writer) if testing being run
 // with the verbose (-v) flag, NopLogger otherwise.
 //
 // Note that the call to TestingLoggerWithOutput(w io.Writer) must be made
diff --git a/statesync/chunks.go b/statesync/chunks.go
index 84bc172fa..b1bf5dcd4 100644
--- a/statesync/chunks.go
+++ b/statesync/chunks.go
@@ -42,7 +42,7 @@ type chunkQueue struct {
 // newChunkQueue creates a new chunk queue for a snapshot, using a temp dir for storage.
 // Callers must call Close() when done.
 func newChunkQueue(snapshot *snapshot, tempDir string) (*chunkQueue, error) {
-	dir, err := ioutil.TempDir(tempDir, "tm-statesync")
+	dir, err := ioutil.TempDir(tempDir, "oc-statesync")
 	if err != nil {
 		return nil, fmt.Errorf("unable to create temp dir for state sync chunks: %w", err)
 	}