diff --git a/src/target/breakpoints.c b/src/target/breakpoints.c
index 9378abcb1..a08041629 100644
--- a/src/target/breakpoints.c
+++ b/src/target/breakpoints.c
@@ -114,7 +114,7 @@ static int context_breakpoint_add_internal(struct target *target,
 			 * breakpoint" ... check all the parameters before
 			 * succeeding.
 			 */
-			LOG_ERROR("Duplicate Breakpoint asid: 0x%08" PRIx32 " (BP %" PRIu32 ")",
+			LOG_TARGET_ERROR(target, "Duplicate Breakpoint asid: 0x%08" PRIx32 " (BP %" PRIu32 ")",
 				asid, breakpoint->unique_id);
 			return ERROR_TARGET_DUPLICATE_BREAKPOINT;
 		}
@@ -643,8 +643,7 @@ int watchpoint_remove(struct target *target, target_addr_t address)
 
 int watchpoint_clear_target(struct target *target)
 {
-	LOG_DEBUG("Delete all watchpoints for target: %s",
-		target_name(target));
+	LOG_TARGET_DEBUG(target, "Delete all watchpoints");
 
 	struct watchpoint *watchpoint = target->watchpoints;
 	int retval = ERROR_OK;