File naming cleanup