Some file naming changes