Fixes file naming schema