changed the naming of some internally used files