diff --git a/netbpfload/loader.cpp b/netbpfload/loader.cpp
index 7754a3e..af9e9f1 100644
--- a/netbpfload/loader.cpp
+++ b/netbpfload/loader.cpp
@@ -784,7 +784,9 @@
               .max_entries = max_entries,
               .map_flags = md[i].map_flags,
             };
-            strlcpy(req.map_name, mapNames[i].c_str(), sizeof(req.map_name));
+            if (isAtLeastKernelVersion(4, 14, 0)) {
+                strlcpy(req.map_name, mapNames[i].c_str(), sizeof(req.map_name));
+            }
             fd.reset(bpf(BPF_MAP_CREATE, req));
             saved_errno = errno;
             ALOGD("bpf_create_map name %s, ret: %d", mapNames[i].c_str(), fd.get());
@@ -1026,7 +1028,9 @@
               .log_size = static_cast<__u32>(log_buf.size()),
               .expected_attach_type = cs[i].expected_attach_type,
             };
-            strlcpy(req.prog_name, cs[i].name.c_str(), sizeof(req.prog_name));
+            if (isAtLeastKernelVersion(4, 14, 0)) {
+                strlcpy(req.prog_name, cs[i].name.c_str(), sizeof(req.prog_name));
+            }
             fd.reset(bpf(BPF_PROG_LOAD, req));
 
             ALOGD("BPF_PROG_LOAD call for %s (%s) returned fd: %d (%s)", elfPath,
