diff --git a/scripts/lib/chat.sh b/scripts/lib/chat.sh
index eef94edbd..3402296b2 100755
--- a/scripts/lib/chat.sh
+++ b/scripts/lib/chat.sh
@@ -27,7 +27,7 @@ openim::chat::validate() {
   # validate if in path
   command -v chat >/dev/null || {
     openim::log::usage "chat must be in your PATH"
-    openim::log::info "You can use 'hack/install-chat.sh' to install a copy in third_party/."
+    openim::log::info "You can use 'scripts/install-chat.sh' to install a copy in third_party/."
     exit 1
   }
 
@@ -61,7 +61,7 @@ openim::chat::validate() {
    version=$(chat --version | grep Version | head -n 1 | cut -d " " -f 3)
    if [[ $(openim::chat::version "${CHAT_VERSION}") -gt $(openim::chat::version "${version}") ]]; then
     openim::log::usage "chat version ${CHAT_VERSION} or greater required."
-    openim::log::info "You can use 'hack/install-chat.sh' to install a copy in third_party/."
+    openim::log::info "You can use 'scripts/install-chat.sh' to install a copy in third_party/."
     exit 1
    fi
   fi
diff --git a/scripts/lib/init.sh b/scripts/lib/init.sh
index 631e751ba..ab2397ee3 100755
--- a/scripts/lib/init.sh
+++ b/scripts/lib/init.sh
@@ -25,7 +25,7 @@ unset CDPATH
 
 # Until all GOPATH references are removed from all build scripts as well,
 # explicitly disable module mode to avoid picking up user-set GO111MODULE preferences.
-# As individual scripts (like hack/update-vendor.sh) make use of go modules,
+# As individual scripts (like scripts/update-vendor.sh) make use of go modules,
 # they can explicitly set GO111MODULE=on
 export GO111MODULE=on
 
diff --git a/scripts/lib/release.sh b/scripts/lib/release.sh
index dba74c768..f198bb8c4 100755
--- a/scripts/lib/release.sh
+++ b/scripts/lib/release.sh
@@ -471,9 +471,9 @@ Server binary tarballs are no longer included in the OpenIM final tarball.
 Run release/get-openim-binaries.sh to download client and server binaries.
 EOF
 
-  # Include hack/lib as a dependency for the cluster/ scripts
+  # Include scripts/lib as a dependency for the cluster/ scripts
   #mkdir -p "${release_stage}/hack"
-  #cp -R ""${OPENIM_ROOT}"/hack/lib" "${release_stage}/hack/"
+  #cp -R ""${OPENIM_ROOT}"/scripts/lib" "${release_stage}/scripts/"
 
   cp -R "${OPENIM_ROOT}"/{docs,configs,scripts,deployments,init,README.md,LICENSE} "${release_stage}/"
 
diff --git a/scripts/update-generated-docs.sh b/scripts/update-generated-docs.sh
index 008cf63ed..93f0f86c1 100755
--- a/scripts/update-generated-docs.sh
+++ b/scripts/update-generated-docs.sh
@@ -23,7 +23,7 @@ set -o nounset
 set -o pipefail
 
 OPENIM_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
-source "${OPENIM_ROOT}/hack/lib/init.sh"
+source "${OPENIM_ROOT}/scripts/lib/init.sh"
 
 openim::golang::setup_env
 
diff --git a/scripts/update-yamlfmt.sh b/scripts/update-yamlfmt.sh
index 1e4ad513f..6a451c819 100755
--- a/scripts/update-yamlfmt.sh
+++ b/scripts/update-yamlfmt.sh
@@ -19,7 +19,7 @@ set -o nounset
 set -o pipefail
 
 OPENIM_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
-source "${OPENIM_ROOT}/hack/lib/init.sh"
+source "${OPENIM_ROOT}/scripts/lib/init.sh"
 
 kube::golang::setup_env
 
diff --git a/test/typecheck/typecheck.go b/test/typecheck/typecheck.go
index eadc57c98..88b245141 100644
--- a/test/typecheck/typecheck.go
+++ b/test/typecheck/typecheck.go
@@ -75,7 +75,7 @@ var (
 		"pkg/kubectl/cmd/testdata/edit",
 		// Tools we use for maintaining the code base but not necessarily
 		// ship as part of the release
-		"hack/tools",
+		"scripts/tools",
 	}
 )
 
diff --git a/tools/changelog/changelog.go b/tools/changelog/changelog.go
index 17a9e5404..ff9a7eab9 100644
--- a/tools/changelog/changelog.go
+++ b/tools/changelog/changelog.go
@@ -61,7 +61,7 @@ var (
 		{"template", "template"},
 		{"etcd", "server"},
 		{"pod", "node"},
-		{"hack/", "hack"},
+		{"scripts/", "hack"},
 		{"e2e", "test"},
 		{"integration", "test"},
 		{"cluster", "cluster"},