diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/EventProcessor.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/EventProcessor.java
index 96d6a28fb2..9cdb73b5aa 100644
--- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/EventProcessor.java
+++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/EventProcessor.java
@@ -182,7 +182,7 @@ void eventProcessingFinished(
       if (!running) {
         return;
       }
-      ResourceID resourceID = executionScope.getCustomResourceID();
+      ResourceID resourceID = executionScope.getResourceID();
       log.debug(
           "Event processing finished. Scope: {}, PostExecutionControl: {}",
           executionScope,
@@ -202,7 +202,7 @@ void eventProcessingFinished(
       cleanupOnSuccessfulExecution(executionScope);
       metrics.finishedReconciliation(resourceID);
       if (eventMarker.deleteEventPresent(resourceID)) {
-        cleanupForDeletedEvent(executionScope.getCustomResourceID());
+        cleanupForDeletedEvent(executionScope.getResourceID());
       } else {
         postExecutionControl.getUpdatedCustomResource().ifPresent(
             r -> eventSourceManager.getControllerResourceEventSource().handleRecentResourceUpdate(
@@ -244,7 +244,7 @@ TimerEventSource<R> retryEventSource() {
   private void handleRetryOnException(
       ExecutionScope<R> executionScope, Exception exception) {
     RetryExecution execution = getOrInitRetryExecution(executionScope);
-    var customResourceID = executionScope.getCustomResourceID();
+    var customResourceID = executionScope.getResourceID();
     boolean eventPresent = eventMarker.eventPresent(customResourceID);
     eventMarker.markEventReceived(customResourceID);
 
@@ -271,16 +271,16 @@ private void cleanupOnSuccessfulExecution(ExecutionScope<R> executionScope) {
     log.debug(
         "Cleanup for successful execution for resource: {}", getName(executionScope.getResource()));
     if (isRetryConfigured()) {
-      retryState.remove(executionScope.getCustomResourceID());
+      retryState.remove(executionScope.getResourceID());
     }
-    retryEventSource().cancelOnceSchedule(executionScope.getCustomResourceID());
+    retryEventSource().cancelOnceSchedule(executionScope.getResourceID());
   }
 
   private RetryExecution getOrInitRetryExecution(ExecutionScope<R> executionScope) {
-    RetryExecution retryExecution = retryState.get(executionScope.getCustomResourceID());
+    RetryExecution retryExecution = retryState.get(executionScope.getResourceID());
     if (retryExecution == null) {
       retryExecution = retry.initExecution();
-      retryState.put(executionScope.getCustomResourceID(), retryExecution);
+      retryState.put(executionScope.getResourceID(), retryExecution);
     }
     return retryExecution;
   }
diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/ExecutionScope.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/ExecutionScope.java
index 037e3c4f5f..bd68d87a1b 100644
--- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/ExecutionScope.java
+++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/ExecutionScope.java
@@ -18,7 +18,7 @@ public R getResource() {
     return resource;
   }
 
-  public ResourceID getCustomResourceID() {
+  public ResourceID getResourceID() {
     return ResourceID.fromResource(resource);
   }
 
diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/ResourceID.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/ResourceID.java
index 27634f4b76..612cac8e41 100644
--- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/ResourceID.java
+++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/ResourceID.java
@@ -61,7 +61,7 @@ public int hashCode() {
 
   @Override
   public String toString() {
-    return "CustomResourceID{" +
+    return "ResourceID{" +
         "name='" + name + '\'' +
         ", namespace='" + namespace + '\'' +
         '}';