LPS-42628 - Prevent folder names overlapping