some file naming changes