diff --git a/engine/storage/mysql/query.sql b/engine/storage/mysql/query.sql
index 965c6a1..66735e1 100644
--- a/engine/storage/mysql/query.sql
+++ b/engine/storage/mysql/query.sql
@@ -127,7 +127,7 @@ FROM
 WHERE
   id = ?;
 
--- name: GetIDCommandsByStepID :many
+-- name: GetIDCommandsByStepIDAndLock :many
 SELECT
   ic.command_uuid,
   ic.request_type,
diff --git a/engine/storage/mysql/sqlc/query.sql.go b/engine/storage/mysql/sqlc/query.sql.go
index 4c368ff..ace49df 100644
--- a/engine/storage/mysql/sqlc/query.sql.go
+++ b/engine/storage/mysql/sqlc/query.sql.go
@@ -239,7 +239,7 @@ func (q *Queries) DeleteWorkflowStepHavingNoCommandsByWorkflowName(ctx context.C
 	return err
 }
 
-const getIDCommandsByStepID = `-- name: GetIDCommandsByStepID :many
+const getIDCommandsByStepIDAndLock = `-- name: GetIDCommandsByStepIDAndLock :many
 SELECT
   ic.command_uuid,
   ic.request_type,
@@ -257,26 +257,26 @@ WHERE
 FOR UPDATE
 `
 
-type GetIDCommandsByStepIDParams struct {
+type GetIDCommandsByStepIDAndLockParams struct {
 	EnrollmentID string
 	ID           int64
 }
 
-type GetIDCommandsByStepIDRow struct {
+type GetIDCommandsByStepIDAndLockRow struct {
 	CommandUuid string
 	RequestType string
 	Result      []byte
 }
 
-func (q *Queries) GetIDCommandsByStepID(ctx context.Context, arg GetIDCommandsByStepIDParams) ([]GetIDCommandsByStepIDRow, error) {
-	rows, err := q.db.QueryContext(ctx, getIDCommandsByStepID, arg.EnrollmentID, arg.ID)
+func (q *Queries) GetIDCommandsByStepIDAndLock(ctx context.Context, arg GetIDCommandsByStepIDAndLockParams) ([]GetIDCommandsByStepIDAndLockRow, error) {
+	rows, err := q.db.QueryContext(ctx, getIDCommandsByStepIDAndLock, arg.EnrollmentID, arg.ID)
 	if err != nil {
 		return nil, err
 	}
 	defer rows.Close()
-	var items []GetIDCommandsByStepIDRow
+	var items []GetIDCommandsByStepIDAndLockRow
 	for rows.Next() {
-		var i GetIDCommandsByStepIDRow
+		var i GetIDCommandsByStepIDAndLockRow
 		if err := rows.Scan(&i.CommandUuid, &i.RequestType, &i.Result); err != nil {
 			return nil, err
 		}
diff --git a/engine/storage/mysql/storage.go b/engine/storage/mysql/storage.go
index a5df3fd..094d6e6 100644
--- a/engine/storage/mysql/storage.go
+++ b/engine/storage/mysql/storage.go
@@ -97,7 +97,7 @@ func (s *MySQLStorage) StoreCommandResponseAndRetrieveCompletedStep(ctx context.
 			Commands: []storage.StepCommandResult{*sc},
 		}
 
-		cmdR, err := qtx.GetIDCommandsByStepID(ctx, sqlc.GetIDCommandsByStepIDParams{
+		cmdR, err := qtx.GetIDCommandsByStepIDAndLock(ctx, sqlc.GetIDCommandsByStepIDAndLockParams{
 			EnrollmentID: id,
 			ID:           cmdCt.StepID,
 		})