LPS-32400 - Change get*FileName into HashMaps instead of Sets