diff --git a/libbpf b/libbpf
index 86eb0986..a0325403 160000
--- a/libbpf
+++ b/libbpf
@@ -1 +1 @@
-Subproject commit 86eb09863c1c0177e99c2c703092042d3cdba910
+Subproject commit a0325403afa8a3eca0d3a3e43f43784dc6b47511
diff --git a/libbpfgo.go b/libbpfgo.go
index 002c4fc2..e8c00499 100644
--- a/libbpfgo.go
+++ b/libbpfgo.go
@@ -1031,7 +1031,7 @@ func (it *BPFMapIterator) Next() bool {
 	nextPtr := unsafe.Pointer(&next[0])
 
 	errC, err := C.bpf_map_get_next_key(it.b.fd, prevPtr, nextPtr)
-	if errno, ok := err.(syscall.Errno); errC == -1 && ok && errno == C.ENOENT {
+	if errno, ok := err.(syscall.Errno); errC == -2 && ok && errno == C.ENOENT {
 		return false
 	}
 	if err != nil {
diff --git a/selftest/cgroup/main.bpf.c b/selftest/cgroup/main.bpf.c
index 031459af..daeb5f29 100644
--- a/selftest/cgroup/main.bpf.c
+++ b/selftest/cgroup/main.bpf.c
@@ -14,8 +14,8 @@ struct {
 } events SEC(".maps");
 long ringbuffer_flags = 0;
 
-SEC("cgroup/socket")
-int cgroup__socket(struct bpf_sock *sk)
+SEC("cgroup/sock")
+int cgroup__sock(struct bpf_sock *sk)
 {
     int *process;
 
diff --git a/selftest/cgroup/main.go b/selftest/cgroup/main.go
index 843ed9a8..8fa7d0c7 100644
--- a/selftest/cgroup/main.go
+++ b/selftest/cgroup/main.go
@@ -29,7 +29,7 @@ func main() {
 		os.Exit(-1)
 	}
 
-	prog, err := bpfModule.GetProgram("cgroup__socket")
+	prog, err := bpfModule.GetProgram("cgroup__sock")
 	if err != nil {
 		fmt.Fprintln(os.Stderr, err)
 		os.Exit(-1)
diff --git a/selftest/iterators/main.go b/selftest/iterators/main.go
index 338f660a..d1af2d19 100644
--- a/selftest/iterators/main.go
+++ b/selftest/iterators/main.go
@@ -50,6 +50,8 @@ func main() {
 
 	iterator := numbers.Iterator()
 	for iterator.Next() {
+		fmt.Fprintln(os.Stderr, "got next iterator")
+
 		keyBytes := iterator.Key()
 		key := determineHostByteOrder().Uint32(keyBytes)
 
@@ -65,7 +67,7 @@ func main() {
 		testMap[key] = checked
 	}
 	if iterator.Err() != nil {
-		fmt.Fprintln(os.Stderr, iterator.Err())
+		fmt.Fprintf(os.Stderr, "iterator error: %v\n", iterator.Err())
 		os.Exit(-1)
 	}
 
diff --git a/selftest/netns/main.bpf.c b/selftest/netns/main.bpf.c
index 95dbdf89..f2d7148e 100644
--- a/selftest/netns/main.bpf.c
+++ b/selftest/netns/main.bpf.c
@@ -14,8 +14,8 @@ struct {
 } events SEC(".maps");
 long ringbuffer_flags = 0;
 
-SEC("sk_lookup/lookup_pass")
-int sk_lookup__lookup_pass(struct bpf_sk_lookup *ctx)
+SEC("sk_lookup")
+int sk_lookup__lookup(struct bpf_sk_lookup *ctx)
 {
     int *process;
 
diff --git a/selftest/netns/main.go b/selftest/netns/main.go
index 14f878d8..71a1b7ac 100644
--- a/selftest/netns/main.go
+++ b/selftest/netns/main.go
@@ -25,7 +25,7 @@ func main() {
 		os.Exit(-1)
 	}
 
-	prog, err := bpfModule.GetProgram("sk_lookup__lookup_pass")
+	prog, err := bpfModule.GetProgram("sk_lookup__lookup")
 	if err != nil {
 		fmt.Fprintln(os.Stderr, err)
 		os.Exit(-1)