diff --git a/.bazelrc b/.bazelrc
index 78a0145b1..6d98943b3 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -13,5 +13,3 @@ try-import %workspace%/.bazelrc.user
 # https://github.com/bazelbuild/buildtools/issues/1204
 common --noenable_bzlmod
 
-build --cxxopt=-std=c++14
-build --host_cxxopt=-std=c++14
diff --git a/WORKSPACE b/WORKSPACE
index 1e0328b34..db3840afd 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -1,4 +1,4 @@
-workspace(name = "com_github_bazelbuild_buildtools")
+workspace(name = "buildtools")
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
@@ -72,7 +72,7 @@ rules_proto_dependencies()
 
 rules_proto_toolchains()
 
-load("@com_github_bazelbuild_buildtools//buildifier:deps.bzl", "buildifier_dependencies")
+load("//buildifier:deps.bzl", "buildifier_dependencies")
 
 buildifier_dependencies()
 
diff --git a/buildozer/buildozer_test.sh b/buildozer/buildozer_test.sh
index bddaded14..b62d22447 100755
--- a/buildozer/buildozer_test.sh
+++ b/buildozer/buildozer_test.sh
@@ -31,7 +31,7 @@ die () {
 [[ "$1" =~ external/* ]] && buildozer="${{1#external/}}" || buildozer="$TEST_WORKSPACE/$1"
 buildozer="$(rlocation "$buildozer")"
 
-source $TEST_SRCDIR/com_github_bazelbuild_buildtools/buildozer/test_common.sh
+source $TEST_SRCDIR/buildtools/buildozer/test_common.sh
 
 ## TEST INPUTS