cleaning up some file names to make things more obvious
wrapping up file name changes