diff --git a/mpact/sim/decoder/BUILD b/mpact/sim/decoder/BUILD
index f214fa9..c330b92 100644
--- a/mpact/sim/decoder/BUILD
+++ b/mpact/sim/decoder/BUILD
@@ -61,8 +61,8 @@
     ],
     visibility = [":__subpackages__"],
     deps = [
-        "@com_google_absl//absl/log",
-        "@com_google_absl//absl/strings",
+        "@abseil-cpp//absl/log",
+        "@abseil-cpp//absl/strings",
     ],
 )
 
@@ -76,7 +76,7 @@
     srcs = ["format_name.cc"],
     hdrs = ["format_name.h"],
     deps = [
-        "@com_google_absl//absl/strings",
+        "@abseil-cpp//absl/strings",
     ],
 )
 
@@ -117,18 +117,18 @@
         ":antlr_parser_wrapper",
         ":decoder_error_listener",
         ":format_name",
-        "@com_google_absl//absl/base:no_destructor",
-        "@com_google_absl//absl/container:btree",
-        "@com_google_absl//absl/container:flat_hash_map",
-        "@com_google_absl//absl/container:flat_hash_set",
-        "@com_google_absl//absl/flags:flag",
-        "@com_google_absl//absl/log",
-        "@com_google_absl//absl/memory",
-        "@com_google_absl//absl/numeric:bits",
-        "@com_google_absl//absl/status",
-        "@com_google_absl//absl/status:statusor",
-        "@com_google_absl//absl/strings",
-        "@com_google_absl//absl/strings:str_format",
+        "@abseil-cpp//absl/base:no_destructor",
+        "@abseil-cpp//absl/container:btree",
+        "@abseil-cpp//absl/container:flat_hash_map",
+        "@abseil-cpp//absl/container:flat_hash_set",
+        "@abseil-cpp//absl/flags:flag",
+        "@abseil-cpp//absl/log",
+        "@abseil-cpp//absl/memory",
+        "@abseil-cpp//absl/numeric:bits",
+        "@abseil-cpp//absl/status",
+        "@abseil-cpp//absl/status:statusor",
+        "@abseil-cpp//absl/strings",
+        "@abseil-cpp//absl/strings:str_format",
         "@com_googlesource_code_re2//:re2",
     ],
 )
@@ -147,11 +147,11 @@
     visibility = ["//visibility:public"],
     deps = [
         ":isa_parser",
-        "@com_google_absl//absl/flags:flag",
-        "@com_google_absl//absl/flags:parse",
-        "@com_google_absl//absl/log",
-        "@com_google_absl//absl/status",
-        "@com_google_absl//absl/strings",
+        "@abseil-cpp//absl/flags:flag",
+        "@abseil-cpp//absl/flags:parse",
+        "@abseil-cpp//absl/log",
+        "@abseil-cpp//absl/status",
+        "@abseil-cpp//absl/strings",
     ],
 )
 
@@ -222,15 +222,15 @@
         ":bin_format_lexer",
         ":bin_format_parser",
         ":decoder_error_listener",
-        "@com_google_absl//absl/container:btree",
-        "@com_google_absl//absl/container:flat_hash_map",
-        "@com_google_absl//absl/container:flat_hash_set",
-        "@com_google_absl//absl/functional:bind_front",
-        "@com_google_absl//absl/log",
-        "@com_google_absl//absl/numeric:bits",
-        "@com_google_absl//absl/status",
-        "@com_google_absl//absl/status:statusor",
-        "@com_google_absl//absl/strings",
+        "@abseil-cpp//absl/container:btree",
+        "@abseil-cpp//absl/container:flat_hash_map",
+        "@abseil-cpp//absl/container:flat_hash_set",
+        "@abseil-cpp//absl/functional:bind_front",
+        "@abseil-cpp//absl/log",
+        "@abseil-cpp//absl/numeric:bits",
+        "@abseil-cpp//absl/status",
+        "@abseil-cpp//absl/status:statusor",
+        "@abseil-cpp//absl/strings",
         "@com_googlesource_code_re2//:re2",
     ],
 )
@@ -249,11 +249,11 @@
     visibility = ["//visibility:public"],
     deps = [
         ":bin_format_visitor",
-        "@com_google_absl//absl/flags:flag",
-        "@com_google_absl//absl/flags:parse",
-        "@com_google_absl//absl/log",
-        "@com_google_absl//absl/status",
-        "@com_google_absl//absl/strings",
+        "@abseil-cpp//absl/flags:flag",
+        "@abseil-cpp//absl/flags:parse",
+        "@abseil-cpp//absl/log",
+        "@abseil-cpp//absl/status",
+        "@abseil-cpp//absl/strings",
     ],
 )
 
@@ -320,15 +320,15 @@
         ":proto_format_lexer",
         ":proto_format_parser",
         "//mpact/sim/generic:type_helpers",
-        "@com_google_absl//absl/container:btree",
-        "@com_google_absl//absl/container:flat_hash_map",
-        "@com_google_absl//absl/container:flat_hash_set",
-        "@com_google_absl//absl/functional:bind_front",
-        "@com_google_absl//absl/log",
-        "@com_google_absl//absl/numeric:bits",
-        "@com_google_absl//absl/status",
-        "@com_google_absl//absl/status:statusor",
-        "@com_google_absl//absl/strings",
+        "@abseil-cpp//absl/container:btree",
+        "@abseil-cpp//absl/container:flat_hash_map",
+        "@abseil-cpp//absl/container:flat_hash_set",
+        "@abseil-cpp//absl/functional:bind_front",
+        "@abseil-cpp//absl/log",
+        "@abseil-cpp//absl/numeric:bits",
+        "@abseil-cpp//absl/status",
+        "@abseil-cpp//absl/status:statusor",
+        "@abseil-cpp//absl/strings",
         "@com_google_protobuf//:protobuf",
         "@com_googlesource_code_re2//:re2",
     ],
@@ -348,11 +348,11 @@
     visibility = ["//visibility:public"],
     deps = [
         ":proto_format_visitor",
-        "@com_google_absl//absl/flags:flag",
-        "@com_google_absl//absl/flags:parse",
-        "@com_google_absl//absl/log",
-        "@com_google_absl//absl/status",
-        "@com_google_absl//absl/strings",
+        "@abseil-cpp//absl/flags:flag",
+        "@abseil-cpp//absl/flags:parse",
+        "@abseil-cpp//absl/log",
+        "@abseil-cpp//absl/status",
+        "@abseil-cpp//absl/strings",
     ],
 )
 
diff --git a/mpact/sim/decoder/mpact_sim_isa.bzl b/mpact/sim/decoder/mpact_sim_isa.bzl
index aab57f7..2bffaab 100644
--- a/mpact/sim/decoder/mpact_sim_isa.bzl
+++ b/mpact/sim/decoder/mpact_sim_isa.bzl
@@ -116,10 +116,10 @@
 
     # The rule for the lib that is built from the generated sources.
     lib_deps = []
-    if "@com_google_absl//absl/container:flat_hash_map" not in deps:
-        lib_deps.append("@com_google_absl//absl/container:flat_hash_map")
-    if "@com_google_absl//absl/strings:str_format" not in deps:
-        lib_deps.append("@com_google_absl//absl/strings:str_format")
+    if "@abseil-cpp//absl/container:flat_hash_map" not in deps:
+        lib_deps.append("@abseil-cpp//absl/container:flat_hash_map")
+    if "@abseil-cpp//absl/strings:str_format" not in deps:
+        lib_deps.append("@abseil-cpp//absl/strings:str_format")
     if "@com_google_mpact-sim//mpact/sim/generic:arch_state" not in deps:
         lib_deps.append("@com_google_mpact-sim//mpact/sim/generic:arch_state")
     if "@com_google_mpact-sim//mpact/sim/generic:instruction" not in deps:
@@ -128,12 +128,12 @@
         lib_deps.append("@com_google_mpact-sim//mpact/sim/util/asm")
     if "@com_googlesource_code_re2//:re2" not in deps:
         lib_deps.append("@com_googlesource_code_re2//:re2")
-    if "@com_google_absl//absl/status" not in deps:
-        lib_deps.append("@com_google_absl//absl/status")
-    if "@com_google_absl//absl/status:statusor" not in deps:
-        lib_deps.append("@com_google_absl//absl/status:statusor")
-    if "@com_google_absl//absl/strings" not in deps:
-        lib_deps.append("@com_google_absl//absl/strings")
+    if "@abseil-cpp//absl/status" not in deps:
+        lib_deps.append("@abseil-cpp//absl/status")
+    if "@abseil-cpp//absl/status:statusor" not in deps:
+        lib_deps.append("@abseil-cpp//absl/status:statusor")
+    if "@abseil-cpp//absl/strings" not in deps:
+        lib_deps.append("@abseil-cpp//absl/strings")
     cc_library(
         name = name,
         srcs = [f for f in out_files if f.endswith(".cc")],
@@ -199,16 +199,16 @@
 
     # The rule for the lib that is built from the generated sources.
     lib_deps = []
-    if "@com_google_absl//absl/base:no_destructor" not in deps:
-        lib_deps.append("@com_google_absl//absl/base:no_destructor")
-    if "@com_google_absl//absl/container:flat_hash_map" not in deps:
-        lib_deps.append("@com_google_absl//absl/container:flat_hash_map")
-    if "@com_google_absl//absl/functional:any_invocable" not in deps:
-        lib_deps.append("@com_google_absl//absl/functional:any_invocable")
-    if "@com_google_absl//absl/log" not in deps:
-        lib_deps.append("@com_google_absl//absl/log")
-    if "@com_google_absl//absl/strings:str_format" not in deps:
-        lib_deps.append("@com_google_absl//absl/strings:str_format")
+    if "@abseil-cpp//absl/base:no_destructor" not in deps:
+        lib_deps.append("@abseil-cpp//absl/base:no_destructor")
+    if "@abseil-cpp//absl/container:flat_hash_map" not in deps:
+        lib_deps.append("@abseil-cpp//absl/container:flat_hash_map")
+    if "@abseil-cpp//absl/functional:any_invocable" not in deps:
+        lib_deps.append("@abseil-cpp//absl/functional:any_invocable")
+    if "@abseil-cpp//absl/log" not in deps:
+        lib_deps.append("@abseil-cpp//absl/log")
+    if "@abseil-cpp//absl/strings:str_format" not in deps:
+        lib_deps.append("@abseil-cpp//absl/strings:str_format")
     if "@com_google_mpact-sim//mpact/sim/generic:arch_state" not in deps:
         lib_deps.append("@com_google_mpact-sim//mpact/sim/generic:arch_state")
     if "@com_google_mpact-sim//mpact/sim/generic:instruction" not in deps:
@@ -279,9 +279,9 @@
         srcs = [f for f in out_files if f.endswith(".cc")],
         hdrs = [f for f in out_files if f.endswith(".h")],
         deps = [
-            "@com_google_absl//absl/container:flat_hash_map",
-            "@com_google_absl//absl/functional:any_invocable",
-            "@com_google_absl//absl/strings:str_format",
+            "@abseil-cpp//absl/container:flat_hash_map",
+            "@abseil-cpp//absl/functional:any_invocable",
+            "@abseil-cpp//absl/strings:str_format",
         ] + deps,
         testonly = testonly,
     )
diff --git a/mpact/sim/decoder/test/BUILD b/mpact/sim/decoder/test/BUILD
index caf511f..de4f3d4 100644
--- a/mpact/sim/decoder/test/BUILD
+++ b/mpact/sim/decoder/test/BUILD
@@ -27,10 +27,10 @@
     testonly = True,
     hdrs = ["log_sink.h"],
     deps = [
-        "@com_google_absl//absl/base:log_severity",
-        "@com_google_absl//absl/log:log_entry",
-        "@com_google_absl//absl/log:log_sink",
-        "@com_google_absl//absl/strings",
+        "@abseil-cpp//absl/base:log_severity",
+        "@abseil-cpp//absl/log:log_entry",
+        "@abseil-cpp//absl/log:log_sink",
+        "@abseil-cpp//absl/strings",
     ],
 )
 
@@ -42,8 +42,8 @@
     ],
     deps = [
         "//mpact/sim/decoder:isa_parser",
-        "@com_google_absl//absl/memory",
-        "@com_google_absl//absl/strings",
+        "@abseil-cpp//absl/memory",
+        "@abseil-cpp//absl/strings",
         "@com_google_googletest//:gtest",
         "@com_google_googletest//:gtest_main",
     ],
@@ -57,8 +57,8 @@
     ],
     deps = [
         "//mpact/sim/decoder:isa_parser",
-        "@com_google_absl//absl/memory",
-        "@com_google_absl//absl/strings",
+        "@abseil-cpp//absl/memory",
+        "@abseil-cpp//absl/strings",
         "@com_google_googletest//:gtest",
         "@com_google_googletest//:gtest_main",
     ],
@@ -72,8 +72,8 @@
     ],
     deps = [
         "//mpact/sim/decoder:isa_parser",
-        "@com_google_absl//absl/memory",
-        "@com_google_absl//absl/strings",
+        "@abseil-cpp//absl/memory",
+        "@abseil-cpp//absl/strings",
         "@com_google_googletest//:gtest",
         "@com_google_googletest//:gtest_main",
     ],
@@ -87,10 +87,10 @@
     ],
     deps = [
         "//mpact/sim/decoder:isa_parser",
-        "@com_google_absl//absl/memory",
-        "@com_google_absl//absl/status",
-        "@com_google_absl//absl/status:statusor",
-        "@com_google_absl//absl/strings",
+        "@abseil-cpp//absl/memory",
+        "@abseil-cpp//absl/status",
+        "@abseil-cpp//absl/status:statusor",
+        "@abseil-cpp//absl/strings",
         "@com_google_googletest//:gtest",
         "@com_google_googletest//:gtest_main",
     ],
@@ -104,8 +104,8 @@
     ],
     deps = [
         "//mpact/sim/decoder:isa_parser",
-        "@com_google_absl//absl/container:btree",
-        "@com_google_absl//absl/status:statusor",
+        "@abseil-cpp//absl/container:btree",
+        "@abseil-cpp//absl/status:statusor",
         "@com_google_googletest//:gtest",
         "@com_google_googletest//:gtest_main",
     ],
@@ -119,11 +119,11 @@
     ],
     deps = [
         "//mpact/sim/decoder:isa_parser",
-        "@com_google_absl//absl/memory",
-        "@com_google_absl//absl/status",
-        "@com_google_absl//absl/status:statusor",
-        "@com_google_absl//absl/strings",
-        "@com_google_absl//absl/types:variant",
+        "@abseil-cpp//absl/memory",
+        "@abseil-cpp//absl/status",
+        "@abseil-cpp//absl/status:statusor",
+        "@abseil-cpp//absl/strings",
+        "@abseil-cpp//absl/types:variant",
         "@com_google_googletest//:gtest",
         "@com_google_googletest//:gtest_main",
     ],
@@ -153,13 +153,13 @@
     deps = [
         ":log_sink",
         "//mpact/sim/decoder:isa_parser",
-        "@com_google_absl//absl/flags:flag",
-        "@com_google_absl//absl/log:check",
-        "@com_google_absl//absl/log:log_sink_registry",
-        "@com_google_absl//absl/memory",
-        "@com_google_absl//absl/status",
-        "@com_google_absl//absl/status:statusor",
-        "@com_google_absl//absl/strings",
+        "@abseil-cpp//absl/flags:flag",
+        "@abseil-cpp//absl/log:check",
+        "@abseil-cpp//absl/log:log_sink_registry",
+        "@abseil-cpp//absl/memory",
+        "@abseil-cpp//absl/status",
+        "@abseil-cpp//absl/status:statusor",
+        "@abseil-cpp//absl/strings",
         "@com_google_googletest//:gtest",
         "@com_google_googletest//:gtest_main",
         "@com_googlesource_code_re2//:re2",
@@ -227,7 +227,7 @@
         ":example_isa",
         "//mpact/sim/generic:arch_state",
         "//mpact/sim/generic:instruction",
-        "@com_google_absl//absl/container:flat_hash_map",
+        "@abseil-cpp//absl/container:flat_hash_map",
         "@com_google_googletest//:gtest",
         "@com_google_googletest//:gtest_main",
     ],
@@ -247,7 +247,7 @@
         ":combined_isa",
         "//mpact/sim/generic:arch_state",
         "//mpact/sim/generic:instruction",
-        "@com_google_absl//absl/container:flat_hash_map",
+        "@abseil-cpp//absl/container:flat_hash_map",
         "@com_google_googletest//:gtest",
         "@com_google_googletest//:gtest_main",
     ],
@@ -260,7 +260,7 @@
         "extract_bits_test.cc",
     ],
     deps = [
-        "@com_google_absl//absl/numeric:bits",
+        "@abseil-cpp//absl/numeric:bits",
         "@com_google_googletest//:gtest",
         "@com_google_googletest//:gtest_main",
     ],
@@ -274,7 +274,7 @@
     ],
     deps = [
         "//mpact/sim/decoder:bin_format_visitor",
-        "@com_google_absl//absl/strings",
+        "@abseil-cpp//absl/strings",
         "@com_google_googletest//:gtest",
         "@com_google_googletest//:gtest_main",
     ],
@@ -288,8 +288,8 @@
     ],
     deps = [
         "//mpact/sim/decoder:bin_format_visitor",
-        "@com_google_absl//absl/status",
-        "@com_google_absl//absl/strings",
+        "@abseil-cpp//absl/status",
+        "@abseil-cpp//absl/strings",
         "@com_google_googletest//:gtest",
         "@com_google_googletest//:gtest_main",
     ],
@@ -304,9 +304,9 @@
     deps = [
         "//mpact/sim/decoder:bin_format_visitor",
         "//mpact/sim/decoder:decoder_error_listener",
-        "@com_google_absl//absl/container:flat_hash_map",
-        "@com_google_absl//absl/status",
-        "@com_google_absl//absl/strings",
+        "@abseil-cpp//absl/container:flat_hash_map",
+        "@abseil-cpp//absl/status",
+        "@abseil-cpp//absl/strings",
         "@com_google_googletest//:gtest",
         "@com_google_googletest//:gtest_main",
     ],
@@ -321,11 +321,11 @@
     deps = [
         "//mpact/sim/decoder:bin_format_visitor",
         "//mpact/sim/decoder:decoder_error_listener",
-        "@com_google_absl//absl/container:btree",
-        "@com_google_absl//absl/log:check",
-        "@com_google_absl//absl/status",
-        "@com_google_absl//absl/status:statusor",
-        "@com_google_absl//absl/strings",
+        "@abseil-cpp//absl/container:btree",
+        "@abseil-cpp//absl/log:check",
+        "@abseil-cpp//absl/status",
+        "@abseil-cpp//absl/status:statusor",
+        "@abseil-cpp//absl/strings",
         "@com_google_googletest//:gtest",
         "@com_google_googletest//:gtest_main",
     ],
@@ -340,8 +340,8 @@
     deps = [
         "//mpact/sim/decoder:bin_format_visitor",
         "//mpact/sim/decoder:decoder_error_listener",
-        "@com_google_absl//absl/status",
-        "@com_google_absl//absl/status:statusor",
+        "@abseil-cpp//absl/status",
+        "@abseil-cpp//absl/status:statusor",
         "@com_google_googletest//:gtest",
         "@com_google_googletest//:gtest_main",
     ],
@@ -373,12 +373,12 @@
     deps = [
         ":log_sink",
         "//mpact/sim/decoder:bin_format_visitor",
-        "@com_google_absl//absl/flags:flag",
-        "@com_google_absl//absl/log:check",
-        "@com_google_absl//absl/log:log_sink_registry",
-        "@com_google_absl//absl/status",
-        "@com_google_absl//absl/status:statusor",
-        "@com_google_absl//absl/strings",
+        "@abseil-cpp//absl/flags:flag",
+        "@abseil-cpp//absl/log:check",
+        "@abseil-cpp//absl/log:log_sink_registry",
+        "@abseil-cpp//absl/status",
+        "@abseil-cpp//absl/status:statusor",
+        "@abseil-cpp//absl/strings",
         "@com_google_googletest//:gtest",
         "@com_google_googletest//:gtest_main",
         "@com_googlesource_code_re2//:re2",
@@ -400,13 +400,13 @@
     deps = [
         ":log_sink",
         "//mpact/sim/decoder:proto_format_visitor",
-        "@com_google_absl//absl/flags:flag",
-        "@com_google_absl//absl/log",
-        "@com_google_absl//absl/log:check",
-        "@com_google_absl//absl/log:log_sink_registry",
-        "@com_google_absl//absl/status",
-        "@com_google_absl//absl/status:statusor",
-        "@com_google_absl//absl/strings",
+        "@abseil-cpp//absl/flags:flag",
+        "@abseil-cpp//absl/log",
+        "@abseil-cpp//absl/log:check",
+        "@abseil-cpp//absl/log:log_sink_registry",
+        "@abseil-cpp//absl/status",
+        "@abseil-cpp//absl/status:statusor",
+        "@abseil-cpp//absl/strings",
         "@com_google_googletest//:gtest",
         "@com_google_googletest//:gtest_main",
         "@com_googlesource_code_re2//:re2",
@@ -425,11 +425,11 @@
     deps = [
         "//mpact/sim/decoder:proto_format_visitor",
         "//mpact/sim/generic:type_helpers",
-        "@com_google_absl//absl/log",
-        "@com_google_absl//absl/log:check",
-        "@com_google_absl//absl/status",
-        "@com_google_absl//absl/status:statusor",
-        "@com_google_absl//absl/strings",
+        "@abseil-cpp//absl/log",
+        "@abseil-cpp//absl/log:check",
+        "@abseil-cpp//absl/status",
+        "@abseil-cpp//absl/status:statusor",
+        "@abseil-cpp//absl/strings",
         "@com_google_googletest//:gtest",
         "@com_google_googletest//:gtest_main",
         "@com_google_protobuf//:protobuf",
@@ -456,7 +456,7 @@
     isa_name = "RiscV32I",
     deps = [
         ":riscv32i_instructions",
-        "@com_google_absl//absl/functional:bind_front",
+        "@abseil-cpp//absl/functional:bind_front",
     ],
 )
 
@@ -488,7 +488,7 @@
     ],
     deps = [
         "//mpact/sim/decoder:proto_format_visitor",
-        "@com_google_absl//absl/log:check",
+        "@abseil-cpp//absl/log:check",
         "@com_google_googletest//:gtest",
         "@com_google_googletest//:gtest_main",
     ],
@@ -525,9 +525,9 @@
         "//mpact/sim/generic:instruction",
         "//mpact/sim/generic:type_helpers",
         "//mpact/sim/util/memory",
-        "@com_google_absl//absl/container:flat_hash_map",
-        "@com_google_absl//absl/functional:any_invocable",
-        "@com_google_absl//absl/log",
+        "@abseil-cpp//absl/container:flat_hash_map",
+        "@abseil-cpp//absl/functional:any_invocable",
+        "@abseil-cpp//absl/log",
     ],
 )
 
@@ -539,7 +539,7 @@
     prefix = "push_pop_inst",
     deps = [
         ":push_pop_instructions",
-        "@com_google_absl//absl/functional:bind_front",
+        "@abseil-cpp//absl/functional:bind_front",
     ],
 )
 
@@ -566,8 +566,8 @@
         "//mpact/sim/generic:arch_state",
         "//mpact/sim/generic:core",
         "//mpact/sim/util/memory",
-        "@com_google_absl//absl/log:check",
-        "@com_google_absl//absl/strings",
+        "@abseil-cpp//absl/log:check",
+        "@abseil-cpp//absl/strings",
         "@com_google_googletest//:gtest",
         "@com_google_googletest//:gtest_main",
     ],
diff --git a/mpact/sim/generic/BUILD b/mpact/sim/generic/BUILD
index f3f419d..c8a7e87 100644
--- a/mpact/sim/generic/BUILD
+++ b/mpact/sim/generic/BUILD
@@ -53,16 +53,16 @@
     ],
     copts = ["-O3"],
     deps = [
-        "@com_google_absl//absl/base:core_headers",
-        "@com_google_absl//absl/container:btree",
-        "@com_google_absl//absl/container:flat_hash_map",
-        "@com_google_absl//absl/log",
-        "@com_google_absl//absl/numeric:bits",
-        "@com_google_absl//absl/status",
-        "@com_google_absl//absl/status:statusor",
-        "@com_google_absl//absl/strings",
-        "@com_google_absl//absl/types:any",
-        "@com_google_absl//absl/types:span",
+        "@abseil-cpp//absl/base:core_headers",
+        "@abseil-cpp//absl/container:btree",
+        "@abseil-cpp//absl/container:flat_hash_map",
+        "@abseil-cpp//absl/log",
+        "@abseil-cpp//absl/numeric:bits",
+        "@abseil-cpp//absl/status",
+        "@abseil-cpp//absl/status:statusor",
+        "@abseil-cpp//absl/strings",
+        "@abseil-cpp//absl/types:any",
+        "@abseil-cpp//absl/types:span",
     ],
 )
 
@@ -97,12 +97,12 @@
         ":core",
         ":internal",
         ":program_error",
-        "@com_google_absl//absl/container:flat_hash_map",
-        "@com_google_absl//absl/container:flat_hash_set",
-        "@com_google_absl//absl/functional:any_invocable",
-        "@com_google_absl//absl/status",
-        "@com_google_absl//absl/strings",
-        "@com_google_absl//absl/types:span",
+        "@abseil-cpp//absl/container:flat_hash_map",
+        "@abseil-cpp//absl/container:flat_hash_set",
+        "@abseil-cpp//absl/functional:any_invocable",
+        "@abseil-cpp//absl/status",
+        "@abseil-cpp//absl/strings",
+        "@abseil-cpp//absl/types:span",
     ],
 )
 
@@ -116,9 +116,9 @@
         ":arch_state",
         ":core_debug_interface",
         "//mpact/sim/util/program_loader:elf_loader",
-        "@com_google_absl//absl/container:btree",
-        "@com_google_absl//absl/functional:any_invocable",
-        "@com_google_absl//absl/strings:string_view",
+        "@abseil-cpp//absl/container:btree",
+        "@abseil-cpp//absl/functional:any_invocable",
+        "@abseil-cpp//absl/strings:string_view",
     ],
 )
 
@@ -132,9 +132,9 @@
     deps = [
         ":core",
         ":instruction",
-        "@com_google_absl//absl/container:flat_hash_map",
-        "@com_google_absl//absl/status",
-        "@com_google_absl//absl/status:statusor",
+        "@abseil-cpp//absl/container:flat_hash_map",
+        "@abseil-cpp//absl/status",
+        "@abseil-cpp//absl/status:statusor",
     ],
 )
 
@@ -152,8 +152,8 @@
         ":arch_state",
         ":core",
         ":type_helpers",
-        "@com_google_absl//absl/numeric:int128",
-        "@com_google_absl//absl/types:span",
+        "@abseil-cpp//absl/numeric:int128",
+        "@abseil-cpp//absl/types:span",
     ],
 )
 
@@ -169,7 +169,7 @@
     deps = [
         ":core",
         ":instruction",
-        "@com_google_absl//absl/numeric:bits",
+        "@abseil-cpp//absl/numeric:bits",
     ],
 )
 
@@ -183,10 +183,10 @@
     ],
     copts = ["-O3"],
     deps = [
-        "@com_google_absl//absl/container:flat_hash_map",
-        "@com_google_absl//absl/container:flat_hash_set",
-        "@com_google_absl//absl/memory",
-        "@com_google_absl//absl/strings",
+        "@abseil-cpp//absl/container:flat_hash_map",
+        "@abseil-cpp//absl/container:flat_hash_set",
+        "@abseil-cpp//absl/memory",
+        "@abseil-cpp//absl/strings",
     ],
 )
 
@@ -199,8 +199,8 @@
     deps = [
         ":internal",
         "//mpact/sim/proto:component_data_cc_proto",
-        "@com_google_absl//absl/status",
-        "@com_google_absl//absl/strings:string_view",
+        "@abseil-cpp//absl/status",
+        "@abseil-cpp//absl/strings:string_view",
     ],
 )
 
@@ -216,8 +216,8 @@
     deps = [
         ":internal",
         "//mpact/sim/proto:component_data_cc_proto",
-        "@com_google_absl//absl/status",
-        "@com_google_absl//absl/strings",
+        "@abseil-cpp//absl/status",
+        "@abseil-cpp//absl/strings",
     ],
 )
 
@@ -234,11 +234,11 @@
         ":config",
         ":counters",
         "//mpact/sim/proto:component_data_cc_proto",
-        "@com_google_absl//absl/container:btree",
-        "@com_google_absl//absl/log",
-        "@com_google_absl//absl/status",
-        "@com_google_absl//absl/strings",
-        "@com_google_absl//absl/strings:string_view",
+        "@abseil-cpp//absl/container:btree",
+        "@abseil-cpp//absl/log",
+        "@abseil-cpp//absl/status",
+        "@abseil-cpp//absl/strings",
+        "@abseil-cpp//absl/strings:string_view",
     ],
 )
 
@@ -251,7 +251,7 @@
     copts = ["-O3"],
     visibility = ["//visibility:private"],
     deps = [
-        "@com_google_absl//absl/types:variant",
+        "@abseil-cpp//absl/types:variant",
     ],
 )
 
@@ -261,7 +261,7 @@
         "type_helpers.h",
     ],
     deps = [
-        "@com_google_absl//absl/numeric:int128",
+        "@abseil-cpp//absl/numeric:int128",
     ],
 )
 
@@ -277,12 +277,12 @@
     ],
     deps = [
         ":core_debug_interface",
-        "@com_google_absl//absl/container:btree",
-        "@com_google_absl//absl/functional:any_invocable",
-        "@com_google_absl//absl/functional:bind_front",
-        "@com_google_absl//absl/log",
-        "@com_google_absl//absl/status",
-        "@com_google_absl//absl/status:statusor",
-        "@com_google_absl//absl/strings",
+        "@abseil-cpp//absl/container:btree",
+        "@abseil-cpp//absl/functional:any_invocable",
+        "@abseil-cpp//absl/functional:bind_front",
+        "@abseil-cpp//absl/log",
+        "@abseil-cpp//absl/status",
+        "@abseil-cpp//absl/status:statusor",
+        "@abseil-cpp//absl/strings",
     ],
 )
diff --git a/mpact/sim/generic/test/BUILD b/mpact/sim/generic/test/BUILD
index 6225cf3..80c6ef7 100644
--- a/mpact/sim/generic/test/BUILD
+++ b/mpact/sim/generic/test/BUILD
@@ -59,8 +59,8 @@
     srcs = ["state_item_base_test.cc"],
     deps = [
         "//mpact/sim/generic:core",
-        "@com_google_absl//absl/memory",
-        "@com_google_absl//absl/strings",
+        "@abseil-cpp//absl/memory",
+        "@abseil-cpp//absl/strings",
         "@com_google_googletest//:gtest",
         "@com_google_googletest//:gtest_main",
     ],
@@ -158,7 +158,7 @@
     srcs = ["literal_operand_test.cc"],
     deps = [
         "//mpact/sim/generic:core",
-        "@com_google_absl//absl/memory",
+        "@abseil-cpp//absl/memory",
         "@com_google_googletest//:gtest",
         "@com_google_googletest//:gtest_main",
     ],
@@ -171,7 +171,7 @@
     deps = [
         "//mpact/sim/generic:arch_state",
         "//mpact/sim/generic:core",
-        "@com_google_absl//absl/strings",
+        "@abseil-cpp//absl/strings",
         "@com_google_googletest//:gtest",
         "@com_google_googletest//:gtest_main",
     ],
@@ -195,8 +195,8 @@
     deps = [
         "//mpact/sim/generic:arch_state",
         "//mpact/sim/generic:core",
-        "@com_google_absl//absl/strings",
-        "@com_google_absl//absl/types:any",
+        "@abseil-cpp//absl/strings",
+        "@abseil-cpp//absl/types:any",
         "@com_google_googletest//:gtest",
         "@com_google_googletest//:gtest_main",
     ],
@@ -209,8 +209,8 @@
     deps = [
         "//mpact/sim/generic:arch_state",
         "//mpact/sim/generic:core",
-        "@com_google_absl//absl/strings",
-        "@com_google_absl//absl/types:any",
+        "@abseil-cpp//absl/strings",
+        "@abseil-cpp//absl/types:any",
         "@com_google_googletest//:gtest",
         "@com_google_googletest//:gtest_main",
     ],
@@ -223,7 +223,7 @@
     deps = [
         "//mpact/sim/generic:arch_state",
         "//mpact/sim/generic:core",
-        "@com_google_absl//absl/strings",
+        "@abseil-cpp//absl/strings",
         "@com_google_googletest//:gtest",
         "@com_google_googletest//:gtest_main",
     ],
@@ -236,7 +236,7 @@
     deps = [
         "//mpact/sim/generic:core",
         "//mpact/sim/generic:instruction",
-        "@com_google_absl//absl/types:span",
+        "@abseil-cpp//absl/types:span",
         "@com_google_googletest//:gtest",
         "@com_google_googletest//:gtest_main",
     ],
@@ -284,8 +284,8 @@
     deps = [
         "//mpact/sim/generic:arch_state",
         "//mpact/sim/generic:core",
-        "@com_google_absl//absl/strings",
-        "@com_google_absl//absl/types:span",
+        "@abseil-cpp//absl/strings",
+        "@abseil-cpp//absl/types:span",
         "@com_google_googletest//:gtest",
         "@com_google_googletest//:gtest_main",
     ],
@@ -298,9 +298,9 @@
     deps = [
         "//mpact/sim/generic:arch_state",
         "//mpact/sim/generic:core",
-        "@com_google_absl//absl/status",
-        "@com_google_absl//absl/strings",
-        "@com_google_absl//absl/types:span",
+        "@abseil-cpp//absl/status",
+        "@abseil-cpp//absl/strings",
+        "@abseil-cpp//absl/types:span",
         "@com_google_googletest//:gtest",
         "@com_google_googletest//:gtest_main",
     ],
@@ -313,8 +313,8 @@
     deps = [
         "//mpact/sim/generic:config",
         "//mpact/sim/proto:component_data_cc_proto",
-        "@com_google_absl//absl/container:btree",
-        "@com_google_absl//absl/status",
+        "@abseil-cpp//absl/container:btree",
+        "@abseil-cpp//absl/status",
         "@com_google_googletest//:gtest",
         "@com_google_googletest//:gtest_main",
         "@com_google_protobuf//:protobuf",
@@ -330,7 +330,7 @@
         "//mpact/sim/generic:config",
         "//mpact/sim/generic:counters",
         "//mpact/sim/proto:component_data_cc_proto",
-        "@com_google_absl//absl/status",
+        "@abseil-cpp//absl/status",
         "@com_google_googletest//:gtest",
         "@com_google_googletest//:gtest_main",
         "@com_google_protobuf//:protobuf",
@@ -346,7 +346,7 @@
     deps = [
         "//mpact/sim/generic:counters",
         "//mpact/sim/proto:component_data_cc_proto",
-        "@com_google_absl//absl/strings",
+        "@abseil-cpp//absl/strings",
         "@com_google_googletest//:gtest",
         "@com_google_googletest//:gtest_main",
         "@com_google_protobuf//:protobuf",
diff --git a/mpact/sim/util/asm/BUILD b/mpact/sim/util/asm/BUILD
index 3e909d1..ecd8fcb 100644
--- a/mpact/sim/util/asm/BUILD
+++ b/mpact/sim/util/asm/BUILD
@@ -30,12 +30,12 @@
         "resolver_interface.h",
     ],
     deps = [
+        "@abseil-cpp//absl/container:flat_hash_map",
+        "@abseil-cpp//absl/functional:any_invocable",
+        "@abseil-cpp//absl/status",
+        "@abseil-cpp//absl/status:statusor",
+        "@abseil-cpp//absl/strings",
         "@com_github_serge1_elfio//:elfio",
-        "@com_google_absl//absl/container:flat_hash_map",
-        "@com_google_absl//absl/functional:any_invocable",
-        "@com_google_absl//absl/status",
-        "@com_google_absl//absl/status:statusor",
-        "@com_google_absl//absl/strings",
     ],
 )
 
@@ -45,15 +45,15 @@
     hdrs = ["simple_assembler.h"],
     deps = [
         ":asm",
+        "@abseil-cpp//absl/container:flat_hash_map",
+        "@abseil-cpp//absl/container:flat_hash_set",
+        "@abseil-cpp//absl/functional:bind_front",
+        "@abseil-cpp//absl/log",
+        "@abseil-cpp//absl/status",
+        "@abseil-cpp//absl/status:statusor",
+        "@abseil-cpp//absl/strings",
+        "@abseil-cpp//absl/types:span",
         "@com_github_serge1_elfio//:elfio",
-        "@com_google_absl//absl/container:flat_hash_map",
-        "@com_google_absl//absl/container:flat_hash_set",
-        "@com_google_absl//absl/functional:bind_front",
-        "@com_google_absl//absl/log",
-        "@com_google_absl//absl/status",
-        "@com_google_absl//absl/status:statusor",
-        "@com_google_absl//absl/strings",
-        "@com_google_absl//absl/types:span",
         "@com_googlesource_code_re2//:re2",
     ],
 )
diff --git a/mpact/sim/util/asm/test/BUILD b/mpact/sim/util/asm/test/BUILD
index 634b617..bfe4024 100644
--- a/mpact/sim/util/asm/test/BUILD
+++ b/mpact/sim/util/asm/test/BUILD
@@ -74,11 +74,11 @@
         ":riscv64x_isa",
         "//mpact/sim/generic:type_helpers",
         "//mpact/sim/util/asm",
-        "@com_google_absl//absl/base:no_destructor",
-        "@com_google_absl//absl/container:flat_hash_map",
-        "@com_google_absl//absl/status",
-        "@com_google_absl//absl/status:statusor",
-        "@com_google_absl//absl/strings",
+        "@abseil-cpp//absl/base:no_destructor",
+        "@abseil-cpp//absl/container:flat_hash_map",
+        "@abseil-cpp//absl/status",
+        "@abseil-cpp//absl/status:statusor",
+        "@abseil-cpp//absl/strings",
         "@com_googlesource_code_re2//:re2",
     ],
 )
@@ -92,13 +92,13 @@
         ":riscv64x_isa",
         "//mpact/sim/util/asm",
         "//mpact/sim/util/asm:simple_assembler",
+        "@abseil-cpp//absl/base:no_destructor",
+        "@abseil-cpp//absl/container:flat_hash_map",
+        "@abseil-cpp//absl/log:check",
+        "@abseil-cpp//absl/status",
+        "@abseil-cpp//absl/strings",
+        "@abseil-cpp//absl/types:span",
         "@com_github_serge1_elfio//:elfio",
-        "@com_google_absl//absl/base:no_destructor",
-        "@com_google_absl//absl/container:flat_hash_map",
-        "@com_google_absl//absl/log:check",
-        "@com_google_absl//absl/status",
-        "@com_google_absl//absl/strings",
-        "@com_google_absl//absl/types:span",
         "@com_google_googletest//:gtest_main",
         "@com_googlesource_code_re2//:re2",
     ],
diff --git a/mpact/sim/util/gdbserver/BUILD b/mpact/sim/util/gdbserver/BUILD
index 8f06489..e6b4478 100644
--- a/mpact/sim/util/gdbserver/BUILD
+++ b/mpact/sim/util/gdbserver/BUILD
@@ -28,15 +28,14 @@
     deps = [
         "//mpact/sim/generic:core_debug_interface",
         "//mpact/sim/generic:type_helpers",
-        "//mpact/sim/util/renode:socket_cli",
-        "@com_google_absl//absl/container:flat_hash_map",
-        "@com_google_absl//absl/flags:flag",
-        "@com_google_absl//absl/log",
-        "@com_google_absl//absl/status",
-        "@com_google_absl//absl/strings",
-        "@com_google_absl//absl/strings:str_format",
-        "@com_google_absl//absl/strings:string_view",
-        "@com_google_absl//absl/types:span",
+        "@abseil-cpp//absl/container:flat_hash_map",
+        "@abseil-cpp//absl/flags:flag",
+        "@abseil-cpp//absl/log",
+        "@abseil-cpp//absl/status",
+        "@abseil-cpp//absl/strings",
+        "@abseil-cpp//absl/strings:str_format",
+        "@abseil-cpp//absl/strings:string_view",
+        "@abseil-cpp//absl/types:span",
         "@com_googlesource_code_re2//:re2",
     ],
 )
diff --git a/mpact/sim/util/gdbserver/gdbserver.cc b/mpact/sim/util/gdbserver/gdbserver.cc
index 1088a51..adf340c 100644
--- a/mpact/sim/util/gdbserver/gdbserver.cc
+++ b/mpact/sim/util/gdbserver/gdbserver.cc
@@ -22,6 +22,7 @@
 #include <cerrno>
 #include <cstddef>
 #include <cstdint>
+#include <cstdio>
 #include <cstring>
 #include <istream>
 #include <ostream>
@@ -65,20 +66,6 @@
   return command;
 }
 
-std::string EscapeString(std::string_view str) {
-  std::string escaped_string;
-  escaped_string.reserve(str.size() * 2);
-  for (char c : str) {
-    if ((c == '$') || (c == '#') || (c == '*') || (c == '}')) {
-      escaped_string.push_back('}');
-      escaped_string.push_back(c ^ 0x20);
-    } else {
-      escaped_string.push_back(c);
-    }
-  }
-  return escaped_string;
-}
-
 }  // namespace
 
 namespace mpact::sim::util::gdbserver {
@@ -89,7 +76,8 @@
 GdbServer::GdbServer(
     absl::Span<generic::CoreDebugInterface*> core_debug_interfaces,
     const DebugInfo& debug_info)
-    : core_debug_interfaces_(core_debug_interfaces),
+    : log_packets_(absl::GetFlag(FLAGS_log_packets)),
+      core_debug_interfaces_(core_debug_interfaces),
       debug_info_(debug_info),
       gdb_command_re_(R"(\$([^#]*)#([0-9a-fA-F]{2}))"),
       thread_re_(R"(;?thread\:(\d+);?)"),
@@ -167,8 +155,8 @@
   good_ = true;
   // Create the input and output buffers and streams to handle reads and writes
   // to the socket.
-  out_buf_ = new SocketStreambuf(cli_fd_);
-  in_buf_ = new SocketStreambuf(cli_fd_);
+  out_buf_ = new GdbSocketStreambuf(cli_fd_);
+  in_buf_ = new GdbSocketStreambuf(cli_fd_);
   os_ = new std::ostream(out_buf_);
   is_ = new std::istream(in_buf_);
 
@@ -1269,6 +1257,7 @@
   }
   uint64_t length;
   success = absl::SimpleHexAtoi(length_str, &length);
+  // Subtract 5 from the length to account for the packet framing.
   if (!success) {
     return SendError("invalid length");
   }
@@ -1282,7 +1271,8 @@
   }
   std::string_view response =
       debug_info_.GetGdbTargetXml().substr(offset, length);
-  Respond(absl::StrCat(packet_type, EscapeString(response)));
+  LOG(INFO) << "response length: " << response.size();
+  Respond(absl::StrCat(packet_type, response));
 }
 
 }  // namespace mpact::sim::util::gdbserver
diff --git a/mpact/sim/util/gdbserver/gdbserver.h b/mpact/sim/util/gdbserver/gdbserver.h
index 8561c63..0ee9dca 100644
--- a/mpact/sim/util/gdbserver/gdbserver.h
+++ b/mpact/sim/util/gdbserver/gdbserver.h
@@ -20,8 +20,10 @@
 #define MPACT_SIM_UTIL_GDBSERVER_GDBSERVER_H_
 
 #include <cstdint>
+#include <cstdio>
 #include <istream>
 #include <ostream>
+#include <streambuf>
 #include <string>
 #include <string_view>
 #include <vector>
@@ -30,13 +32,44 @@
 #include "absl/types/span.h"
 #include "mpact/sim/generic/core_debug_interface.h"
 #include "mpact/sim/generic/debug_info.h"
-#include "mpact/sim/util/renode/socket_streambuf.h"
 #include "re2/re2.h"
 
 namespace mpact::sim::util::gdbserver {
 
 using ::mpact::sim::generic::DebugInfo;
-using ::mpact::sim::util::renode::SocketStreambuf;
+
+// This class is used to provide a streambuf interface to a socket file
+// descriptor, so that it can be used to access a socket as an istream/ostream.
+// The overflow and underflow methods are the bare minimum that's required to
+// implement to make this happen. No buffering is performed. This streambuf
+// does not expand \n to \r\n or vice versa.
+class GdbSocketStreambuf : public std::streambuf {
+ public:
+  explicit GdbSocketStreambuf(int fd) : fd_(fd) {}
+  ~GdbSocketStreambuf() override { close(fd_); }
+
+  // On overflow write character to the socket fd.
+  int overflow(int c) override {
+    if (c == EOF) {
+      close(fd_);
+      return c;
+    }
+    write(fd_, &c, 1);
+    return c;
+  }
+
+  // On underflow read character from the socket fd.
+  std::streambuf::int_type underflow() override {
+    int count = read(fd_, &ch_, 1);
+    if (count == 0) return traits_type::eof();
+    setg(&ch_, &ch_, &ch_ + 1);
+    return traits_type::to_int_type(ch_);
+  }
+
+ private:
+  char ch_;
+  int fd_;
+};
 
 class GdbServer {
  public:
@@ -130,8 +163,8 @@
   void GdbXferReadTarget(std::string_view offset_str,
                          std::string_view length_str);
 
-  SocketStreambuf* out_buf_ = nullptr;
-  SocketStreambuf* in_buf_ = nullptr;
+  GdbSocketStreambuf* out_buf_ = nullptr;
+  GdbSocketStreambuf* in_buf_ = nullptr;
   std::ostream* os_ = nullptr;
   std::istream* is_ = nullptr;
 
diff --git a/mpact/sim/util/memory/BUILD b/mpact/sim/util/memory/BUILD
index 2ca47e4..492aa32 100644
--- a/mpact/sim/util/memory/BUILD
+++ b/mpact/sim/util/memory/BUILD
@@ -55,16 +55,16 @@
     deps = [
         "//mpact/sim/generic:core",
         "//mpact/sim/generic:instruction",
-        "@com_google_absl//absl/base:core_headers",
-        "@com_google_absl//absl/container:btree",
-        "@com_google_absl//absl/container:flat_hash_map",
-        "@com_google_absl//absl/container:flat_hash_set",
-        "@com_google_absl//absl/functional:any_invocable",
-        "@com_google_absl//absl/log",
-        "@com_google_absl//absl/numeric:bits",
-        "@com_google_absl//absl/status",
-        "@com_google_absl//absl/strings",
-        "@com_google_absl//absl/strings:str_format",
+        "@abseil-cpp//absl/base:core_headers",
+        "@abseil-cpp//absl/container:btree",
+        "@abseil-cpp//absl/container:flat_hash_map",
+        "@abseil-cpp//absl/container:flat_hash_set",
+        "@abseil-cpp//absl/functional:any_invocable",
+        "@abseil-cpp//absl/log",
+        "@abseil-cpp//absl/numeric:bits",
+        "@abseil-cpp//absl/status",
+        "@abseil-cpp//absl/strings",
+        "@abseil-cpp//absl/strings:str_format",
     ],
 )
 
@@ -83,12 +83,12 @@
         "//mpact/sim/generic:core",
         "//mpact/sim/generic:counters",
         "//mpact/sim/generic:instruction",
-        "@com_google_absl//absl/container:btree",
-        "@com_google_absl//absl/functional:bind_front",
-        "@com_google_absl//absl/log",
-        "@com_google_absl//absl/log:check",
-        "@com_google_absl//absl/numeric:bits",
-        "@com_google_absl//absl/status",
-        "@com_google_absl//absl/strings",
+        "@abseil-cpp//absl/container:btree",
+        "@abseil-cpp//absl/functional:bind_front",
+        "@abseil-cpp//absl/log",
+        "@abseil-cpp//absl/log:check",
+        "@abseil-cpp//absl/numeric:bits",
+        "@abseil-cpp//absl/status",
+        "@abseil-cpp//absl/strings",
     ],
 )
diff --git a/mpact/sim/util/memory/test/BUILD b/mpact/sim/util/memory/test/BUILD
index dd4ef95..60c62cd 100644
--- a/mpact/sim/util/memory/test/BUILD
+++ b/mpact/sim/util/memory/test/BUILD
@@ -29,7 +29,7 @@
         "//mpact/sim/generic:core",
         "//mpact/sim/generic:instruction",
         "//mpact/sim/util/memory",
-        "@com_google_absl//absl/status",
+        "@abseil-cpp//absl/status",
     ],
 )
 
@@ -42,7 +42,7 @@
         "//mpact/sim/generic:core",
         "//mpact/sim/generic:instruction",
         "//mpact/sim/util/memory",
-        "@com_google_absl//absl/strings",
+        "@abseil-cpp//absl/strings",
         "@com_google_googletest//:gtest",
         "@com_google_googletest//:gtest_main",
     ],
@@ -57,7 +57,7 @@
         "//mpact/sim/generic:core",
         "//mpact/sim/generic:instruction",
         "//mpact/sim/util/memory",
-        "@com_google_absl//absl/strings",
+        "@abseil-cpp//absl/strings",
         "@com_google_googletest//:gtest",
         "@com_google_googletest//:gtest_main",
     ],
@@ -84,7 +84,7 @@
     deps = [
         "//mpact/sim/generic:core",
         "//mpact/sim/util/memory",
-        "@com_google_absl//absl/strings",
+        "@abseil-cpp//absl/strings",
         "@com_google_googletest//:gtest",
         "@com_google_googletest//:gtest_main",
     ],
@@ -99,8 +99,8 @@
         "//mpact/sim/generic:core",
         "//mpact/sim/util/memory",
         "//mpact/sim/util/other:log_sink",
-        "@com_google_absl//absl/log:log_sink_registry",
-        "@com_google_absl//absl/strings",
+        "@abseil-cpp//absl/log:log_sink_registry",
+        "@abseil-cpp//absl/strings",
         "@com_google_googletest//:gtest",
         "@com_google_googletest//:gtest_main",
     ],
@@ -126,8 +126,8 @@
         ":dummy_memory",
         "//mpact/sim/generic:core",
         "//mpact/sim/util/memory",
-        "@com_google_absl//absl/log:check",
-        "@com_google_absl//absl/status",
+        "@abseil-cpp//absl/log:check",
+        "@abseil-cpp//absl/status",
         "@com_google_googletest//:gtest",
         "@com_google_googletest//:gtest_main",
     ],
@@ -141,7 +141,7 @@
         ":dummy_memory",
         "//mpact/sim/generic:core",
         "//mpact/sim/util/memory",
-        "@com_google_absl//absl/status",
+        "@abseil-cpp//absl/status",
         "@com_google_googletest//:gtest",
         "@com_google_googletest//:gtest_main",
     ],
@@ -156,8 +156,8 @@
         "//mpact/sim/generic:counters",
         "//mpact/sim/util/memory",
         "//mpact/sim/util/memory:cache",
-        "@com_google_absl//absl/log:check",
-        "@com_google_absl//absl/status",
+        "@abseil-cpp//absl/log:check",
+        "@abseil-cpp//absl/status",
         "@com_google_googletest//:gtest",
         "@com_google_googletest//:gtest_main",
     ],
diff --git a/mpact/sim/util/other/BUILD b/mpact/sim/util/other/BUILD
index dc681ba..bbb989d 100644
--- a/mpact/sim/util/other/BUILD
+++ b/mpact/sim/util/other/BUILD
@@ -28,9 +28,9 @@
         "log_sink.h",
     ],
     deps = [
-        "@com_google_absl//absl/base:log_severity",
-        "@com_google_absl//absl/log:log_entry",
-        "@com_google_absl//absl/log:log_sink",
+        "@abseil-cpp//absl/base:log_severity",
+        "@abseil-cpp//absl/log:log_entry",
+        "@abseil-cpp//absl/log:log_sink",
     ],
 )
 
@@ -43,7 +43,7 @@
         "//mpact/sim/generic:core",
         "//mpact/sim/generic:instruction",
         "//mpact/sim/util/memory",
-        "@com_google_absl//absl/log",
+        "@abseil-cpp//absl/log",
     ],
 )
 
@@ -55,11 +55,11 @@
         "//mpact/sim/generic:counters",
         "//mpact/sim/util/memory",
         "//mpact/sim/util/program_loader:elf_loader",
+        "@abseil-cpp//absl/container:btree",
+        "@abseil-cpp//absl/log",
+        "@abseil-cpp//absl/numeric:bits",
+        "@abseil-cpp//absl/strings",
+        "@abseil-cpp//absl/strings:str_format",
         "@com_github_serge1_elfio//:elfio",
-        "@com_google_absl//absl/container:btree",
-        "@com_google_absl//absl/log",
-        "@com_google_absl//absl/numeric:bits",
-        "@com_google_absl//absl/strings",
-        "@com_google_absl//absl/strings:str_format",
     ],
 )
diff --git a/mpact/sim/util/program_loader/BUILD b/mpact/sim/util/program_loader/BUILD
index 3a3f113..e63b3ca 100644
--- a/mpact/sim/util/program_loader/BUILD
+++ b/mpact/sim/util/program_loader/BUILD
@@ -28,7 +28,7 @@
         "program_loader_interface.h",
     ],
     deps = [
-        "@com_google_absl//absl/status:statusor",
+        "@abseil-cpp//absl/status:statusor",
     ],
 )
 
@@ -45,11 +45,11 @@
         "//mpact/sim/generic:core",
         "//mpact/sim/generic:core_debug_interface",
         "//mpact/sim/util/memory",
+        "@abseil-cpp//absl/container:flat_hash_map",
+        "@abseil-cpp//absl/functional:any_invocable",
+        "@abseil-cpp//absl/status",
+        "@abseil-cpp//absl/status:statusor",
+        "@abseil-cpp//absl/strings",
         "@com_github_serge1_elfio//:elfio",
-        "@com_google_absl//absl/container:flat_hash_map",
-        "@com_google_absl//absl/functional:any_invocable",
-        "@com_google_absl//absl/status",
-        "@com_google_absl//absl/status:statusor",
-        "@com_google_absl//absl/strings",
     ],
 )
diff --git a/mpact/sim/util/program_loader/test/BUILD b/mpact/sim/util/program_loader/test/BUILD
index 1bbfbcb..40c77d8 100644
--- a/mpact/sim/util/program_loader/test/BUILD
+++ b/mpact/sim/util/program_loader/test/BUILD
@@ -35,7 +35,7 @@
         "//mpact/sim/generic:core",
         "//mpact/sim/util/memory",
         "//mpact/sim/util/program_loader:elf_loader",
-        "@com_google_absl//absl/status",
+        "@abseil-cpp//absl/status",
         "@com_google_googletest//:gtest",
         "@com_google_googletest//:gtest_main",
     ],
diff --git a/mpact/sim/util/renode/BUILD b/mpact/sim/util/renode/BUILD
index e0d1117..9baaac8 100644
--- a/mpact/sim/util/renode/BUILD
+++ b/mpact/sim/util/renode/BUILD
@@ -40,12 +40,12 @@
         "//mpact/sim/generic:instruction",
         "//mpact/sim/generic:type_helpers",
         "//mpact/sim/util/memory",
-        "@com_google_absl//absl/container:flat_hash_map",
-        "@com_google_absl//absl/functional:any_invocable",
-        "@com_google_absl//absl/log",
-        "@com_google_absl//absl/status",
-        "@com_google_absl//absl/status:statusor",
-        "@com_google_absl//absl/strings",
+        "@abseil-cpp//absl/container:flat_hash_map",
+        "@abseil-cpp//absl/functional:any_invocable",
+        "@abseil-cpp//absl/log",
+        "@abseil-cpp//absl/status",
+        "@abseil-cpp//absl/status:statusor",
+        "@abseil-cpp//absl/strings",
     ],
     alwayslink = 1,
 )
@@ -58,8 +58,8 @@
     deps = [
         "//mpact/sim/generic:core_debug_interface",
         "//mpact/sim/generic:type_helpers",
-        "@com_google_absl//absl/status",
-        "@com_google_absl//absl/status:statusor",
+        "@abseil-cpp//absl/status",
+        "@abseil-cpp//absl/status:statusor",
     ],
 )
 
@@ -84,11 +84,11 @@
         "//mpact/sim/generic:instruction",
         "//mpact/sim/generic:type_helpers",
         "//mpact/sim/util/program_loader:elf_loader",
-        "@com_google_absl//absl/functional:any_invocable",
-        "@com_google_absl//absl/log",
-        "@com_google_absl//absl/log:check",
-        "@com_google_absl//absl/status",
-        "@com_google_absl//absl/status:statusor",
-        "@com_google_absl//absl/synchronization",
+        "@abseil-cpp//absl/functional:any_invocable",
+        "@abseil-cpp//absl/log",
+        "@abseil-cpp//absl/log:check",
+        "@abseil-cpp//absl/status",
+        "@abseil-cpp//absl/status:statusor",
+        "@abseil-cpp//absl/synchronization",
     ],
 )
diff --git a/mpact/sim/util/renode/socket_streambuf.h b/mpact/sim/util/renode/socket_streambuf.h
index 3a44552..5408563 100644
--- a/mpact/sim/util/renode/socket_streambuf.h
+++ b/mpact/sim/util/renode/socket_streambuf.h
@@ -1,3 +1,16 @@
+// Copyright 2026 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 #ifndef MPACT_SIM_UTIL_RENODE_SOCKET_STREAMBUF_H_
 #define MPACT_SIM_UTIL_RENODE_SOCKET_STREAMBUF_H_