diff --git a/tap/tlstapper/bpf/golang_uprobes.c b/tap/tlstapper/bpf/golang_uprobes.c
index bdb0e322f..6a5c7db48 100644
--- a/tap/tlstapper/bpf/golang_uprobes.c
+++ b/tap/tlstapper/bpf/golang_uprobes.c
@@ -38,7 +38,7 @@ static __always_inline int golang_crypto_tls_write_uprobe(struct pt_regs *ctx) {
     }
 
     __u64 key_dial_full = (pid << 32) + key_dial;
-    struct socket *s = bpf_map_lookup_elem(&golang_dial_writes, &key_dial_full);
+    struct socket *s = bpf_map_lookup_elem(&golang_socket_to_write, &key_dial_full);
     if (s == NULL) {
         bpf_printk("[golang_crypto_tls_write_uprobe] error getting socket");
         return 0;
@@ -155,7 +155,7 @@ static __always_inline int golang_net_socket_uprobe(struct pt_regs *ctx) {
     __u64 pid = pid_tgid >> 32;
     // ctx->r14 is common between golang_net_socket_uprobe and golang_net_http_dialconn_uprobe
     __u64 key_socket = (pid << 32) + ctx->r14;
-    struct socket *s = bpf_map_lookup_elem(&golang_socket_dials, &key_socket);
+    struct socket *s = bpf_map_lookup_elem(&golang_dial_to_socket, &key_socket);
     if (s == NULL) {
         return 0;
     }
@@ -163,7 +163,7 @@ static __always_inline int golang_net_socket_uprobe(struct pt_regs *ctx) {
     struct socket b = { .pid = s->pid, .fd = ctx->rax, .key_dial = s->key_dial };
 
     __u64 key_dial_full = (pid << 32) + s->key_dial;
-    __u32 status = bpf_map_update_elem(&golang_dial_writes, &key_dial_full, &b, BPF_ANY);
+    __u32 status = bpf_map_update_elem(&golang_socket_to_write, &key_dial_full, &b, BPF_ANY);
     if (status != 0) {
         bpf_printk("[golang_net_socket_uprobe] error updating socket file descriptor: %d", status);
     }
@@ -188,7 +188,7 @@ static __always_inline int golang_net_http_dialconn_uprobe(struct pt_regs *ctx)
     __u64 pid = b.pid;
     // ctx->r14 is common between golang_net_socket_uprobe and golang_net_http_dialconn_uprobe
     __u64 key_socket = (pid << 32) + ctx->r14;
-    status = bpf_map_update_elem(&golang_socket_dials, &key_socket, &b, BPF_ANY);
+    status = bpf_map_update_elem(&golang_dial_to_socket, &key_socket, &b, BPF_ANY);
     if (status != 0) {
         bpf_printk("[golang_net_http_dialconn_uprobe] error setting socket: %d", status);
     }
diff --git a/tap/tlstapper/bpf/include/maps.h b/tap/tlstapper/bpf/include/maps.h
index 3b5815014..4dc3f4996 100644
--- a/tap/tlstapper/bpf/include/maps.h
+++ b/tap/tlstapper/bpf/include/maps.h
@@ -89,8 +89,8 @@ BPF_LRU_HASH(file_descriptor_to_ipv4, __u64, struct fd_info);
 BPF_PERF_OUTPUT(chunks_buffer);
 BPF_PERF_OUTPUT(log_buffer);
 
-BPF_LRU_HASH(golang_socket_dials, __u64, struct socket);
-BPF_LRU_HASH(golang_dial_writes, __u64, struct socket);
+BPF_LRU_HASH(golang_dial_to_socket, __u64, struct socket);
+BPF_LRU_HASH(golang_socket_to_write, __u64, struct socket);
 BPF_RINGBUF(golang_read_writes);
 
 #endif /* __MAPS__ */
diff --git a/tap/tlstapper/tlstapper_bpfeb.go b/tap/tlstapper/tlstapper_bpfeb.go
index e96693e4c..a2333bbe8 100644
--- a/tap/tlstapper/tlstapper_bpfeb.go
+++ b/tap/tlstapper/tlstapper_bpfeb.go
@@ -105,9 +105,9 @@ type tlsTapperMapSpecs struct {
 	ChunksBuffer         *ebpf.MapSpec `ebpf:"chunks_buffer"`
 	ConnectSyscallInfo   *ebpf.MapSpec `ebpf:"connect_syscall_info"`
 	FileDescriptorToIpv4 *ebpf.MapSpec `ebpf:"file_descriptor_to_ipv4"`
-	GolangDialWrites     *ebpf.MapSpec `ebpf:"golang_dial_writes"`
+	GolangDialToSocket   *ebpf.MapSpec `ebpf:"golang_dial_to_socket"`
 	GolangReadWrites     *ebpf.MapSpec `ebpf:"golang_read_writes"`
-	GolangSocketDials    *ebpf.MapSpec `ebpf:"golang_socket_dials"`
+	GolangSocketToWrite  *ebpf.MapSpec `ebpf:"golang_socket_to_write"`
 	Heap                 *ebpf.MapSpec `ebpf:"heap"`
 	LogBuffer            *ebpf.MapSpec `ebpf:"log_buffer"`
 	PidsMap              *ebpf.MapSpec `ebpf:"pids_map"`
@@ -138,9 +138,9 @@ type tlsTapperMaps struct {
 	ChunksBuffer         *ebpf.Map `ebpf:"chunks_buffer"`
 	ConnectSyscallInfo   *ebpf.Map `ebpf:"connect_syscall_info"`
 	FileDescriptorToIpv4 *ebpf.Map `ebpf:"file_descriptor_to_ipv4"`
-	GolangDialWrites     *ebpf.Map `ebpf:"golang_dial_writes"`
+	GolangDialToSocket   *ebpf.Map `ebpf:"golang_dial_to_socket"`
 	GolangReadWrites     *ebpf.Map `ebpf:"golang_read_writes"`
-	GolangSocketDials    *ebpf.Map `ebpf:"golang_socket_dials"`
+	GolangSocketToWrite  *ebpf.Map `ebpf:"golang_socket_to_write"`
 	Heap                 *ebpf.Map `ebpf:"heap"`
 	LogBuffer            *ebpf.Map `ebpf:"log_buffer"`
 	PidsMap              *ebpf.Map `ebpf:"pids_map"`
@@ -154,9 +154,9 @@ func (m *tlsTapperMaps) Close() error {
 		m.ChunksBuffer,
 		m.ConnectSyscallInfo,
 		m.FileDescriptorToIpv4,
-		m.GolangDialWrites,
+		m.GolangDialToSocket,
 		m.GolangReadWrites,
-		m.GolangSocketDials,
+		m.GolangSocketToWrite,
 		m.Heap,
 		m.LogBuffer,
 		m.PidsMap,
diff --git a/tap/tlstapper/tlstapper_bpfeb.o b/tap/tlstapper/tlstapper_bpfeb.o
index 88dd55a64..8156b5233 100644
Binary files a/tap/tlstapper/tlstapper_bpfeb.o and b/tap/tlstapper/tlstapper_bpfeb.o differ
diff --git a/tap/tlstapper/tlstapper_bpfel.go b/tap/tlstapper/tlstapper_bpfel.go
index 6e2c22f9d..3dab1540d 100644
--- a/tap/tlstapper/tlstapper_bpfel.go
+++ b/tap/tlstapper/tlstapper_bpfel.go
@@ -105,9 +105,9 @@ type tlsTapperMapSpecs struct {
 	ChunksBuffer         *ebpf.MapSpec `ebpf:"chunks_buffer"`
 	ConnectSyscallInfo   *ebpf.MapSpec `ebpf:"connect_syscall_info"`
 	FileDescriptorToIpv4 *ebpf.MapSpec `ebpf:"file_descriptor_to_ipv4"`
-	GolangDialWrites     *ebpf.MapSpec `ebpf:"golang_dial_writes"`
+	GolangDialToSocket   *ebpf.MapSpec `ebpf:"golang_dial_to_socket"`
 	GolangReadWrites     *ebpf.MapSpec `ebpf:"golang_read_writes"`
-	GolangSocketDials    *ebpf.MapSpec `ebpf:"golang_socket_dials"`
+	GolangSocketToWrite  *ebpf.MapSpec `ebpf:"golang_socket_to_write"`
 	Heap                 *ebpf.MapSpec `ebpf:"heap"`
 	LogBuffer            *ebpf.MapSpec `ebpf:"log_buffer"`
 	PidsMap              *ebpf.MapSpec `ebpf:"pids_map"`
@@ -138,9 +138,9 @@ type tlsTapperMaps struct {
 	ChunksBuffer         *ebpf.Map `ebpf:"chunks_buffer"`
 	ConnectSyscallInfo   *ebpf.Map `ebpf:"connect_syscall_info"`
 	FileDescriptorToIpv4 *ebpf.Map `ebpf:"file_descriptor_to_ipv4"`
-	GolangDialWrites     *ebpf.Map `ebpf:"golang_dial_writes"`
+	GolangDialToSocket   *ebpf.Map `ebpf:"golang_dial_to_socket"`
 	GolangReadWrites     *ebpf.Map `ebpf:"golang_read_writes"`
-	GolangSocketDials    *ebpf.Map `ebpf:"golang_socket_dials"`
+	GolangSocketToWrite  *ebpf.Map `ebpf:"golang_socket_to_write"`
 	Heap                 *ebpf.Map `ebpf:"heap"`
 	LogBuffer            *ebpf.Map `ebpf:"log_buffer"`
 	PidsMap              *ebpf.Map `ebpf:"pids_map"`
@@ -154,9 +154,9 @@ func (m *tlsTapperMaps) Close() error {
 		m.ChunksBuffer,
 		m.ConnectSyscallInfo,
 		m.FileDescriptorToIpv4,
-		m.GolangDialWrites,
+		m.GolangDialToSocket,
 		m.GolangReadWrites,
-		m.GolangSocketDials,
+		m.GolangSocketToWrite,
 		m.Heap,
 		m.LogBuffer,
 		m.PidsMap,
diff --git a/tap/tlstapper/tlstapper_bpfel.o b/tap/tlstapper/tlstapper_bpfel.o
index f950a4c18..2197d8319 100644
Binary files a/tap/tlstapper/tlstapper_bpfel.o and b/tap/tlstapper/tlstapper_bpfel.o differ