diff --git a/hawkbit-ddi-resource/src/main/java/org/eclipse/hawkbit/ddi/rest/resource/DdiRootController.java b/hawkbit-ddi-resource/src/main/java/org/eclipse/hawkbit/ddi/rest/resource/DdiRootController.java
index f1ce7e812..9456cd63e 100644
--- a/hawkbit-ddi-resource/src/main/java/org/eclipse/hawkbit/ddi/rest/resource/DdiRootController.java
+++ b/hawkbit-ddi-resource/src/main/java/org/eclipse/hawkbit/ddi/rest/resource/DdiRootController.java
@@ -130,7 +130,7 @@ public class DdiRootController implements DdiRootControllerRestApi {
         }
 
         return new ResponseEntity<>(
-                DataConversionHelper.fromTarget(target, controllerManagement.findOldestActionByTargetAndActive(target),
+                DataConversionHelper.fromTarget(target, controllerManagement.findOldestActiveActionByTarget(target),
                         controllerManagement.getPollingTime(), tenantAware),
                 HttpStatus.OK);
     }
diff --git a/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpMessageHandlerService.java b/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpMessageHandlerService.java
index a8723a63a..ef4f3387f 100644
--- a/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpMessageHandlerService.java
+++ b/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpMessageHandlerService.java
@@ -346,7 +346,7 @@ public class AmqpMessageHandlerService extends BaseAmqpService {
     }
 
     private void lookIfUpdateAvailable(final Target target) {
-        final Optional<Action> action = controllerManagement.findOldestActionByTargetAndActive(target);
+        final Optional<Action> action = controllerManagement.findOldestActiveActionByTarget(target);
         if (!action.isPresent()) {
             return;
         }
diff --git a/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpMessageHandlerServiceTest.java b/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpMessageHandlerServiceTest.java
index 5937d8126..f8dd4f645 100644
--- a/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpMessageHandlerServiceTest.java
+++ b/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpMessageHandlerServiceTest.java
@@ -156,7 +156,7 @@ public class AmqpMessageHandlerServiceTest {
         final ArgumentCaptor<URI> uriCaptor = ArgumentCaptor.forClass(URI.class);
         when(controllerManagementMock.findOrRegisterTargetIfItDoesNotexist(targetIdCaptor.capture(),
                 uriCaptor.capture())).thenReturn(null);
-        when(controllerManagementMock.findOldestActionByTargetAndActive(Matchers.any())).thenReturn(Optional.empty());
+        when(controllerManagementMock.findOldestActiveActionByTarget(Matchers.any())).thenReturn(Optional.empty());
 
         amqpMessageHandlerService.onMessage(message, MessageType.THING_CREATED.name(), TENANT, "vHost");
 
@@ -364,7 +364,7 @@ public class AmqpMessageHandlerServiceTest {
         when(controllerManagementMock.addUpdateActionStatus(Matchers.any())).thenReturn(action);
         when(entityFactoryMock.generateActionStatus()).thenReturn(new JpaActionStatus());
         // for the test the same action can be used
-        when(controllerManagementMock.findOldestActionByTargetAndActive(Matchers.any()))
+        when(controllerManagementMock.findOldestActiveActionByTarget(Matchers.any()))
                 .thenReturn(Optional.of(action));
 
         final List<SoftwareModule> softwareModuleList = createSoftwareModuleList();
diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/ControllerManagement.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/ControllerManagement.java
index 14780cee6..1cc752ea7 100644
--- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/ControllerManagement.java
+++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/ControllerManagement.java
@@ -112,7 +112,7 @@ public interface ControllerManagement {
      * @return a list of actions assigned to given target which are active
      */
     @PreAuthorize(SpringEvalExpressions.IS_CONTROLLER)
-    List<Action> findActionByTargetAndActive(@NotNull Target target);
+    List<Action> findActiveActionByTarget(@NotNull Target target);
 
     /**
      * Retrieves oldest {@link Action} that is active and assigned to a
@@ -123,7 +123,7 @@ public interface ControllerManagement {
      * @return a list of actions assigned to given target which are active
      */
     @PreAuthorize(SpringEvalExpressions.IS_CONTROLLER)
-    Optional<Action> findOldestActionByTargetAndActive(@NotNull Target target);
+    Optional<Action> findOldestActiveActionByTarget(@NotNull Target target);
 
     /**
      * Get the {@link Action} entity for given actionId with all lazy
diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaControllerManagement.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaControllerManagement.java
index 7d02b3bd8..f38eac00f 100644
--- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaControllerManagement.java
+++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaControllerManagement.java
@@ -157,12 +157,12 @@ public class JpaControllerManagement implements ControllerManagement {
     }
 
     @Override
-    public List<Action> findActionByTargetAndActive(final Target target) {
+    public List<Action> findActiveActionByTarget(final Target target) {
         return actionRepository.findByTargetAndActiveOrderByIdAsc((JpaTarget) target, true);
     }
 
     @Override
-    public Optional<Action> findOldestActionByTargetAndActive(final Target target) {
+    public Optional<Action> findOldestActiveActionByTarget(final Target target) {
         return actionRepository.findFirstByTargetAndActiveOrderByIdAsc((JpaTarget) target, true);
     }