ETROG-1114, RLP-4421
Refactor file names.