More file naming changes