diff --git a/scrplugin/ds-annotations/src/main/java/org/apache/felix/scrplugin/ds/DSAnnotationProcessor.java b/scrplugin/ds-annotations/src/main/java/org/apache/felix/scrplugin/ds/DSAnnotationProcessor.java
index da8e7fd..fedcef0 100644
--- a/scrplugin/ds-annotations/src/main/java/org/apache/felix/scrplugin/ds/DSAnnotationProcessor.java
+++ b/scrplugin/ds-annotations/src/main/java/org/apache/felix/scrplugin/ds/DSAnnotationProcessor.java
@@ -241,10 +241,10 @@
             defaultUnbindMethodName = "remove" + refNameByMethod;
         } else if ( methodName.startsWith("set") ) {
             refNameByMethod = methodName.substring(3);
-            defaultUnbindMethodName = "un" + refNameByMethod;
+            defaultUnbindMethodName = "unset" + refNameByMethod;
         } else if ( methodName.startsWith("bind") ) {
             refNameByMethod = methodName.substring(4);
-            defaultUnbindMethodName = "un" + refNameByMethod;
+            defaultUnbindMethodName = "unbind" + refNameByMethod;
         } else {
             refNameByMethod = methodName;
             defaultUnbindMethodName = "un" + refNameByMethod;