fixed some file naming issues