fix various file naming errors