In progress: extracting logic for correcting the req name