This. I'm fine with everything else, but I see no reason for making a 150 LoC file obscure just because of lazy naming.