The new naming theme of the docx files can simplify the finding of the correct document. So we need to refactor this part of the code.