Fixes all caps folder names and simplifies display names logic