diff --git a/src/main/java/li/cil/oc2/api/bus/device/object/Callbacks.java b/src/main/java/li/cil/oc2/api/bus/device/object/Callbacks.java
index b9827491..aa05c150 100644
--- a/src/main/java/li/cil/oc2/api/bus/device/object/Callbacks.java
+++ b/src/main/java/li/cil/oc2/api/bus/device/object/Callbacks.java
@@ -213,7 +213,7 @@ public final class Callbacks {
                 final boolean hasName = annotation != null && Strings.isNotBlank(annotation.value());
                 final boolean hasDescription = annotation != null && Strings.isNotBlank(annotation.description());
 
-                this.name = hasName ? annotation.value() : null;
+                this.name = hasName ? annotation.value() : (parameter.isNamePresent() ? parameter.getName() : null);
 
                 if (parameterDescriptions.containsKey(this.name)) {
                     this.description = parameterDescriptions.get(this.name);