made file names PSR compliant